diff --git a/flake.lock b/flake.lock
index 0579ae6b4..596182f6f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -25,11 +25,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1736572565,
-        "narHash": "sha256-4u5B2Dp2C+KzuZbgYlxb4O1l3U3WWG25pZltrH6k7c8=",
+        "lastModified": 1736635142,
+        "narHash": "sha256-VzMopEyjwS/Sazvw/l8Ds8jaC9+hVbJHnMAdOSPn+60=",
         "owner": "nix-ocaml",
         "repo": "nix-overlays",
-        "rev": "3bae9a36cce8bb8d08d55c7f53d5bb9f2ee24dbb",
+        "rev": "71e214d2fbed045c5164216b71058afb37ce6bce",
         "type": "github"
       },
       "original": {
@@ -40,17 +40,17 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1736560554,
-        "narHash": "sha256-+JU6o3GAOWtFfmbf1yfHI7Tu8E+sn8Uo6/0argLzsB4=",
+        "lastModified": 1736603572,
+        "narHash": "sha256-yOZxepSF/z6ZDAOlJ3VZRIGOKfroa6CmOm2x6ud8S3s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cef47c71b16e96b15ef2ee88be39d030f1961437",
+        "rev": "376250fab39653e93864b4dfd9ab161751fbe430",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cef47c71b16e96b15ef2ee88be39d030f1961437",
+        "rev": "376250fab39653e93864b4dfd9ab161751fbe430",
         "type": "github"
       }
     },
diff --git a/jscomp/core/js_dump.ml b/jscomp/core/js_dump.ml
index c513fa46c..d3d092295 100644
--- a/jscomp/core/js_dump.ml
+++ b/jscomp/core/js_dump.ml
@@ -133,8 +133,6 @@ module Curry_gen = struct
     string cxt (Printf.sprintf "%d" len)
 end
 
-let return_indent = String.length L.return / Js_pp.indent_length
-let throw_indent = String.length L.throw / Js_pp.indent_length
 let semi cxt = string cxt L.semi
 let comma cxt = string cxt L.comma
 
@@ -914,7 +912,7 @@ and expression_desc cxt ~(level : int) x : cxt =
            var f = { x : 2 , y : 2}
          ]}
       *)
-      cond_paren_group cxt (level > 1) 1 (fun () ->
+      cond_paren_group cxt (level > 1) 0 (fun () ->
           if lst = [] then (
             string cxt "{}";
             cxt)
@@ -1195,7 +1193,7 @@ and statement_desc top cxt (s : J.statement_desc) : cxt =
       | _ ->
           return_sp cxt;
           (* string cxt "return ";(\* ASI -- when there is a comment*\) *)
-          group cxt return_indent (fun () ->
+          group cxt 0 (fun () ->
               let cxt = expression ~level:0 cxt e in
               semi cxt;
               cxt))
@@ -1255,7 +1253,7 @@ and statement_desc top cxt (s : J.statement_desc) : cxt =
       in
       string cxt L.throw;
       space cxt;
-      group cxt throw_indent (fun () ->
+      group cxt 0 (fun () ->
           let cxt = expression ~level:0 cxt e in
           semi cxt;
           cxt)
diff --git a/jscomp/test/dist-es6/jscomp/test/es6_tests/es6_module_test.mjs b/jscomp/test/dist-es6/jscomp/test/es6_tests/es6_module_test.mjs
index 0b174aa42..1c0c33952 100644
--- a/jscomp/test/dist-es6/jscomp/test/es6_tests/es6_module_test.mjs
+++ b/jscomp/test/dist-es6/jscomp/test/es6_tests/es6_module_test.mjs
@@ -12,16 +12,16 @@ Mt.from_pair_suites("Es6_module_test", {
         "list_length",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: Stdlib__List.length({
-                          hd: 1,
-                          tl: {
-                            hd: 2,
-                            tl: /* [] */0
-                          }
-                        }),
-                    _1: 2
-                  };
+              TAG: /* Eq */0,
+              _0: Stdlib__List.length({
+                    hd: 1,
+                    tl: {
+                      hd: 2,
+                      tl: /* [] */0
+                    }
+                  }),
+              _1: 2
+            };
           })
       ],
       tl: {
@@ -29,10 +29,10 @@ Mt.from_pair_suites("Es6_module_test", {
           "length",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: 3,
-                      _1: 3
-                    };
+                TAG: /* Eq */0,
+                _0: 3,
+                _1: 3
+              };
             })
         ],
         tl: /* [] */0
diff --git a/jscomp/test/dist-es6/jscomp/test/mt.mjs b/jscomp/test/dist-es6/jscomp/test/mt.mjs
index 84774da21..d43fc7c24 100644
--- a/jscomp/test/dist-es6/jscomp/test/mt.mjs
+++ b/jscomp/test/dist-es6/jscomp/test/mt.mjs
@@ -33,11 +33,11 @@ function from_suites(name, suite) {
   if (match && is_mocha(undefined)) {
     describe(name, (function () {
             return Stdlib__List.iter((function (param) {
-                          const partial_arg = param[1];
-                          it(param[0], (function () {
-                                  return Curry._1(partial_arg, undefined);
-                                }));
-                        }), suite);
+                    const partial_arg = param[1];
+                    it(param[0], (function () {
+                            return Curry._1(partial_arg, undefined);
+                          }));
+                  }), suite);
           }));
     return ;
   }
@@ -101,11 +101,11 @@ function from_pair_suites(name, suites) {
     if (is_mocha(undefined)) {
       describe(name, (function () {
               return Stdlib__List.iter((function (param) {
-                            const code = param[1];
-                            it(param[0], (function () {
-                                    return handleCode(Curry._1(code, undefined));
-                                  }));
-                          }), suites);
+                      const code = param[1];
+                      it(param[0], (function () {
+                              return handleCode(Curry._1(code, undefined));
+                            }));
+                    }), suites);
             }));
       return ;
     } else {
@@ -114,78 +114,78 @@ function from_pair_suites(name, suites) {
             "testing"
           ]);
       return Stdlib__List.iter((function (param) {
-                    const name = param[0];
-                    const _fn = Curry._1(param[1], undefined);
-                    switch (_fn.TAG) {
-                      case /* Eq */0 :
-                          console.log([
-                                name,
-                                _fn._0,
-                                "eq?",
-                                _fn._1
-                              ]);
-                          return ;
-                      case /* Neq */1 :
-                          console.log([
-                                name,
-                                _fn._0,
-                                "neq?",
-                                _fn._1
-                              ]);
-                          return ;
-                      case /* StrictEq */2 :
-                          console.log([
-                                name,
-                                _fn._0,
-                                "strict_eq?",
-                                _fn._1
-                              ]);
-                          return ;
-                      case /* StrictNeq */3 :
-                          console.log([
-                                name,
-                                _fn._0,
-                                "strict_neq?",
-                                _fn._1
-                              ]);
-                          return ;
-                      case /* Ok */4 :
-                          console.log([
-                                name,
-                                _fn._0,
-                                "ok?"
-                              ]);
-                          return ;
-                      case /* Approx */5 :
-                          console.log([
-                                name,
-                                _fn._0,
-                                "~",
-                                _fn._1
-                              ]);
-                          return ;
-                      case /* ApproxThreshold */6 :
-                          console.log([
-                                name,
-                                _fn._1,
-                                "~",
-                                _fn._2,
-                                " (",
-                                _fn._0,
-                                ")"
-                              ]);
-                          return ;
-                      case /* ThrowAny */7 :
-                          return ;
-                      case /* Fail */8 :
-                          console.log("failed");
-                          return ;
-                      case /* FailWith */9 :
-                          console.log("failed: " + _fn._0);
-                          return ;
-                      
-                    }
-                  }), suites);
+              const name = param[0];
+              const _fn = Curry._1(param[1], undefined);
+              switch (_fn.TAG) {
+                case /* Eq */0 :
+                    console.log([
+                          name,
+                          _fn._0,
+                          "eq?",
+                          _fn._1
+                        ]);
+                    return ;
+                case /* Neq */1 :
+                    console.log([
+                          name,
+                          _fn._0,
+                          "neq?",
+                          _fn._1
+                        ]);
+                    return ;
+                case /* StrictEq */2 :
+                    console.log([
+                          name,
+                          _fn._0,
+                          "strict_eq?",
+                          _fn._1
+                        ]);
+                    return ;
+                case /* StrictNeq */3 :
+                    console.log([
+                          name,
+                          _fn._0,
+                          "strict_neq?",
+                          _fn._1
+                        ]);
+                    return ;
+                case /* Ok */4 :
+                    console.log([
+                          name,
+                          _fn._0,
+                          "ok?"
+                        ]);
+                    return ;
+                case /* Approx */5 :
+                    console.log([
+                          name,
+                          _fn._0,
+                          "~",
+                          _fn._1
+                        ]);
+                    return ;
+                case /* ApproxThreshold */6 :
+                    console.log([
+                          name,
+                          _fn._1,
+                          "~",
+                          _fn._2,
+                          " (",
+                          _fn._0,
+                          ")"
+                        ]);
+                    return ;
+                case /* ThrowAny */7 :
+                    return ;
+                case /* Fail */8 :
+                    console.log("failed");
+                    return ;
+                case /* FailWith */9 :
+                    console.log("failed: " + _fn._0);
+                    return ;
+                
+              }
+            }), suites);
     }
   }
   
@@ -199,14 +199,14 @@ function from_promise_suites(name, suites) {
     if (is_mocha(undefined)) {
       describe(name, (function () {
               return Stdlib__List.iter((function (param) {
-                            const code = param[1];
-                            it(param[0], (function () {
-                                    return code.then(function (x) {
-                                                handleCode(x);
-                                                return val_unit;
-                                              });
-                                  }));
-                          }), suites);
+                      const code = param[1];
+                      it(param[0], (function () {
+                              return code.then(function (x) {
+                                    handleCode(x);
+                                    return val_unit;
+                                  });
+                            }));
+                    }), suites);
             }));
     } else {
       console.log("promise suites");
@@ -223,10 +223,10 @@ function eq_suites(test_id, suites, loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -240,9 +240,9 @@ function bool_suites(test_id, suites, loc, x) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: x
-                };
+            TAG: /* Ok */4,
+            _0: x
+          };
         })
     ],
     tl: suites.contents
@@ -256,9 +256,9 @@ function throw_suites(test_id, suites, loc, x) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* ThrowAny */7,
-                  _0: x
-                };
+            TAG: /* ThrowAny */7,
+            _0: x
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/406_primitive_test.js b/jscomp/test/dist/jscomp/test/406_primitive_test.js
index 96913392a..09643f554 100644
--- a/jscomp/test/dist/jscomp/test/406_primitive_test.js
+++ b/jscomp/test/dist/jscomp/test/406_primitive_test.js
@@ -35,9 +35,9 @@ function f(param) {
     for (let i = 0; i <= 200; ++i) {
       if (i === 10) {
         throw new Caml_js_exceptions.MelangeError(A, {
-                  MEL_EXN_ID: A,
-                  _1: 0
-                });
+              MEL_EXN_ID: A,
+              _1: 0
+            });
       }
       
     }
diff --git a/jscomp/test/dist/jscomp/test/a_filename_test.js b/jscomp/test/dist/jscomp/test/a_filename_test.js
index 7cb20b262..f107b349a 100644
--- a/jscomp/test/dist/jscomp/test/a_filename_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/a_list_test.js b/jscomp/test/dist/jscomp/test/a_list_test.js
index 434591bc0..33bd37248 100644
--- a/jscomp/test/dist/jscomp/test/a_list_test.js
+++ b/jscomp/test/dist/jscomp/test/a_list_test.js
@@ -8,19 +8,19 @@ const suites_0 = [
   "drop",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: Ext_list_test.drop(3, {
-                    hd: 0,
-                    tl: {
-                      hd: 1,
-                      tl: {
-                        hd: 2,
-                        tl: /* [] */0
-                      }
-                    }
-                  }),
-              _1: /* [] */0
-            };
+        TAG: /* Eq */0,
+        _0: Ext_list_test.drop(3, {
+              hd: 0,
+              tl: {
+                hd: 1,
+                tl: {
+                  hd: 2,
+                  tl: /* [] */0
+                }
+              }
+            }),
+        _1: /* [] */0
+      };
     })
 ];
 
@@ -29,22 +29,22 @@ const suites_1 = {
     "drop1",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: Ext_list_test.drop(2, {
-                      hd: 0,
-                      tl: {
-                        hd: 1,
-                        tl: {
-                          hd: 2,
-                          tl: /* [] */0
-                        }
-                      }
-                    }),
-                _1: {
-                  hd: 2,
-                  tl: /* [] */0
+          TAG: /* Eq */0,
+          _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 @@ const suites_1 = {
       "flat_map",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: {
-                    hd: 0,
+            TAG: /* Eq */0,
+            _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/dist/jscomp/test/a_string_test.js b/jscomp/test/dist/jscomp/test/a_string_test.js
index a53090411..035e465a2 100644
--- a/jscomp/test/dist/jscomp/test/a_string_test.js
+++ b/jscomp/test/dist/jscomp/test/a_string_test.js
@@ -9,19 +9,19 @@ const suites_0 = [
   "split",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: Ext_string_test.split(true, "hihi", /* 'i' */105),
-              _1: {
-                hd: "h",
-                tl: {
-                  hd: "h",
-                  tl: {
-                    hd: "",
-                    tl: /* [] */0
-                  }
-                }
-              }
-            };
+        TAG: /* Eq */0,
+        _0: Ext_string_test.split(true, "hihi", /* 'i' */105),
+        _1: {
+          hd: "h",
+          tl: {
+            hd: "h",
+            tl: {
+              hd: "",
+              tl: /* [] */0
+            }
+          }
+        }
+      };
     })
 ];
 
@@ -30,16 +30,16 @@ const suites_1 = {
     "split_non_empty",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: Ext_string_test.split(undefined, "hihi", /* 'i' */105),
-                _1: {
-                  hd: "h",
-                  tl: {
-                    hd: "h",
-                    tl: /* [] */0
-                  }
-                }
-              };
+          TAG: /* Eq */0,
+          _0: Ext_string_test.split(undefined, "hihi", /* 'i' */105),
+          _1: {
+            hd: "h",
+            tl: {
+              hd: "h",
+              tl: /* [] */0
+            }
+          }
+        };
       })
   ],
   tl: {
@@ -47,10 +47,10 @@ const suites_1 = {
       "split_empty",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: Ext_string_test.split(true, "", /* 'i' */105),
-                  _1: /* [] */0
-                };
+            TAG: /* Eq */0,
+            _0: Ext_string_test.split(true, "", /* 'i' */105),
+            _1: /* [] */0
+          };
         })
     ],
     tl: {
@@ -58,19 +58,19 @@ const suites_1 = {
         "split_normal",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: Ext_string_test.split(true, "h i i", /* ' ' */32),
-                    _1: {
-                      hd: "h",
-                      tl: {
-                        hd: "i",
-                        tl: {
-                          hd: "i",
-                          tl: /* [] */0
-                        }
-                      }
-                    }
-                  };
+              TAG: /* Eq */0,
+              _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 @@ const suites_1 = {
           "split_by",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: Stdlib__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,
+                _0: Stdlib__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/dist/jscomp/test/adt_optimize_test.js b/jscomp/test/dist/jscomp/test/adt_optimize_test.js
index 8543c4dc4..ff90cc007 100644
--- a/jscomp/test/dist/jscomp/test/adt_optimize_test.js
+++ b/jscomp/test/dist/jscomp/test/adt_optimize_test.js
@@ -191,13 +191,13 @@ function f11(x) {
     return 1;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/adt_optimize_test.ml",
-              191,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/adt_optimize_test.ml",
+          191,
+          9
+        ]
+      });
 }
 
 exports.f = f;
diff --git a/jscomp/test/dist/jscomp/test/and_or_tailcall_test.js b/jscomp/test/dist/jscomp/test/and_or_tailcall_test.js
index bbccc9be3..8a3403199 100644
--- a/jscomp/test/dist/jscomp/test/and_or_tailcall_test.js
+++ b/jscomp/test/dist/jscomp/test/and_or_tailcall_test.js
@@ -35,10 +35,10 @@ const suites_0 = [
   "and_tail",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: false,
-              _1: f(true, 1, 0)
-            };
+        TAG: /* Eq */0,
+        _0: false,
+        _1: f(true, 1, 0)
+      };
     })
 ];
 
@@ -47,10 +47,10 @@ const suites_1 = {
     "or_tail",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: false,
-                _1: or_f(false, 1, 0)
-              };
+          TAG: /* Eq */0,
+          _0: false,
+          _1: or_f(false, 1, 0)
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/app_root_finder.js b/jscomp/test/dist/jscomp/test/app_root_finder.js
index 1b7d8b39d..0f69fadc3 100644
--- a/jscomp/test/dist/jscomp/test/app_root_finder.js
+++ b/jscomp/test/dist/jscomp/test/app_root_finder.js
@@ -17,8 +17,8 @@ function find_package_json(_dir) {
     const new_dir = Path.dirname(dir);
     if (new_dir === dir) {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     _dir = new_dir;
     continue ;
diff --git a/jscomp/test/dist/jscomp/test/argv_test.js b/jscomp/test/dist/jscomp/test/argv_test.js
index 8ae19ec6e..a339e146f 100644
--- a/jscomp/test/dist/jscomp/test/argv_test.js
+++ b/jscomp/test/dist/jscomp/test/argv_test.js
@@ -52,24 +52,24 @@ Stdlib__Arg.parse_argv(undefined, [
 
 if (compile.contents !== true) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/argv_test.ml",
-              20,
-              0
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/argv_test.ml",
+          20,
+          0
+        ]
+      });
 }
 
 if (test.contents !== false) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/argv_test.ml",
-              21,
-              0
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/argv_test.ml",
+          21,
+          0
+        ]
+      });
 }
 
 exports.anno_fun = anno_fun;
diff --git a/jscomp/test/dist/jscomp/test/ari_regress_test.js b/jscomp/test/dist/jscomp/test/ari_regress_test.js
index 7a4e71c3a..a66e886dd 100644
--- a/jscomp/test/dist/jscomp/test/ari_regress_test.js
+++ b/jscomp/test/dist/jscomp/test/ari_regress_test.js
@@ -32,10 +32,10 @@ const suites_0 = [
   "curry",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: g,
-              _1: 7
-            };
+        TAG: /* Eq */0,
+        _0: g,
+        _1: 7
+      };
     })
 ];
 
@@ -44,10 +44,10 @@ const suites_1 = {
     "curry2",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: 14,
-                _1: (Curry._1(v, 1), Curry._1(v, 1))
-              };
+          TAG: /* Eq */0,
+          _0: 14,
+          _1: (Curry._1(v, 1), Curry._1(v, 1))
+        };
       })
   ],
   tl: {
@@ -55,10 +55,10 @@ const suites_1 = {
       "curry3",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: 14
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: 14
+          };
         })
     ],
     tl: {
@@ -66,10 +66,10 @@ const suites_1 = {
         "File \"jscomp/test/ari_regress_test.ml\", line 20, characters 4-11",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: h.contents,
-                    _1: 1
-                  };
+              TAG: /* Eq */0,
+              _0: h.contents,
+              _1: 1
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/arith_lexer.js b/jscomp/test/dist/jscomp/test/arith_lexer.js
index 7c8a6e68e..81144c5ff 100644
--- a/jscomp/test/dist/jscomp/test/arith_lexer.js
+++ b/jscomp/test/dist/jscomp/test/arith_lexer.js
@@ -30,14 +30,14 @@ function __ocaml_lex_lexeme_rec(lexbuf, ___ocaml_lex_state) {
           continue ;
       case 1 :
           return {
-                  TAG: /* NUMERAL */0,
-                  _0: Caml_format.caml_int_of_string(Stdlib__Lexing.lexeme(lexbuf))
-                };
+            TAG: /* NUMERAL */0,
+            _0: Caml_format.caml_int_of_string(Stdlib__Lexing.lexeme(lexbuf))
+          };
       case 2 :
           return {
-                  TAG: /* IDENT */1,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* IDENT */1,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 3 :
           return /* PLUS */0;
       case 4 :
diff --git a/jscomp/test/dist/jscomp/test/arith_parser.js b/jscomp/test/dist/jscomp/test/arith_parser.js
index 7eb8afe63..3ca78fff3 100644
--- a/jscomp/test/dist/jscomp/test/arith_parser.js
+++ b/jscomp/test/dist/jscomp/test/arith_parser.js
@@ -47,9 +47,9 @@ const yynames_block = "NUMERAL\0IDENT\0";
 const yyact = [
   (function (param) {
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: "parser"
-              });
+            MEL_EXN_ID: "Failure",
+            _1: "parser"
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -57,68 +57,68 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Numeral */0,
-              _0: _1
-            };
+        TAG: /* Numeral */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Variable */6,
-              _0: _1
-            };
+        TAG: /* Variable */6,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Plus */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Plus */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Minus */2,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Minus */2,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Times */3,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Times */3,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Divide */4,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Divide */4,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Negate */5,
-              _0: _2
-            };
+        TAG: /* Negate */5,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     })
 ];
 
diff --git a/jscomp/test/dist/jscomp/test/arity_deopt.js b/jscomp/test/dist/jscomp/test/arity_deopt.js
index 76885cc05..c2c3fc539 100644
--- a/jscomp/test/dist/jscomp/test/arity_deopt.js
+++ b/jscomp/test/dist/jscomp/test/arity_deopt.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/arity_infer.js b/jscomp/test/dist/jscomp/test/arity_infer.js
index dd11434f5..a9d514ae8 100644
--- a/jscomp/test/dist/jscomp/test/arity_infer.js
+++ b/jscomp/test/dist/jscomp/test/arity_infer.js
@@ -13,16 +13,16 @@ function f0(x) {
       });
   } else {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   }
   return tmp(3);
 }
 
 function f1(x) {
   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-            MEL_EXN_ID: Stdlib.Not_found
-          });
+        MEL_EXN_ID: Stdlib.Not_found
+      });
   return Curry._1(undefined, x);
 }
 
@@ -51,8 +51,8 @@ function f3(x) {
         break;
     default:
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
   }
   return tmp(3);
 }
diff --git a/jscomp/test/dist/jscomp/test/array_data_util.js b/jscomp/test/dist/jscomp/test/array_data_util.js
index 9ea60f544..7f418adae 100644
--- a/jscomp/test/dist/jscomp/test/array_data_util.js
+++ b/jscomp/test/dist/jscomp/test/array_data_util.js
@@ -5,8 +5,8 @@ const Belt__Belt_Array = require("melange.belt/belt_Array.js");
 
 function range(i, j) {
   return Belt__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/dist/jscomp/test/array_subtle_test.js b/jscomp/test/dist/jscomp/test/array_subtle_test.js
index a462c2941..886a5e18d 100644
--- a/jscomp/test/dist/jscomp/test/array_subtle_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/array_test.js b/jscomp/test/dist/jscomp/test/array_test.js
index 4e7d4ab3a..8ec0979c8 100644
--- a/jscomp/test/dist/jscomp/test/array_test.js
+++ b/jscomp/test/dist/jscomp/test/array_test.js
@@ -22,8 +22,8 @@ function starts_with(xs, prefix, p) {
     for (let i = 0; i < len2; ++i) {
       if (!Curry._2(p, Caml_array.get(xs, i), Caml_array.get(prefix, i))) {
         throw new Caml_js_exceptions.MelangeError(H, {
-                  MEL_EXN_ID: H
-                });
+              MEL_EXN_ID: H
+            });
       }
       
     }
@@ -58,18 +58,18 @@ const array_suites_0 = [
   "init",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: Stdlib__Array.init(5, (function (x) {
-                      return x;
-                    })),
-              _1: [
-                0,
-                1,
-                2,
-                3,
-                4
-              ]
-            };
+        TAG: /* Eq */0,
+        _0: Stdlib__Array.init(5, (function (x) {
+                return x;
+              })),
+        _1: [
+          0,
+          1,
+          2,
+          3,
+          4
+        ]
+      };
     })
 ];
 
@@ -79,14 +79,14 @@ const array_suites_1 = {
     (function (param) {
         const aux = function (xs) {
           return Stdlib__List.fold_left((function (acc, param) {
-                        return {
-                                hd: [
-                                  Stdlib__Array.to_list(param[0]),
-                                  param[1]
-                                ],
-                                tl: acc
-                              };
-                      }), /* [] */0, xs);
+                  return {
+                    hd: [
+                      Stdlib__Array.to_list(param[0]),
+                      param[1]
+                    ],
+                    tl: acc
+                  };
+                }), /* [] */0, xs);
         };
         const match = Stdlib__List.split(aux({
                   hd: [
@@ -96,10 +96,10 @@ const array_suites_1 = {
                   tl: /* [] */0
                 }));
         return {
-                TAG: /* Eq */0,
-                _0: match[0],
-                _1: match[1]
-              };
+          TAG: /* Eq */0,
+          _0: match[0],
+          _1: match[1]
+        };
       })
   ],
   tl: {
@@ -107,36 +107,36 @@ const array_suites_1 = {
       "concat",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: [
+            TAG: /* Eq */0,
+            _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: {
@@ -144,20 +144,20 @@ const array_suites_1 = {
         "make",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: [
-                      Caml_array.make(100, /* 'a' */97),
-                      Caml_array.make_float(100)
-                    ],
-                    _1: [
-                      Stdlib__Array.init(100, (function (param) {
-                              return /* 'a' */97;
-                            })),
-                      Stdlib__Array.init(100, (function (param) {
-                              return 0;
-                            }))
-                    ]
-                  };
+              TAG: /* Eq */0,
+              _0: [
+                Caml_array.make(100, /* 'a' */97),
+                Caml_array.make_float(100)
+              ],
+              _1: [
+                Stdlib__Array.init(100, (function (param) {
+                        return /* 'a' */97;
+                      })),
+                Stdlib__Array.init(100, (function (param) {
+                        return 0;
+                      }))
+              ]
+            };
           })
       ],
       tl: {
@@ -165,19 +165,19 @@ const array_suites_1 = {
           "sub",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: Stdlib__Array.sub([
-                            0,
-                            1,
-                            2,
-                            3,
-                            4
-                          ], 2, 2),
-                      _1: [
-                        2,
-                        3
-                      ]
-                    };
+                TAG: /* Eq */0,
+                _0: Stdlib__Array.sub([
+                      0,
+                      1,
+                      2,
+                      3,
+                      4
+                    ], 2, 2),
+                _1: [
+                  2,
+                  3
+                ]
+              };
             })
         ],
         tl: {
@@ -194,24 +194,24 @@ const array_suites_1 = {
                       }));
                 Stdlib__Array.blit(v, 1, u, 1, 2);
                 return {
-                        TAG: /* Eq */0,
-                        _0: [
-                          [
-                            0,
-                            2,
-                            4
-                          ],
-                          [
-                            100,
-                            2,
-                            4
-                          ]
-                        ],
-                        _1: [
-                          v,
-                          u
-                        ]
-                      };
+                  TAG: /* Eq */0,
+                  _0: [
+                    [
+                      0,
+                      2,
+                      4
+                    ],
+                    [
+                      100,
+                      2,
+                      4
+                    ]
+                  ],
+                  _1: [
+                    v,
+                    u
+                  ]
+                };
               })
           ],
           tl: {
@@ -223,37 +223,37 @@ const array_suites_1 = {
                         }));
                   Stdlib__Array.blit(a0, 10, a0, 5, 20);
                   return {
-                          TAG: /* Eq */0,
-                          _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,
+                    _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: {
@@ -265,39 +265,39 @@ const array_suites_1 = {
                           }));
                     Stdlib__Array.blit(a0, 5, a0, 10, 20);
                     return {
-                            TAG: /* Eq */0,
-                            _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,
+                      _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: {
@@ -305,13 +305,13 @@ const array_suites_1 = {
                   "make",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: Caml_array.make(2, 1),
-                              _1: [
-                                1,
-                                1
-                              ]
-                            };
+                        TAG: /* Eq */0,
+                        _0: Caml_array.make(2, 1),
+                        _1: [
+                          1,
+                          1
+                        ]
+                      };
                     })
                 ],
                 tl: {
@@ -325,14 +325,14 @@ const array_suites_1 = {
                         ];
                         Stdlib__Array.sort(Caml.caml_int_compare, u);
                         return {
-                                TAG: /* Eq */0,
-                                _0: Caml_obj.caml_equal([
-                                      0,
-                                      1,
-                                      3
-                                    ], u),
-                                _1: true
-                              };
+                          TAG: /* Eq */0,
+                          _0: Caml_obj.caml_equal([
+                                0,
+                                1,
+                                3
+                              ], u),
+                          _1: true
+                        };
                       })
                   ],
                   tl: {
@@ -344,10 +344,10 @@ const array_suites_1 = {
                                 }));
                           Stdlib__Array.sort(Caml.caml_int_compare, v);
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: true,
-                                  _1: is_sorted(v)
-                                };
+                            TAG: /* Eq */0,
+                            _0: true,
+                            _1: is_sorted(v)
+                          };
                         })
                     ],
                     tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/ast_abstract_test.js b/jscomp/test/dist/jscomp/test/ast_abstract_test.js
index 1acc24d67..e1c9dce0b 100644
--- a/jscomp/test/dist/jscomp/test/ast_abstract_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _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
+  };
 }
 
 const v0 = {
diff --git a/jscomp/test/dist/jscomp/test/ast_js_mapper_poly_test.js b/jscomp/test/dist/jscomp/test/ast_js_mapper_poly_test.js
index 0da4706fb..24923ba69 100644
--- a/jscomp/test/dist/jscomp/test/ast_js_mapper_poly_test.js
+++ b/jscomp/test/dist/jscomp/test/ast_js_mapper_poly_test.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/ast_js_mapper_test.js b/jscomp/test/dist/jscomp/test/ast_js_mapper_test.js
index af7be90c3..721b797d8 100644
--- a/jscomp/test/dist/jscomp/test/ast_js_mapper_test.js
+++ b/jscomp/test/dist/jscomp/test/ast_js_mapper_test.js
@@ -5,18 +5,18 @@ const Js__Js_mapper_runtime = require("melange.js/js_mapper_runtime.js");
 
 function tToJs(param) {
   return {
-          xx: param.xx,
-          yy: param.yy,
-          zz: param.zz
-        };
+    xx: param.xx,
+    yy: param.yy,
+    zz: param.zz
+  };
 }
 
 function tFromJs(param) {
   return {
-          xx: param.xx,
-          yy: param.yy,
-          zz: param.zz
-        };
+    xx: param.xx,
+    yy: param.yy,
+    zz: param.zz
+  };
 }
 
 const u = tToJs({
diff --git a/jscomp/test/dist/jscomp/test/ast_mapper_defensive_test.js b/jscomp/test/dist/jscomp/test/ast_mapper_defensive_test.js
index b3723124b..1ae77d24e 100644
--- a/jscomp/test/dist/jscomp/test/ast_mapper_defensive_test.js
+++ b/jscomp/test/dist/jscomp/test/ast_mapper_defensive_test.js
@@ -19,9 +19,9 @@ function $$throw(loc, x) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* ThrowAny */7,
-                  _0: x
-                };
+            TAG: /* ThrowAny */7,
+            _0: x
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/bal_set_mini.js b/jscomp/test/dist/jscomp/test/bal_set_mini.js
index 76b43a725..8dcc27dd8 100644
--- a/jscomp/test/dist/jscomp/test/bal_set_mini.js
+++ b/jscomp/test/dist/jscomp/test/bal_set_mini.js
@@ -14,12 +14,12 @@ function create(l, v, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          _0: l,
-          _1: v,
-          _2: r,
-          _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    _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,
-            _0: l,
-            _1: v,
-            _2: r,
-            _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      _0: l,
+      _1: v,
+      _2: r,
+      _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     return /* Empty */0;
@@ -77,12 +77,12 @@ function compare_int(x, y) {
 function add(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            _0: /* Empty */0,
-            _1: x,
-            _2: /* Empty */0,
-            _3: 1
-          };
+      TAG: /* Node */0,
+      _0: /* Empty */0,
+      _1: x,
+      _2: /* Empty */0,
+      _3: 1
+    };
   }
   const r = t._2;
   const v = t._1;
diff --git a/jscomp/test/dist/jscomp/test/bang_primitive.js b/jscomp/test/dist/jscomp/test/bang_primitive.js
index 7dd7086ea..d6f49e650 100644
--- a/jscomp/test/dist/jscomp/test/bang_primitive.js
+++ b/jscomp/test/dist/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/dist/jscomp/test/bb.js b/jscomp/test/dist/jscomp/test/bb.js
index 80d14bc14..11f6f93d2 100644
--- a/jscomp/test/dist/jscomp/test/bb.js
+++ b/jscomp/test/dist/jscomp/test/bb.js
@@ -23,13 +23,13 @@ function ff(x) {
         return "c";
     default:
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/bb.ml",
-                  17,
-                  9
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/bb.ml",
+              17,
+              9
+            ]
+          });
   }
 }
 
@@ -47,13 +47,13 @@ function test(x) {
         break;
     default:
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/bb.ml",
-                  26,
-                  13
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/bb.ml",
+              26,
+              13
+            ]
+          });
   }
   if (match === "b") {
     return "b";
diff --git a/jscomp/test/dist/jscomp/test/bdd.js b/jscomp/test/dist/jscomp/test/bdd.js
index 1dab08ffb..2377d443a 100644
--- a/jscomp/test/dist/jscomp/test/bdd.js
+++ b/jscomp/test/dist/jscomp/test/bdd.js
@@ -69,22 +69,22 @@ function resize(newSize) {
       if (/* tag */typeof n === "number" || typeof n === "string") {
         if (n === /* One */0) {
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/bdd.ml",
-                      54,
-                      27
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/bdd.ml",
+                  54,
+                  27
+                ]
+              });
         }
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/bdd.ml",
-                    54,
-                    27
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/bdd.ml",
+                54,
+                27
+              ]
+            });
       } else {
         const ind = hashVal(getId(n._0), getId(n._3), n._1) & newSz_1;
         Caml_array.set(newArr, ind, {
@@ -143,22 +143,22 @@ function mkNode(low, v, high) {
       if (/* tag */typeof n === "number" || typeof n === "string") {
         if (n === /* One */0) {
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/bdd.ml",
-                      99,
-                      31
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/bdd.ml",
+                  99,
+                  31
+                ]
+              });
         }
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/bdd.ml",
-                    99,
-                    31
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/bdd.ml",
+                99,
+                31
+              ]
+            });
       } else {
         if (v === n._1 && idl === getId(n._0) && idh === getId(n._3)) {
           return n;
@@ -398,13 +398,13 @@ function main(param) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bdd.ml",
-              233,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bdd.ml",
+          233,
+          2
+        ]
+      });
 }
 
 main(undefined);
diff --git a/jscomp/test/dist/jscomp/test/belt_internal_test.js b/jscomp/test/dist/jscomp/test/belt_internal_test.js
index 9f403dab7..d9981eddc 100644
--- a/jscomp/test/dist/jscomp/test/belt_internal_test.js
+++ b/jscomp/test/dist/jscomp/test/belt_internal_test.js
@@ -21,11 +21,11 @@ function copy(n) {
   const l = match.left;
   const r = match.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/dist/jscomp/test/bench.js b/jscomp/test/dist/jscomp/test/bench.js
index 7081dc88f..784d1f647 100644
--- a/jscomp/test/dist/jscomp/test/bench.js
+++ b/jscomp/test/dist/jscomp/test/bench.js
@@ -26,9 +26,9 @@ function init(l, f) {
   }
   if (l < 0) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Array.init"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Array.init"
+        });
   }
   const res = Caml_array.make(l, f$1(0));
   for (let i = 1; i < l; ++i) {
diff --git a/jscomp/test/dist/jscomp/test/big_polyvar_test.js b/jscomp/test/dist/jscomp/test/big_polyvar_test.js
index 48e4c3488..340ca63f0 100644
--- a/jscomp/test/dist/jscomp/test/big_polyvar_test.js
+++ b/jscomp/test/dist/jscomp/test/big_polyvar_test.js
@@ -27,3313 +27,3313 @@ function eq(x, y) {
 
 if (!eq(tFromJs("variant0"), "variant0")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              610,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          610,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant1"), "variant1")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              611,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          611,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant2"), "variant2")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              612,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          612,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant3"), "variant3")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              613,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          613,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant4"), "variant4")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              614,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          614,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant5"), "variant5")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              615,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          615,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant6"), "variant6")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              616,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          616,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant7"), "variant7")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              617,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          617,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant8"), "variant8")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              618,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          618,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant9"), "variant9")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              619,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          619,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant10"), "variant10")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              620,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          620,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant11"), "variant11")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              621,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          621,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant12"), "variant12")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              622,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          622,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant13"), "variant13")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              623,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          623,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant14"), "variant14")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              624,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          624,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant15"), "variant15")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              625,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          625,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant16"), "variant16")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              626,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          626,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant17"), "variant17")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              627,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          627,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant18"), "variant18")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              628,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          628,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant19"), "variant19")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              629,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          629,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant20"), "variant20")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              630,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          630,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant21"), "variant21")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              631,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          631,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant22"), "variant22")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              632,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          632,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant23"), "variant23")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              633,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          633,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant24"), "variant24")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              634,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          634,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant25"), "variant25")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              635,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          635,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant26"), "variant26")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              636,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          636,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant27"), "variant27")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              637,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          637,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant28"), "variant28")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              638,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          638,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant29"), "variant29")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              639,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          639,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant30"), "variant30")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              640,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          640,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant31"), "variant31")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              641,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          641,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant32"), "variant32")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              642,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          642,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant33"), "variant33")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              643,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          643,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant34"), "variant34")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              644,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          644,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant35"), "variant35")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              645,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          645,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant36"), "variant36")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              646,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          646,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant37"), "variant37")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              647,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          647,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant38"), "variant38")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              648,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          648,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant39"), "variant39")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              649,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          649,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant40"), "variant40")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              650,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          650,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant41"), "variant41")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              651,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          651,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant42"), "variant42")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              652,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          652,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant43"), "variant43")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              653,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          653,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant44"), "variant44")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              654,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          654,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant45"), "variant45")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              655,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          655,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant46"), "variant46")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              656,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          656,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant47"), "variant47")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              657,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          657,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant48"), "variant48")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              658,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          658,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant49"), "variant49")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              659,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          659,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant50"), "variant50")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              660,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          660,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant51"), "variant51")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              661,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          661,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant52"), "variant52")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              662,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          662,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant53"), "variant53")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              663,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          663,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant54"), "variant54")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              664,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          664,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant55"), "variant55")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              665,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          665,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant56"), "variant56")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              666,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          666,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant57"), "variant57")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              667,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          667,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant58"), "variant58")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              668,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          668,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant59"), "variant59")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              669,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          669,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant60"), "variant60")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              670,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          670,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant61"), "variant61")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              671,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          671,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant62"), "variant62")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              672,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          672,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant63"), "variant63")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              673,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          673,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant64"), "variant64")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              674,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          674,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant65"), "variant65")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              675,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          675,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant66"), "variant66")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              676,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          676,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant67"), "variant67")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              677,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          677,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant68"), "variant68")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              678,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          678,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant69"), "variant69")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              679,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          679,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant70"), "variant70")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              680,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          680,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant71"), "variant71")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              681,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          681,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant72"), "variant72")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              682,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          682,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant73"), "variant73")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              683,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          683,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant74"), "variant74")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              684,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          684,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant75"), "variant75")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              685,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          685,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant76"), "variant76")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              686,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          686,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant77"), "variant77")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              687,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          687,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant78"), "variant78")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              688,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          688,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant79"), "variant79")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              689,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          689,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant80"), "variant80")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              690,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          690,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant81"), "variant81")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              691,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          691,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant82"), "variant82")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              692,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          692,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant83"), "variant83")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              693,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          693,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant84"), "variant84")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              694,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          694,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant85"), "variant85")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              695,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          695,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant86"), "variant86")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              696,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          696,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant87"), "variant87")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              697,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          697,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant88"), "variant88")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              698,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          698,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant89"), "variant89")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              699,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          699,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant90"), "variant90")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              700,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          700,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant91"), "variant91")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              701,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          701,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant92"), "variant92")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              702,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          702,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant93"), "variant93")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              703,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          703,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant94"), "variant94")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              704,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          704,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant95"), "variant95")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              705,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          705,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant96"), "variant96")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              706,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          706,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant97"), "variant97")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              707,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          707,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant98"), "variant98")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              708,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          708,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant99"), "variant99")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              709,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          709,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant100"), "variant100")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              710,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          710,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant101"), "variant101")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              711,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          711,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant102"), "variant102")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              712,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          712,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant103"), "variant103")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              713,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          713,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant104"), "variant104")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              714,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          714,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant105"), "variant105")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              715,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          715,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant106"), "variant106")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              716,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          716,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant107"), "variant107")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              717,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          717,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant108"), "variant108")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              718,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          718,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant109"), "variant109")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              719,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          719,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant110"), "variant110")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              720,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          720,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant111"), "variant111")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              721,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          721,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant112"), "variant112")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              722,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          722,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant113"), "variant113")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              723,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          723,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant114"), "variant114")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              724,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          724,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant115"), "variant115")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              725,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          725,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant116"), "variant116")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              726,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          726,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant117"), "variant117")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              727,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          727,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant118"), "variant118")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              728,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          728,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant119"), "variant119")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              729,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          729,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant120"), "variant120")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              730,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          730,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant121"), "variant121")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              731,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          731,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant122"), "variant122")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              732,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          732,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant123"), "variant123")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              733,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          733,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant124"), "variant124")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              734,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          734,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant125"), "variant125")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              735,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          735,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant126"), "variant126")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              736,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          736,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant127"), "variant127")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              737,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          737,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant128"), "variant128")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              738,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          738,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant129"), "variant129")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              739,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          739,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant130"), "variant130")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              740,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          740,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant131"), "variant131")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              741,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          741,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant132"), "variant132")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              742,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          742,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant133"), "variant133")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              743,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          743,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant134"), "variant134")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              744,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          744,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant135"), "variant135")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              745,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          745,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant136"), "variant136")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              746,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          746,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant137"), "variant137")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              747,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          747,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant138"), "variant138")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              748,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          748,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant139"), "variant139")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              749,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          749,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant140"), "variant140")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              750,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          750,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant141"), "variant141")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              751,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          751,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant142"), "variant142")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              752,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          752,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant143"), "variant143")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              753,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          753,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant144"), "variant144")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              754,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          754,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant145"), "variant145")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              755,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          755,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant146"), "variant146")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              756,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          756,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant147"), "variant147")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              757,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          757,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant148"), "variant148")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              758,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          758,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant149"), "variant149")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              759,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          759,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant150"), "variant150")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              760,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          760,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant151"), "variant151")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              761,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          761,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant152"), "variant152")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              762,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          762,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant153"), "variant153")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              763,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          763,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant154"), "variant154")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              764,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          764,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant155"), "variant155")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              765,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          765,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant156"), "variant156")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              766,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          766,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant157"), "variant157")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              767,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          767,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant158"), "variant158")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              768,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          768,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant159"), "variant159")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              769,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          769,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant160"), "variant160")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              770,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          770,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant161"), "variant161")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              771,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          771,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant162"), "variant162")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              772,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          772,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant163"), "variant163")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              773,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          773,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant164"), "variant164")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              774,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          774,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant165"), "variant165")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              775,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          775,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant166"), "variant166")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              776,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          776,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant167"), "variant167")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              777,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          777,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant168"), "variant168")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              778,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          778,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant169"), "variant169")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              779,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          779,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant170"), "variant170")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              780,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          780,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant171"), "variant171")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              781,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          781,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant172"), "variant172")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              782,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          782,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant173"), "variant173")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              783,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          783,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant174"), "variant174")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              784,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          784,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant175"), "variant175")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              785,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          785,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant176"), "variant176")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              786,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          786,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant177"), "variant177")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              787,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          787,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant178"), "variant178")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              788,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          788,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant179"), "variant179")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              789,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          789,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant180"), "variant180")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              790,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          790,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant181"), "variant181")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              791,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          791,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant182"), "variant182")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              792,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          792,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant183"), "variant183")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              793,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          793,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant184"), "variant184")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              794,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          794,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant185"), "variant185")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              795,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          795,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant186"), "variant186")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              796,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          796,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant187"), "variant187")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              797,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          797,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant188"), "variant188")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              798,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          798,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant189"), "variant189")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              799,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          799,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant190"), "variant190")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              800,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          800,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant191"), "variant191")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              801,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          801,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant192"), "variant192")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              802,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          802,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant193"), "variant193")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              803,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          803,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant194"), "variant194")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              804,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          804,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant195"), "variant195")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              805,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          805,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant196"), "variant196")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              806,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          806,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant197"), "variant197")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              807,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          807,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant198"), "variant198")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              808,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          808,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant199"), "variant199")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              809,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          809,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant200"), "variant200")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              810,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          810,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant201"), "variant201")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              811,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          811,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant202"), "variant202")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              812,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          812,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant203"), "variant203")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              813,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          813,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant204"), "variant204")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              814,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          814,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant205"), "variant205")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              815,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          815,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant206"), "variant206")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              816,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          816,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant207"), "variant207")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              817,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          817,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant208"), "variant208")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              818,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          818,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant209"), "variant209")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              819,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          819,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant210"), "variant210")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              820,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          820,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant211"), "variant211")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              821,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          821,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant212"), "variant212")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              822,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          822,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant213"), "variant213")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              823,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          823,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant214"), "variant214")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              824,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          824,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant215"), "variant215")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              825,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          825,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant216"), "variant216")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              826,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          826,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant217"), "variant217")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              827,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          827,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant218"), "variant218")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              828,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          828,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant219"), "variant219")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              829,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          829,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant220"), "variant220")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              830,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          830,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant221"), "variant221")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              831,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          831,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant222"), "variant222")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              832,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          832,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant223"), "variant223")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              833,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          833,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant224"), "variant224")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              834,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          834,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant225"), "variant225")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              835,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          835,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant226"), "variant226")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              836,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          836,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant227"), "variant227")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              837,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          837,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant228"), "variant228")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              838,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          838,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant229"), "variant229")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              839,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          839,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant230"), "variant230")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              840,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          840,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant231"), "variant231")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              841,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          841,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant232"), "variant232")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              842,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          842,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant233"), "variant233")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              843,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          843,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant234"), "variant234")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              844,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          844,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant235"), "variant235")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              845,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          845,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant236"), "variant236")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              846,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          846,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant237"), "variant237")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              847,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          847,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant238"), "variant238")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              848,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          848,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant239"), "variant239")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              849,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          849,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant240"), "variant240")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              850,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          850,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant241"), "variant241")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              851,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          851,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant242"), "variant242")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              852,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          852,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant243"), "variant243")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              853,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          853,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant244"), "variant244")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              854,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          854,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant245"), "variant245")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              855,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          855,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant246"), "variant246")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              856,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          856,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant247"), "variant247")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              857,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          857,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant248"), "variant248")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              858,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          858,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant249"), "variant249")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              859,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          859,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant250"), "variant250")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              860,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          860,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant251"), "variant251")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              861,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          861,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant252"), "variant252")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              862,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          862,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant253"), "variant253")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              863,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          863,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant254"), "variant254")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              864,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          864,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant255"), "variant255")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              865,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          865,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant256"), "variant256")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              866,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          866,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant257"), "variant257")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              867,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          867,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant258"), "variant258")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              868,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          868,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant259"), "variant259")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              869,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          869,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant260"), "variant260")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              870,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          870,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant261"), "variant261")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              871,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          871,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant262"), "variant262")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              872,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          872,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant263"), "variant263")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              873,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          873,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant264"), "variant264")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              874,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          874,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant265"), "variant265")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              875,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          875,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant266"), "variant266")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              876,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          876,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant267"), "variant267")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              877,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          877,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant268"), "variant268")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              878,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          878,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant269"), "variant269")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              879,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          879,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant270"), "variant270")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              880,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          880,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant271"), "variant271")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              881,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          881,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant272"), "variant272")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              882,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          882,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant273"), "variant273")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              883,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          883,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant274"), "variant274")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              884,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          884,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant275"), "variant275")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              885,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          885,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant276"), "variant276")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              886,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          886,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant277"), "variant277")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              887,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          887,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant278"), "variant278")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              888,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          888,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant279"), "variant279")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              889,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          889,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant280"), "variant280")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              890,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          890,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant281"), "variant281")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              891,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          891,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant282"), "variant282")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              892,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          892,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant283"), "variant283")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              893,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          893,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant284"), "variant284")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              894,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          894,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant285"), "variant285")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              895,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          895,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant286"), "variant286")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              896,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          896,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant287"), "variant287")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              897,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          897,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant288"), "variant288")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              898,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          898,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant289"), "variant289")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              899,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          899,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant290"), "variant290")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              900,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          900,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant291"), "variant291")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              901,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          901,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant292"), "variant292")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              902,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          902,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant293"), "variant293")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              903,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          903,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant294"), "variant294")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              904,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          904,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant295"), "variant295")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              905,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          905,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant296"), "variant296")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              906,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          906,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant297"), "variant297")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              907,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          907,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant298"), "variant298")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              908,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          908,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("variant299"), "variant299")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              909,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          909,
+          2
+        ]
+      });
 }
 
 if (!eq(tFromJs("xx"), undefined)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/big_polyvar_test.ml",
-              910,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/big_polyvar_test.ml",
+          910,
+          2
+        ]
+      });
 }
 
 exports.tToJs = tToJs;
diff --git a/jscomp/test/dist/jscomp/test/bs_array_test.js b/jscomp/test/dist/jscomp/test/bs_array_test.js
index 15998fc98..22e171a57 100644
--- a/jscomp/test/dist/jscomp/test/bs_array_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_array_test.js
@@ -36,10 +36,10 @@ function neq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Neq */1,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Neq */1,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -139,13 +139,13 @@ const v$1 = [
 
 if (!Belt__Belt_Array.set(v$1, 0, 0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_array_test.ml",
-              38,
-              33
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_array_test.ml",
+          38,
+          33
+        ]
+      });
 }
 
 b("File \"jscomp/test/bs_array_test.ml\", line 38, characters 4-11", Belt__Belt_Array.getExn(v$1, 0) === 0);
@@ -157,13 +157,13 @@ const v$2 = [
 
 if (!Belt__Belt_Array.set(v$2, 1, 0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_array_test.ml",
-              39,
-              32
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_array_test.ml",
+          39,
+          32
+        ]
+      });
 }
 
 b("File \"jscomp/test/bs_array_test.ml\", line 39, characters 4-11", Belt__Belt_Array.getExn(v$2, 1) === 0);
@@ -279,13 +279,13 @@ function addone(x) {
 function makeMatrixExn(sx, sy, init) {
   if (!(sx >= 0 && sy >= 0)) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/bs_array_test.ml",
-                80,
-                2
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/bs_array_test.ml",
+            80,
+            2
+          ]
+        });
   }
   const res = new Array(sx);
   for (let x = 0; x < sx; ++x) {
diff --git a/jscomp/test/dist/jscomp/test/bs_auto_uncurry.js b/jscomp/test/dist/jscomp/test/bs_auto_uncurry.js
index cda4bacd7..e2aa65930 100644
--- a/jscomp/test/dist/jscomp/test/bs_auto_uncurry.js
+++ b/jscomp/test/dist/jscomp/test/bs_auto_uncurry.js
@@ -19,11 +19,11 @@ const 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));
 }
 
 const xs = Array.prototype.map.call([
@@ -38,27 +38,27 @@ const xs = Array.prototype.map.call([
 
 function f_0(param) {
   return hi(function () {
-              
-            });
+        
+      });
 }
 
 function f_01(param) {
   return hi(function () {
-              console.log("x");
-            });
+        console.log("x");
+      });
 }
 
 function f_02(xs) {
   return hi(function () {
-              xs.contents = undefined;
-              console.log("x");
-            });
+        xs.contents = undefined;
+        console.log("x");
+      });
 }
 
 function f_03(xs, u) {
   return hi(function () {
-              return Curry._1(u, undefined);
-            });
+        return Curry._1(u, undefined);
+      });
 }
 
 function fishy(x, y, z) {
@@ -80,26 +80,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/dist/jscomp/test/bs_auto_uncurry_test.js b/jscomp/test/dist/jscomp/test/bs_auto_uncurry_test.js
index 5282eee62..42908c386 100644
--- a/jscomp/test/dist/jscomp/test/bs_auto_uncurry_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/bs_float_test.js b/jscomp/test/dist/jscomp/test/bs_float_test.js
index 40f053554..63566eaa5 100644
--- a/jscomp/test/dist/jscomp/test/bs_float_test.js
+++ b/jscomp/test/dist/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 */1,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Neq */1,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/bs_hashtbl_string_test.js b/jscomp/test/dist/jscomp/test/bs_hashtbl_string_test.js
index 94a25f9bc..384b9b605 100644
--- a/jscomp/test/dist/jscomp/test/bs_hashtbl_string_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_hashtbl_string_test.js
@@ -54,13 +54,13 @@ function bench(param) {
   for (let i$1 = 0; i$1 <= 1000000; ++i$1) {
     if (!Belt__Belt_HashMap.has(empty, i$1)) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/bs_hashtbl_string_test.ml",
-                  50,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/bs_hashtbl_string_test.ml",
+              50,
+              4
+            ]
+          });
     }
     
   }
@@ -75,13 +75,13 @@ function bench2(m) {
   for (let i$1 = 0; i$1 <= 1000000; ++i$1) {
     if (!Belt__Belt_HashMap.has(empty, String(i$1))) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/bs_hashtbl_string_test.ml",
-                  76,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/bs_hashtbl_string_test.ml",
+              76,
+              4
+            ]
+          });
     }
     
   }
@@ -92,13 +92,13 @@ function bench2(m) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_hashtbl_string_test.ml",
-              82,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_hashtbl_string_test.ml",
+          82,
+          2
+        ]
+      });
 }
 
 function bench3(m) {
@@ -111,13 +111,13 @@ function bench3(m) {
   for (let i$1 = 0; i$1 <= 1000000; ++i$1) {
     if (!Belt__Belt_MapDict.has(table, String(i$1), cmp)) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/bs_hashtbl_string_test.ml",
-                  98,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/bs_hashtbl_string_test.ml",
+              98,
+              4
+            ]
+          });
     }
     
   }
@@ -128,13 +128,13 @@ function bench3(m) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_hashtbl_string_test.ml",
-              105,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_hashtbl_string_test.ml",
+          105,
+          2
+        ]
+      });
 }
 
 const Sx = Belt__Belt_Id.comparable(Caml.caml_string_compare);
@@ -147,13 +147,13 @@ function bench4(param) {
   for (let i$1 = 0; i$1 <= 1000000; ++i$1) {
     if (!Belt__Belt_HashMapString.has(table, String(i$1))) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/bs_hashtbl_string_test.ml",
-                  118,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/bs_hashtbl_string_test.ml",
+              118,
+              4
+            ]
+          });
     }
     
   }
@@ -164,13 +164,13 @@ function bench4(param) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_hashtbl_string_test.ml",
-              124,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_hashtbl_string_test.ml",
+          124,
+          2
+        ]
+      });
 }
 
 function bench5(param) {
@@ -184,13 +184,13 @@ function bench5(param) {
   for (let i$1 = 0; i$1 <= 1000000; ++i$1) {
     if (!Belt__Belt_HashMap.has(table, i$1)) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/bs_hashtbl_string_test.ml",
-                  138,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/bs_hashtbl_string_test.ml",
+              138,
+              6
+            ]
+          });
     }
     
   }
@@ -204,13 +204,13 @@ function bench5(param) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_hashtbl_string_test.ml",
-              144,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_hashtbl_string_test.ml",
+          144,
+          2
+        ]
+      });
 }
 
 function bench6(param) {
@@ -221,13 +221,13 @@ function bench6(param) {
   for (let i$1 = 0; i$1 <= 1000000; ++i$1) {
     if (!Belt__Belt_HashMapInt.has(table, i$1)) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/bs_hashtbl_string_test.ml",
-                  156,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/bs_hashtbl_string_test.ml",
+              156,
+              4
+            ]
+          });
     }
     
   }
@@ -238,13 +238,13 @@ function bench6(param) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_hashtbl_string_test.ml",
-              162,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_hashtbl_string_test.ml",
+          162,
+          2
+        ]
+      });
 }
 
 function bench7(param) {
@@ -255,13 +255,13 @@ function bench7(param) {
   for (let i$1 = 0; i$1 <= 1000000; ++i$1) {
     if (!Belt__Belt_HashSetInt.has(table, i$1)) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/bs_hashtbl_string_test.ml",
-                  181,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/bs_hashtbl_string_test.ml",
+              181,
+              4
+            ]
+          });
     }
     
   }
@@ -272,13 +272,13 @@ function bench7(param) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_hashtbl_string_test.ml",
-              192,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_hashtbl_string_test.ml",
+          192,
+          2
+        ]
+      });
 }
 
 console.time("bs_hashtbl_string_test.ml 203");
diff --git a/jscomp/test/dist/jscomp/test/bs_ignore_effect.js b/jscomp/test/dist/jscomp/test/bs_ignore_effect.js
index 35cf2ae7f..afa73a0f2 100644
--- a/jscomp/test/dist/jscomp/test/bs_ignore_effect.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/bs_int_test.js b/jscomp/test/dist/jscomp/test/bs_int_test.js
index aa9301b72..44863758c 100644
--- a/jscomp/test/dist/jscomp/test/bs_int_test.js
+++ b/jscomp/test/dist/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 */1,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Neq */1,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/bs_list_test.js b/jscomp/test/dist/jscomp/test/bs_list_test.js
index d99440f9d..6ac7f383a 100644
--- a/jscomp/test/dist/jscomp/test/bs_list_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_list_test.js
@@ -1587,12 +1587,12 @@ eq("File \"jscomp/test/bs_list_test.ml\", line 224, characters 5-12", Belt__Belt
           }
         }, (function (i) {
             return Belt__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/dist/jscomp/test/bs_map_set_dict_test.js b/jscomp/test/dist/jscomp/test/bs_map_set_dict_test.js
index 975b9695f..47317467b 100644
--- a/jscomp/test/dist/jscomp/test/bs_map_set_dict_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_map_set_dict_test.js
@@ -114,18 +114,18 @@ function $eq$tilde(a, b) {
 
 const u0 = f(Belt__Belt_Array.map(Array_data_util.randomRange(0, 39), (function (x) {
             return [
-                    x,
-                    x
-                  ];
+              x,
+              x
+            ];
           })));
 
 const u1 = Belt__Belt_Map.set(u0, 39, 120);
 
 b("File \"jscomp/test/bs_map_set_dict_test.ml\", line 80, characters 4-11", Belt__Belt_Array.every2(Belt__Belt_MapDict.toArray(u0.data), Belt__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 \"jscomp/test/bs_map_set_dict_test.ml\", line 80, characters 4-11", Belt
 
 b("File \"jscomp/test/bs_map_set_dict_test.ml\", line 85, characters 4-11", Belt__Belt_List.every2(Belt__Belt_MapDict.toList(u0.data), Belt__Belt_List.fromArray(Belt__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 \"jscomp/test/bs_map_set_dict_test.ml\", line 91, characters 5-12", Bel
 
 const u = f(Belt__Belt_Array.makeByAndShuffle(10000, (function (x) {
             return [
-                    x,
-                    x
-                  ];
+              x,
+              x
+            ];
           })));
 
 eq("File \"jscomp/test/bs_map_set_dict_test.ml\", line 97, characters 4-11", Belt__Belt_Array.makeBy(10000, (function (x) {
             return [
-                    x,
-                    x
-                  ];
+              x,
+              x
+            ];
           })), Belt__Belt_MapDict.toArray(u.data));
 
 Mt.from_pair_suites("Bs_map_set_dict_test", suites.contents);
diff --git a/jscomp/test/dist/jscomp/test/bs_map_test.js b/jscomp/test/dist/jscomp/test/bs_map_test.js
index efe406266..db8768e81 100644
--- a/jscomp/test/dist/jscomp/test/bs_map_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _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 */4,
-                  _0: v
-                };
+            TAG: /* Ok */4,
+            _0: v
+          };
         })
     ],
     tl: suites.contents
@@ -57,9 +57,9 @@ function emptyMap(param) {
 
 const v = Belt__Belt_Array.makeByAndShuffle(1000000, (function (i) {
         return [
-                i,
-                i
-              ];
+          i,
+          i
+        ];
       }));
 
 const u = Belt__Belt_MapInt.fromArray(v);
diff --git a/jscomp/test/dist/jscomp/test/bs_poly_map_test.js b/jscomp/test/dist/jscomp/test/bs_poly_map_test.js
index 0c82313ba..3069627ad 100644
--- a/jscomp/test/dist/jscomp/test/bs_poly_map_test.js
+++ b/jscomp/test/dist/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__Belt_Array.map(Array_data_util.randomRange(i, j), (function (x) {
-                return [
-                        x,
-                        x
-                      ];
-              }));
+          return [
+            x,
+            x
+          ];
+        }));
 }
 
 const u0 = Belt__Belt_Map.fromArray(randomRange(0, 100), Icmp);
@@ -169,14 +169,14 @@ eq("File \"jscomp/test/bs_poly_map_test.ml\", line 91, characters 5-12", Belt__B
 
 function acc(m, is) {
   return Belt__Belt_Array.reduce(is, m, (function (a, i) {
-                return Belt__Belt_Map.update(a, i, (function (n) {
-                              if (n !== undefined) {
-                                return n + 1 | 0;
-                              } else {
-                                return 1;
-                              }
-                            }));
-              }));
+          return Belt__Belt_Map.update(a, i, (function (n) {
+                  if (n !== undefined) {
+                    return n + 1 | 0;
+                  } else {
+                    return 1;
+                  }
+                }));
+        }));
 }
 
 const m_cmp = Icmp.cmp;
@@ -190,9 +190,9 @@ const m1 = acc(m, Belt__Belt_Array.concat(Array_data_util.randomRange(0, 20), Ar
 
 b("File \"jscomp/test/bs_poly_map_test.ml\", line 103, characters 4-11", Belt__Belt_Map.eq(m1, Belt__Belt_Map.fromArray(Belt__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 @@ const v0 = {
 
 const v1 = Belt__Belt_Map.mergeMany(v0, Belt__Belt_Array.map(Array_data_util.randomRange(0, 10000), (function (x) {
             return [
-                    x,
-                    x
-                  ];
+              x,
+              x
+            ];
           })));
 
 const v2 = Belt__Belt_Map.fromArray(Belt__Belt_Array.map(Array_data_util.randomRange(0, 10000), (function (x) {
             return [
-                    x,
-                    x
-                  ];
+              x,
+              x
+            ];
           })), Icmp);
 
 b("File \"jscomp/test/bs_poly_map_test.ml\", line 117, characters 4-11", Belt__Belt_Map.eq(v1, v2, (function (x, y) {
diff --git a/jscomp/test/dist/jscomp/test/bs_poly_mutable_map_test.js b/jscomp/test/dist/jscomp/test/bs_poly_mutable_map_test.js
index 13b302b14..8623971ce 100644
--- a/jscomp/test/dist/jscomp/test/bs_poly_mutable_map_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_poly_mutable_map_test.js
@@ -38,11 +38,11 @@ function ff(x) {
 
 function randomRange(i, j) {
   return Belt__Belt_Array.map(Array_data_util.randomRange(i, j), (function (x) {
-                return [
-                        x,
-                        x
-                      ];
-              }));
+          return [
+            x,
+            x
+          ];
+        }));
 }
 
 const a0 = Belt__Belt_MutableMap.fromArray(randomRange(0, 10), Icmp);
diff --git a/jscomp/test/dist/jscomp/test/bs_poly_mutable_set_test.js b/jscomp/test/dist/jscomp/test/bs_poly_mutable_set_test.js
index d7396bea9..64379f0dd 100644
--- a/jscomp/test/dist/jscomp/test/bs_poly_mutable_set_test.js
+++ b/jscomp/test/dist/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
+  };
 }
 
 const u = fromArray(Array_data_util.range(0, 30));
diff --git a/jscomp/test/dist/jscomp/test/bs_qualified.js b/jscomp/test/dist/jscomp/test/bs_qualified.js
index a4dd4afa7..4e2238bb6 100644
--- a/jscomp/test/dist/jscomp/test/bs_qualified.js
+++ b/jscomp/test/dist/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/dist/jscomp/test/bs_queue_test.js b/jscomp/test/dist/jscomp/test/bs_queue_test.js
index f182d8b7d..cf5884dc8 100644
--- a/jscomp/test/dist/jscomp/test/bs_queue_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_queue_test.js
@@ -47,24 +47,24 @@ const q = {
 
 if (!(Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q), []) && q.length === 0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              21,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          21,
+          2
+        ]
+      });
 }
 
 if (!(Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray((Belt__Belt_MutableQueue.add(q, 1), q)), [1]) && q.length === 1)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              22,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          22,
+          2
+        ]
+      });
 }
 
 if (!(Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray((Belt__Belt_MutableQueue.add(q, 2), q)), [
@@ -72,13 +72,13 @@ if (!(Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray((Belt__Belt_MutableQue
           2
         ]) && q.length === 2)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              23,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          23,
+          2
+        ]
+      });
 }
 
 if (!(Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray((Belt__Belt_MutableQueue.add(q, 3), q)), [
@@ -87,13 +87,13 @@ if (!(Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray((Belt__Belt_MutableQue
           3
         ]) && q.length === 3)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              24,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          24,
+          2
+        ]
+      });
 }
 
 if (!(Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray((Belt__Belt_MutableQueue.add(q, 4), q)), [
@@ -103,24 +103,24 @@ if (!(Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray((Belt__Belt_MutableQue
           4
         ]) && q.length === 4)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              25,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          25,
+          2
+        ]
+      });
 }
 
 if (Belt__Belt_MutableQueue.popExn(q) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              26,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          26,
+          2
+        ]
+      });
 }
 
 if (!(Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q), [
@@ -129,24 +129,24 @@ if (!(Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q), [
           4
         ]) && q.length === 3)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              26,
-              27
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          26,
+          27
+        ]
+      });
 }
 
 if (Belt__Belt_MutableQueue.popExn(q) !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              27,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          27,
+          2
+        ]
+      });
 }
 
 if (!(Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q), [
@@ -154,68 +154,68 @@ if (!(Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q), [
           4
         ]) && q.length === 2)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              27,
-              27
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          27,
+          27
+        ]
+      });
 }
 
 if (Belt__Belt_MutableQueue.popExn(q) !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              28,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          28,
+          2
+        ]
+      });
 }
 
 if (!(Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q), [4]) && q.length === 1)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              28,
-              27
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          28,
+          27
+        ]
+      });
 }
 
 if (Belt__Belt_MutableQueue.popExn(q) !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              29,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          29,
+          2
+        ]
+      });
 }
 
 if (!(Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q), []) && q.length === 0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              29,
-              27
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          29,
+          27
+        ]
+      });
 }
 
 if (!does_raise(Belt__Belt_MutableQueue.popExn, q)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              30,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          30,
+          2
+        ]
+      });
 }
 
 const q$1 = {
@@ -226,57 +226,57 @@ const q$1 = {
 
 if (Belt__Belt_MutableQueue.popExn((Belt__Belt_MutableQueue.add(q$1, 1), q$1)) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              35,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          35,
+          2
+        ]
+      });
 }
 
 if (!does_raise(Belt__Belt_MutableQueue.popExn, q$1)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              35,
-              34
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          35,
+          34
+        ]
+      });
 }
 
 if (Belt__Belt_MutableQueue.popExn((Belt__Belt_MutableQueue.add(q$1, 2), q$1)) !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              36,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          36,
+          2
+        ]
+      });
 }
 
 if (!does_raise(Belt__Belt_MutableQueue.popExn, q$1)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              36,
-              34
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          36,
+          34
+        ]
+      });
 }
 
 if (q$1.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              37,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          37,
+          2
+        ]
+      });
 }
 
 const q$2 = {
@@ -287,123 +287,123 @@ const q$2 = {
 
 if (Belt__Belt_MutableQueue.peekExn((Belt__Belt_MutableQueue.add(q$2, 1), q$2)) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              42,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          42,
+          2
+        ]
+      });
 }
 
 if (Belt__Belt_MutableQueue.peekExn((Belt__Belt_MutableQueue.add(q$2, 2), q$2)) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              43,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          43,
+          2
+        ]
+      });
 }
 
 if (Belt__Belt_MutableQueue.peekExn((Belt__Belt_MutableQueue.add(q$2, 3), q$2)) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              44,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          44,
+          2
+        ]
+      });
 }
 
 if (Belt__Belt_MutableQueue.peekExn(q$2) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              45,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          45,
+          2
+        ]
+      });
 }
 
 if (Belt__Belt_MutableQueue.popExn(q$2) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              45,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          45,
+          28
+        ]
+      });
 }
 
 if (Belt__Belt_MutableQueue.peekExn(q$2) !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              46,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          46,
+          2
+        ]
+      });
 }
 
 if (Belt__Belt_MutableQueue.popExn(q$2) !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              46,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          46,
+          28
+        ]
+      });
 }
 
 if (Belt__Belt_MutableQueue.peekExn(q$2) !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              47,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          47,
+          2
+        ]
+      });
 }
 
 if (Belt__Belt_MutableQueue.popExn(q$2) !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              47,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          47,
+          28
+        ]
+      });
 }
 
 if (!does_raise(Belt__Belt_MutableQueue.peekExn, q$2)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              48,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          48,
+          2
+        ]
+      });
 }
 
 if (!does_raise(Belt__Belt_MutableQueue.peekExn, q$2)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              49,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          49,
+          2
+        ]
+      });
 }
 
 const q$3 = {
@@ -420,24 +420,24 @@ Belt__Belt_MutableQueue.clear(q$3);
 
 if (q$3.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              56,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          56,
+          2
+        ]
+      });
 }
 
 if (!does_raise(Belt__Belt_MutableQueue.popExn, q$3)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              57,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          57,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(q$3, {
@@ -446,26 +446,26 @@ if (!Caml_obj.caml_equal(q$3, {
         last: undefined
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              58,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          58,
+          2
+        ]
+      });
 }
 
 Belt__Belt_MutableQueue.add(q$3, 42);
 
 if (Belt__Belt_MutableQueue.popExn(q$3) !== 42) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              60,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          60,
+          2
+        ]
+      });
 }
 
 const q1 = {
@@ -493,13 +493,13 @@ if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q1), [
         10
       ])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              67,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          67,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q2), [
@@ -515,47 +515,47 @@ if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q2), [
         10
       ])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              68,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          68,
+          2
+        ]
+      });
 }
 
 if (q1.length !== 10) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              69,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          69,
+          2
+        ]
+      });
 }
 
 if (q2.length !== 10) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              70,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          70,
+          2
+        ]
+      });
 }
 
 for (let i$2 = 1; i$2 <= 10; ++i$2) {
   if (Belt__Belt_MutableQueue.popExn(q1) !== i$2) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/bs_queue_test.ml",
-                72,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/bs_queue_test.ml",
+            72,
+            4
+          ]
+        });
   }
   
 }
@@ -563,13 +563,13 @@ for (let i$2 = 1; i$2 <= 10; ++i$2) {
 for (let i$3 = 1; i$3 <= 10; ++i$3) {
   if (Belt__Belt_MutableQueue.popExn(q2) !== i$3) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/bs_queue_test.ml",
-                75,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/bs_queue_test.ml",
+            75,
+            4
+          ]
+        });
   }
   
 }
@@ -582,36 +582,36 @@ const q$4 = {
 
 if (q$4.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              81,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          81,
+          2
+        ]
+      });
 }
 
 for (let i$4 = 1; i$4 <= 10; ++i$4) {
   Belt__Belt_MutableQueue.add(q$4, i$4);
   if (q$4.length !== i$4) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/bs_queue_test.ml",
-                84,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/bs_queue_test.ml",
+            84,
+            4
+          ]
+        });
   }
   if (q$4.length === 0) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/bs_queue_test.ml",
-                85,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/bs_queue_test.ml",
+            85,
+            4
+          ]
+        });
   }
   
 }
@@ -619,47 +619,47 @@ for (let i$4 = 1; i$4 <= 10; ++i$4) {
 for (let i$5 = 10; i$5 >= 1; --i$5) {
   if (q$4.length !== i$5) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/bs_queue_test.ml",
-                88,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/bs_queue_test.ml",
+            88,
+            4
+          ]
+        });
   }
   if (q$4.length === 0) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/bs_queue_test.ml",
-                89,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/bs_queue_test.ml",
+            89,
+            4
+          ]
+        });
   }
   Belt__Belt_MutableQueue.popExn(q$4);
 }
 
 if (q$4.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              92,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          92,
+          2
+        ]
+      });
 }
 
 if (q$4.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              93,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          93,
+          2
+        ]
+      });
 }
 
 const q$5 = {
@@ -679,13 +679,13 @@ const i$7 = {
 Belt__Belt_MutableQueue.forEach(q$5, (function (j) {
         if (i$7.contents !== j) {
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/bs_queue_test.ml",
-                      100,
-                      24
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/bs_queue_test.ml",
+                  100,
+                  24
+                ]
+              });
         }
         i$7.contents = i$7.contents + 1 | 0;
       }));
@@ -704,92 +704,92 @@ const q2$1 = {
 
 if (q1$1.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              105,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          105,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q1$1), [])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              105,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          105,
+          26
+        ]
+      });
 }
 
 if (q2$1.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              106,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          106,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q2$1), [])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              106,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          106,
+          26
+        ]
+      });
 }
 
 Belt__Belt_MutableQueue.transfer(q1$1, q2$1);
 
 if (q1$1.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              108,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          108,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q1$1), [])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              108,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          108,
+          26
+        ]
+      });
 }
 
 if (q2$1.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              109,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          109,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q2$1), [])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              109,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          109,
+          26
+        ]
+      });
 }
 
 const q1$2 = {
@@ -810,13 +810,13 @@ for (let i$8 = 1; i$8 <= 4; ++i$8) {
 
 if (q1$2.length !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              115,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          115,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q1$2), [
@@ -826,70 +826,70 @@ if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q1$2), [
         4
       ])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              115,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          115,
+          26
+        ]
+      });
 }
 
 if (q2$2.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              116,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          116,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q2$2), [])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              116,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          116,
+          26
+        ]
+      });
 }
 
 Belt__Belt_MutableQueue.transfer(q1$2, q2$2);
 
 if (q1$2.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              118,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          118,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q1$2), [])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              118,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          118,
+          26
+        ]
+      });
 }
 
 if (q2$2.length !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              119,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          119,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q2$2), [
@@ -899,13 +899,13 @@ if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q2$2), [
         4
       ])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              119,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          119,
+          26
+        ]
+      });
 }
 
 const q1$3 = {
@@ -926,35 +926,35 @@ for (let i$9 = 5; i$9 <= 8; ++i$9) {
 
 if (q1$3.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              125,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          125,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q1$3), [])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              125,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          125,
+          26
+        ]
+      });
 }
 
 if (q2$3.length !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              126,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          126,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q2$3), [
@@ -964,48 +964,48 @@ if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q2$3), [
         8
       ])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              126,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          126,
+          26
+        ]
+      });
 }
 
 Belt__Belt_MutableQueue.transfer(q1$3, q2$3);
 
 if (q1$3.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              128,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          128,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q1$3), [])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              128,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          128,
+          26
+        ]
+      });
 }
 
 if (q2$3.length !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              129,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          129,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q2$3), [
@@ -1015,13 +1015,13 @@ if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q2$3), [
         8
       ])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              129,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          129,
+          26
+        ]
+      });
 }
 
 const q1$4 = {
@@ -1046,13 +1046,13 @@ for (let i$11 = 5; i$11 <= 8; ++i$11) {
 
 if (q1$4.length !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              136,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          136,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q1$4), [
@@ -1062,24 +1062,24 @@ if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q1$4), [
         4
       ])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              136,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          136,
+          26
+        ]
+      });
 }
 
 if (q2$4.length !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              137,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          137,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q2$4), [
@@ -1089,37 +1089,37 @@ if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q2$4), [
         8
       ])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              137,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          137,
+          26
+        ]
+      });
 }
 
 Belt__Belt_MutableQueue.transfer(q1$4, q2$4);
 
 if (q1$4.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              139,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          139,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q1$4), [])) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              139,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          139,
+          26
+        ]
+      });
 }
 
 const v = [
@@ -1135,24 +1135,24 @@ const v = [
 
 if (q2$4.length !== 8) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              141,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          141,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Belt__Belt_MutableQueue.toArray(q2$4), v)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              141,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          141,
+          26
+        ]
+      });
 }
 
 if (Belt__Belt_MutableQueue.reduce(q2$4, 0, (function (x, y) {
@@ -1161,13 +1161,13 @@ if (Belt__Belt_MutableQueue.reduce(q2$4, 0, (function (x, y) {
           return x - y | 0;
         }))) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_queue_test.ml",
-              143,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_queue_test.ml",
+          143,
+          2
+        ]
+      });
 }
 
 console.log("OK");
diff --git a/jscomp/test/dist/jscomp/test/bs_rbset_int_bench.js b/jscomp/test/dist/jscomp/test/bs_rbset_int_bench.js
index 7a53458ba..af97421fe 100644
--- a/jscomp/test/dist/jscomp/test/bs_rbset_int_bench.js
+++ b/jscomp/test/dist/jscomp/test/bs_rbset_int_bench.js
@@ -15,13 +15,13 @@ function bench(param) {
   for (let i$1 = 0; i$1 <= 1000000; ++i$1) {
     if (!Rbset.mem(i$1, data)) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/bs_rbset_int_bench.ml",
-                  12,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/bs_rbset_int_bench.ml",
+              12,
+              4
+            ]
+          });
     }
     
   }
@@ -35,13 +35,13 @@ function bench(param) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_rbset_int_bench.ml",
-              17,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_rbset_int_bench.ml",
+          17,
+          2
+        ]
+      });
 }
 
 console.time("bs_rbset_int_bench.ml 21");
diff --git a/jscomp/test/dist/jscomp/test/bs_set_bench.js b/jscomp/test/dist/jscomp/test/bs_set_bench.js
index 7ad9b81ba..3d4fcec15 100644
--- a/jscomp/test/dist/jscomp/test/bs_set_bench.js
+++ b/jscomp/test/dist/jscomp/test/bs_set_bench.js
@@ -15,13 +15,13 @@ function bench(param) {
   for (let i$1 = 0; i$1 <= 1000000; ++i$1) {
     if (!Belt__Belt_SetInt.has(data, i$1)) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/bs_set_bench.ml",
-                  12,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/bs_set_bench.ml",
+              12,
+              4
+            ]
+          });
     }
     
   }
@@ -35,13 +35,13 @@ function bench(param) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/bs_set_bench.ml",
-              17,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/bs_set_bench.ml",
+          17,
+          2
+        ]
+      });
 }
 
 console.time("bs_set_bench.ml 21");
diff --git a/jscomp/test/dist/jscomp/test/bs_set_int_test.js b/jscomp/test/dist/jscomp/test/bs_set_int_test.js
index b0653e03b..7975f6d9c 100644
--- a/jscomp/test/dist/jscomp/test/bs_set_int_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_set_int_test.js
@@ -56,14 +56,14 @@ b("File \"jscomp/test/bs_set_int_test.ml\", line 23, characters 4-11", Belt__Bel
 
 function range(i, j) {
   return Stdlib__Array.init((j - i | 0) + 1 | 0, (function (k) {
-                return k + i | 0;
-              }));
+          return k + i | 0;
+        }));
 }
 
 function revRange(i, j) {
   return Stdlib__Array.of_list(Stdlib__List.rev(Stdlib__Array.to_list(Stdlib__Array.init((j - i | 0) + 1 | 0, (function (k) {
-                            return k + i | 0;
-                          })))));
+                      return k + i | 0;
+                    })))));
 }
 
 const v = Belt__Belt_SetInt.fromArray(Stdlib__Array.append(range(100, 1000), revRange(400, 1500)));
diff --git a/jscomp/test/dist/jscomp/test/bs_stack_test.js b/jscomp/test/dist/jscomp/test/bs_stack_test.js
index c424b0088..6d571a6c7 100644
--- a/jscomp/test/dist/jscomp/test/bs_stack_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_stack_test.js
@@ -103,10 +103,10 @@ function inOrder2(v) {
 
 function n(l, r, a) {
   return {
-          value: a,
-          left: Js__Js_undefined.fromOption(l),
-          right: Js__Js_undefined.fromOption(r)
-        };
+    value: a,
+    left: Js__Js_undefined.fromOption(l),
+    right: Js__Js_undefined.fromOption(r)
+  };
 }
 
 const test1 = n(n(n(undefined, undefined, 4), n(undefined, undefined, 5), 2), n(undefined, undefined, 3), 1);
diff --git a/jscomp/test/dist/jscomp/test/bs_string_test.js b/jscomp/test/dist/jscomp/test/bs_string_test.js
index 01e2a858a..b70b4262f 100644
--- a/jscomp/test/dist/jscomp/test/bs_string_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/bs_unwrap_test.js b/jscomp/test/dist/jscomp/test/bs_unwrap_test.js
index eb9270d48..c003513f8 100644
--- a/jscomp/test/dist/jscomp/test/bs_unwrap_test.js
+++ b/jscomp/test/dist/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
+  };
 }
 
 let none_arg;
diff --git a/jscomp/test/dist/jscomp/test/buffer_test.js b/jscomp/test/dist/jscomp/test/buffer_test.js
index 5ab9aba03..a2eb60247 100644
--- a/jscomp/test/dist/jscomp/test/buffer_test.js
+++ b/jscomp/test/dist/jscomp/test/buffer_test.js
@@ -12,16 +12,16 @@ const suites_0 = [
   "equal",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: [
-                Caml_bytes.get(Stdlib__Bytes.make(3, /* 'a' */97), 0),
-                Stdlib__Bytes.make(3, /* 'a' */97)[0]
-              ],
-              _1: [
-                /* 'a' */97,
-                /* 'a' */97
-              ]
-            };
+        TAG: /* Eq */0,
+        _0: [
+          Caml_bytes.get(Stdlib__Bytes.make(3, /* 'a' */97), 0),
+          Stdlib__Bytes.make(3, /* 'a' */97)[0]
+        ],
+        _1: [
+          /* 'a' */97,
+          /* 'a' */97
+        ]
+      };
     })
 ];
 
@@ -32,16 +32,16 @@ const suites_1 = {
         const u = Stdlib__Bytes.make(3, /* 'a' */97);
         u[0] = /* 'b' */98;
         return {
-                TAG: /* Eq */0,
-                _0: [
-                  u[0],
-                  /* 'g' */103
-                ],
-                _1: [
-                  /* 'b' */98,
-                  /* 'g' */103
-                ]
-              };
+          TAG: /* Eq */0,
+          _0: [
+            u[0],
+            /* 'g' */103
+          ],
+          _1: [
+            /* 'b' */98,
+            /* 'g' */103
+          ]
+        };
       })
   ],
   tl: {
@@ -53,10 +53,10 @@ const suites_1 = {
             Stdlib__Buffer.add_string(v, String(i));
           }
           return {
-                  TAG: /* Eq */0,
-                  _0: Stdlib__Buffer.contents(v),
-                  _1: "012345678910"
-                };
+            TAG: /* Eq */0,
+            _0: Stdlib__Buffer.contents(v),
+            _1: "012345678910"
+          };
         })
     ],
     tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/bytes_split_gpr_743_test.js b/jscomp/test/dist/jscomp/test/bytes_split_gpr_743_test.js
index f5cbeb324..831de4992 100644
--- a/jscomp/test/dist/jscomp/test/bytes_split_gpr_743_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/caml_compare_bigint_test.js b/jscomp/test/dist/jscomp/test/caml_compare_bigint_test.js
index d36e7dfbc..dbe6e0641 100644
--- a/jscomp/test/dist/jscomp/test/caml_compare_bigint_test.js
+++ b/jscomp/test/dist/jscomp/test/caml_compare_bigint_test.js
@@ -7,207 +7,204 @@ const Stdlib = require("melange/stdlib.js");
 
 function isLessThan(title, small, big) {
   return {
+    hd: [
+      "compare: " + title,
+      (function (param) {
+          return {
+            TAG: /* Eq */0,
+            _0: true,
+            _1: Caml_obj.caml_compare(big, small) > 0
+          };
+        })
+    ],
+    tl: {
+      hd: [
+        "compare: " + title,
+        (function (param) {
+            return {
+              TAG: /* Eq */0,
+              _0: true,
+              _1: Caml_obj.caml_compare(small, big) < 0
+            };
+          })
+      ],
+      tl: {
+        hd: [
+          "< operator: " + title,
+          (function (param) {
+              return {
+                TAG: /* Eq */0,
+                _0: true,
+                _1: Caml_obj.caml_lessthan(small, big)
+              };
+            })
+        ],
+        tl: {
           hd: [
-            "compare: " + title,
+            "<= operator: " + title,
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: true,
-                        _1: Caml_obj.caml_compare(big, small) > 0
-                      };
+                  TAG: /* Eq */0,
+                  _0: true,
+                  _1: Caml_obj.caml_lessequal(small, big)
+                };
               })
           ],
           tl: {
             hd: [
-              "compare: " + title,
+              "> operator: " + title,
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: true,
-                          _1: Caml_obj.caml_compare(small, big) < 0
-                        };
+                    TAG: /* Eq */0,
+                    _0: true,
+                    _1: Caml_obj.caml_greaterthan(big, small)
+                  };
                 })
             ],
             tl: {
               hd: [
-                "< operator: " + title,
+                ">= operator: " + title,
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: true,
-                            _1: Caml_obj.caml_lessthan(small, big)
-                          };
+                      TAG: /* Eq */0,
+                      _0: true,
+                      _1: Caml_obj.caml_greaterequal(big, small)
+                    };
                   })
               ],
               tl: {
                 hd: [
-                  "<= operator: " + title,
+                  "min: " + title,
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: true,
-                              _1: Caml_obj.caml_lessequal(small, big)
-                            };
+                        TAG: /* Eq */0,
+                        _0: small,
+                        _1: Caml_obj.caml_min(big, small)
+                      };
                     })
                 ],
                 tl: {
                   hd: [
-                    "> operator: " + title,
+                    "min: " + title,
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: true,
-                                _1: Caml_obj.caml_greaterthan(big, small)
-                              };
+                          TAG: /* Eq */0,
+                          _0: small,
+                          _1: Caml_obj.caml_min(small, big)
+                        };
                       })
                   ],
                   tl: {
                     hd: [
-                      ">= operator: " + title,
+                      "max: " + title,
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: true,
-                                  _1: Caml_obj.caml_greaterequal(big, small)
-                                };
+                            TAG: /* Eq */0,
+                            _0: big,
+                            _1: Caml_obj.caml_max(big, small)
+                          };
                         })
                     ],
                     tl: {
                       hd: [
-                        "min: " + title,
+                        "max: " + title,
                         (function (param) {
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: small,
-                                    _1: Caml_obj.caml_min(big, small)
-                                  };
+                              TAG: /* Eq */0,
+                              _0: big,
+                              _1: Caml_obj.caml_max(small, big)
+                            };
                           })
                       ],
                       tl: {
                         hd: [
-                          "min: " + title,
+                          "!= operator: " + title,
                           (function (param) {
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: small,
-                                      _1: Caml_obj.caml_min(small, big)
-                                    };
+                                TAG: /* Eq */0,
+                                _0: true,
+                                _1: big !== small
+                              };
                             })
                         ],
                         tl: {
                           hd: [
-                            "max: " + title,
+                            "!= operator: " + title,
                             (function (param) {
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: big,
-                                        _1: Caml_obj.caml_max(big, small)
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: true,
+                                  _1: small !== big
+                                };
                               })
                           ],
                           tl: {
                             hd: [
-                              "max: " + title,
+                              "<> operator: " + title,
                               (function (param) {
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: big,
-                                          _1: Caml_obj.caml_max(small, big)
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: true,
+                                    _1: Caml_obj.caml_notequal(big, small)
+                                  };
                                 })
                             ],
                             tl: {
                               hd: [
-                                "!= operator: " + title,
+                                "<> operator: " + title,
                                 (function (param) {
                                     return {
-                                            TAG: /* Eq */0,
-                                            _0: true,
-                                            _1: big !== small
-                                          };
+                                      TAG: /* Eq */0,
+                                      _0: true,
+                                      _1: Caml_obj.caml_notequal(small, big)
+                                    };
                                   })
                               ],
                               tl: {
                                 hd: [
-                                  "!= operator: " + title,
+                                  "= operator: " + title,
                                   (function (param) {
                                       return {
-                                              TAG: /* Eq */0,
-                                              _0: true,
-                                              _1: small !== big
-                                            };
+                                        TAG: /* Eq */0,
+                                        _0: false,
+                                        _1: Caml_obj.caml_equal(big, small)
+                                      };
                                     })
                                 ],
                                 tl: {
                                   hd: [
-                                    "<> operator: " + title,
+                                    "= operator: " + title,
                                     (function (param) {
                                         return {
-                                                TAG: /* Eq */0,
-                                                _0: true,
-                                                _1: Caml_obj.caml_notequal(big, small)
-                                              };
+                                          TAG: /* Eq */0,
+                                          _0: false,
+                                          _1: Caml_obj.caml_equal(small, big)
+                                        };
                                       })
                                   ],
                                   tl: {
                                     hd: [
-                                      "<> operator: " + title,
+                                      "== operator: " + title,
                                       (function (param) {
                                           return {
-                                                  TAG: /* Eq */0,
-                                                  _0: true,
-                                                  _1: Caml_obj.caml_notequal(small, big)
-                                                };
+                                            TAG: /* Eq */0,
+                                            _0: false,
+                                            _1: big === small
+                                          };
                                         })
                                     ],
                                     tl: {
                                       hd: [
-                                        "= operator: " + title,
+                                        "== operator: " + title,
                                         (function (param) {
                                             return {
-                                                    TAG: /* Eq */0,
-                                                    _0: false,
-                                                    _1: Caml_obj.caml_equal(big, small)
-                                                  };
+                                              TAG: /* Eq */0,
+                                              _0: false,
+                                              _1: small === big
+                                            };
                                           })
                                       ],
-                                      tl: {
-                                        hd: [
-                                          "= operator: " + title,
-                                          (function (param) {
-                                              return {
-                                                      TAG: /* Eq */0,
-                                                      _0: false,
-                                                      _1: Caml_obj.caml_equal(small, big)
-                                                    };
-                                            })
-                                        ],
-                                        tl: {
-                                          hd: [
-                                            "== operator: " + title,
-                                            (function (param) {
-                                                return {
-                                                        TAG: /* Eq */0,
-                                                        _0: false,
-                                                        _1: big === small
-                                                      };
-                                              })
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "== operator: " + title,
-                                              (function (param) {
-                                                  return {
-                                                          TAG: /* Eq */0,
-                                                          _0: false,
-                                                          _1: small === big
-                                                        };
-                                                })
-                                            ],
-                                            tl: /* [] */0
-                                          }
-                                        }
-                                      }
+                                      tl: /* [] */0
                                     }
                                   }
                                 }
@@ -222,190 +219,190 @@ function isLessThan(title, small, big) {
               }
             }
           }
-        };
+        }
+      }
+    }
+  };
 }
 
 function isEqual(title, num1, num2) {
   return {
+    hd: [
+      "< operator: " + title,
+      (function (param) {
+          return {
+            TAG: /* Eq */0,
+            _0: false,
+            _1: Caml_obj.caml_lessthan(num2, num1)
+          };
+        })
+    ],
+    tl: {
+      hd: [
+        "<= operator: " + title,
+        (function (param) {
+            return {
+              TAG: /* Eq */0,
+              _0: true,
+              _1: Caml_obj.caml_lessequal(num2, num1)
+            };
+          })
+      ],
+      tl: {
+        hd: [
+          "> operator: " + title,
+          (function (param) {
+              return {
+                TAG: /* Eq */0,
+                _0: false,
+                _1: Caml_obj.caml_greaterthan(num1, num2)
+              };
+            })
+        ],
+        tl: {
           hd: [
-            "< operator: " + title,
+            ">= operator: " + title,
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: false,
-                        _1: Caml_obj.caml_lessthan(num2, num1)
-                      };
+                  TAG: /* Eq */0,
+                  _0: true,
+                  _1: Caml_obj.caml_greaterequal(num1, num2)
+                };
               })
           ],
           tl: {
             hd: [
-              "<= operator: " + title,
+              "min: " + title,
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: true,
-                          _1: Caml_obj.caml_lessequal(num2, num1)
-                        };
+                    TAG: /* Eq */0,
+                    _0: num1,
+                    _1: Caml_obj.caml_min(num1, num2)
+                  };
                 })
             ],
             tl: {
               hd: [
-                "> operator: " + title,
+                "max: " + title,
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: false,
-                            _1: Caml_obj.caml_greaterthan(num1, num2)
-                          };
+                      TAG: /* Eq */0,
+                      _0: num1,
+                      _1: Caml_obj.caml_max(num1, num2)
+                    };
                   })
               ],
               tl: {
                 hd: [
-                  ">= operator: " + title,
+                  "compare: " + title,
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: true,
-                              _1: Caml_obj.caml_greaterequal(num1, num2)
-                            };
+                        TAG: /* Eq */0,
+                        _0: 0,
+                        _1: Caml_obj.caml_compare(num1, num2)
+                      };
                     })
                 ],
                 tl: {
                   hd: [
-                    "min: " + title,
+                    "compare: " + title,
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: num1,
-                                _1: Caml_obj.caml_min(num1, num2)
-                              };
+                          TAG: /* Eq */0,
+                          _0: 0,
+                          _1: Caml_obj.caml_compare(num2, num1)
+                        };
                       })
                   ],
                   tl: {
                     hd: [
-                      "max: " + title,
+                      "!= operator: " + title,
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: num1,
-                                  _1: Caml_obj.caml_max(num1, num2)
-                                };
+                            TAG: /* Eq */0,
+                            _0: false,
+                            _1: num1 !== num2
+                          };
                         })
                     ],
                     tl: {
                       hd: [
-                        "compare: " + title,
+                        "!= operator: " + title,
                         (function (param) {
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: 0,
-                                    _1: Caml_obj.caml_compare(num1, num2)
-                                  };
+                              TAG: /* Eq */0,
+                              _0: false,
+                              _1: num2 !== num1
+                            };
                           })
                       ],
                       tl: {
                         hd: [
-                          "compare: " + title,
+                          "<> operator: " + title,
                           (function (param) {
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: 0,
-                                      _1: Caml_obj.caml_compare(num2, num1)
-                                    };
+                                TAG: /* Eq */0,
+                                _0: false,
+                                _1: Caml_obj.caml_notequal(num1, num2)
+                              };
                             })
                         ],
                         tl: {
                           hd: [
-                            "!= operator: " + title,
+                            "<> operator: " + title,
                             (function (param) {
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: false,
-                                        _1: num1 !== num2
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: false,
+                                  _1: Caml_obj.caml_notequal(num2, num1)
+                                };
                               })
                           ],
                           tl: {
                             hd: [
-                              "!= operator: " + title,
+                              "= operator: " + title,
                               (function (param) {
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: false,
-                                          _1: num2 !== num1
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: true,
+                                    _1: Caml_obj.caml_equal(num1, num2)
+                                  };
                                 })
                             ],
                             tl: {
                               hd: [
-                                "<> operator: " + title,
+                                "= operator: " + title,
                                 (function (param) {
                                     return {
-                                            TAG: /* Eq */0,
-                                            _0: false,
-                                            _1: Caml_obj.caml_notequal(num1, num2)
-                                          };
+                                      TAG: /* Eq */0,
+                                      _0: true,
+                                      _1: Caml_obj.caml_equal(num2, num1)
+                                    };
                                   })
                               ],
                               tl: {
                                 hd: [
-                                  "<> operator: " + title,
+                                  "== operator: " + title,
                                   (function (param) {
                                       return {
-                                              TAG: /* Eq */0,
-                                              _0: false,
-                                              _1: Caml_obj.caml_notequal(num2, num1)
-                                            };
+                                        TAG: /* Eq */0,
+                                        _0: true,
+                                        _1: num1 === num2
+                                      };
                                     })
                                 ],
                                 tl: {
                                   hd: [
-                                    "= operator: " + title,
+                                    "== operator: " + title,
                                     (function (param) {
                                         return {
-                                                TAG: /* Eq */0,
-                                                _0: true,
-                                                _1: Caml_obj.caml_equal(num1, num2)
-                                              };
+                                          TAG: /* Eq */0,
+                                          _0: true,
+                                          _1: num2 === num1
+                                        };
                                       })
                                   ],
-                                  tl: {
-                                    hd: [
-                                      "= operator: " + title,
-                                      (function (param) {
-                                          return {
-                                                  TAG: /* Eq */0,
-                                                  _0: true,
-                                                  _1: Caml_obj.caml_equal(num2, num1)
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "== operator: " + title,
-                                        (function (param) {
-                                            return {
-                                                    TAG: /* Eq */0,
-                                                    _0: true,
-                                                    _1: num1 === num2
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "== operator: " + title,
-                                          (function (param) {
-                                              return {
-                                                      TAG: /* Eq */0,
-                                                      _0: true,
-                                                      _1: num2 === num1
-                                                    };
-                                            })
-                                        ],
-                                        tl: /* [] */0
-                                      }
-                                    }
-                                  }
+                                  tl: /* [] */0
                                 }
                               }
                             }
@@ -418,7 +415,10 @@ function isEqual(title, num1, num2) {
               }
             }
           }
-        };
+        }
+      }
+    }
+  };
 }
 
 const five = BigInt("5");
diff --git a/jscomp/test/dist/jscomp/test/caml_compare_test.js b/jscomp/test/dist/jscomp/test/caml_compare_test.js
index fc1c01712..b6a9a1b9e 100644
--- a/jscomp/test/dist/jscomp/test/caml_compare_test.js
+++ b/jscomp/test/dist/jscomp/test/caml_compare_test.js
@@ -26,10 +26,10 @@ const suites = {
       "File \"jscomp/test/caml_compare_test.ml\", line 9, characters 4-11",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: true,
-                  _1: Caml_obj.caml_lessthan(undefined, 1)
-                };
+            TAG: /* Eq */0,
+            _0: true,
+            _1: Caml_obj.caml_lessthan(undefined, 1)
+          };
         })
     ],
     tl: {
@@ -37,10 +37,10 @@ const suites = {
         "option2",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: true,
-                    _1: Caml_obj.caml_lessthan(1, 2)
-                  };
+              TAG: /* Eq */0,
+              _0: true,
+              _1: Caml_obj.caml_lessthan(1, 2)
+            };
           })
       ],
       tl: {
@@ -48,13 +48,13 @@ const suites = {
           "File \"jscomp/test/caml_compare_test.ml\", line 11, characters 4-11",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: true,
-                      _1: Caml_obj.caml_greaterthan({
-                            hd: 1,
-                            tl: /* [] */0
-                          }, /* [] */0)
-                    };
+                TAG: /* Eq */0,
+                _0: true,
+                _1: Caml_obj.caml_greaterthan({
+                      hd: 1,
+                      tl: /* [] */0
+                    }, /* [] */0)
+              };
             })
         ],
         tl: {
@@ -62,28 +62,28 @@ const suites = {
             "listeq",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: true,
-                        _1: Caml_obj.caml_equal({
-                              hd: 1,
-                              tl: {
-                                hd: 2,
-                                tl: {
-                                  hd: 3,
-                                  tl: /* [] */0
-                                }
-                              }
-                            }, {
-                              hd: 1,
-                              tl: {
-                                hd: 2,
-                                tl: {
-                                  hd: 3,
-                                  tl: /* [] */0
-                                }
-                              }
-                            })
-                      };
+                  TAG: /* Eq */0,
+                  _0: true,
+                  _1: Caml_obj.caml_equal({
+                        hd: 1,
+                        tl: {
+                          hd: 2,
+                          tl: {
+                            hd: 3,
+                            tl: /* [] */0
+                          }
+                        }
+                      }, {
+                        hd: 1,
+                        tl: {
+                          hd: 2,
+                          tl: {
+                            hd: 3,
+                            tl: /* [] */0
+                          }
+                        }
+                      })
+                };
               })
           ],
           tl: {
@@ -91,28 +91,28 @@ const suites = {
               "listneq",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: true,
-                          _1: Caml_obj.caml_greaterthan({
-                                hd: 1,
-                                tl: {
-                                  hd: 2,
-                                  tl: {
-                                    hd: 3,
-                                    tl: /* [] */0
-                                  }
-                                }
-                              }, {
-                                hd: 1,
-                                tl: {
-                                  hd: 2,
-                                  tl: {
-                                    hd: 2,
-                                    tl: /* [] */0
-                                  }
-                                }
-                              })
-                        };
+                    TAG: /* Eq */0,
+                    _0: true,
+                    _1: Caml_obj.caml_greaterthan({
+                          hd: 1,
+                          tl: {
+                            hd: 2,
+                            tl: {
+                              hd: 3,
+                              tl: /* [] */0
+                            }
+                          }
+                        }, {
+                          hd: 1,
+                          tl: {
+                            hd: 2,
+                            tl: {
+                              hd: 2,
+                              tl: /* [] */0
+                            }
+                          }
+                        })
+                  };
                 })
             ],
             tl: {
@@ -120,38 +120,38 @@ const suites = {
                 "custom_u",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: true,
-                            _1: Caml_obj.caml_greaterthan([
-                                  {
-                                    TAG: /* A */0,
-                                    _0: 3
-                                  },
-                                  {
-                                    TAG: /* B */1,
-                                    _0: 2,
-                                    _1: false
-                                  },
-                                  {
-                                    TAG: /* C */2,
-                                    _0: 1
-                                  }
-                                ], [
-                                  {
-                                    TAG: /* A */0,
-                                    _0: 3
-                                  },
-                                  {
-                                    TAG: /* B */1,
-                                    _0: 2,
-                                    _1: false
-                                  },
-                                  {
-                                    TAG: /* C */2,
-                                    _0: 0
-                                  }
-                                ])
-                          };
+                      TAG: /* Eq */0,
+                      _0: true,
+                      _1: Caml_obj.caml_greaterthan([
+                            {
+                              TAG: /* A */0,
+                              _0: 3
+                            },
+                            {
+                              TAG: /* B */1,
+                              _0: 2,
+                              _1: false
+                            },
+                            {
+                              TAG: /* C */2,
+                              _0: 1
+                            }
+                          ], [
+                            {
+                              TAG: /* A */0,
+                              _0: 3
+                            },
+                            {
+                              TAG: /* B */1,
+                              _0: 2,
+                              _1: false
+                            },
+                            {
+                              TAG: /* C */2,
+                              _0: 0
+                            }
+                          ])
+                    };
                   })
               ],
               tl: {
@@ -159,38 +159,38 @@ const suites = {
                   "custom_u2",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: true,
-                              _1: Caml_obj.caml_equal([
-                                    {
-                                      TAG: /* A */0,
-                                      _0: 3
-                                    },
-                                    {
-                                      TAG: /* B */1,
-                                      _0: 2,
-                                      _1: false
-                                    },
-                                    {
-                                      TAG: /* C */2,
-                                      _0: 1
-                                    }
-                                  ], [
-                                    {
-                                      TAG: /* A */0,
-                                      _0: 3
-                                    },
-                                    {
-                                      TAG: /* B */1,
-                                      _0: 2,
-                                      _1: false
-                                    },
-                                    {
-                                      TAG: /* C */2,
-                                      _0: 1
-                                    }
-                                  ])
-                            };
+                        TAG: /* Eq */0,
+                        _0: true,
+                        _1: Caml_obj.caml_equal([
+                              {
+                                TAG: /* A */0,
+                                _0: 3
+                              },
+                              {
+                                TAG: /* B */1,
+                                _0: 2,
+                                _1: false
+                              },
+                              {
+                                TAG: /* C */2,
+                                _0: 1
+                              }
+                            ], [
+                              {
+                                TAG: /* A */0,
+                                _0: 3
+                              },
+                              {
+                                TAG: /* B */1,
+                                _0: 2,
+                                _1: false
+                              },
+                              {
+                                TAG: /* C */2,
+                                _0: 1
+                              }
+                            ])
+                      };
                     })
                 ],
                 tl: {
@@ -198,10 +198,10 @@ const suites = {
                     "function",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: true,
-                                _1: function_equal_test
-                              };
+                          TAG: /* Eq */0,
+                          _0: true,
+                          _1: function_equal_test
+                        };
                       })
                   ],
                   tl: {
@@ -209,10 +209,10 @@ const suites = {
                       "File \"jscomp/test/caml_compare_test.ml\", line 17, characters 4-11",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: true,
-                                  _1: Caml_obj.caml_lessthan(undefined, 1)
-                                };
+                            TAG: /* Eq */0,
+                            _0: true,
+                            _1: Caml_obj.caml_lessthan(undefined, 1)
+                          };
                         })
                     ],
                     tl: {
@@ -220,13 +220,13 @@ const suites = {
                         "File \"jscomp/test/caml_compare_test.ml\", line 28, characters 4-11",
                         (function (param) {
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: true,
-                                    _1: Caml_obj.caml_lessthan(undefined, [
-                                          1,
-                                          30
-                                        ])
-                                  };
+                              TAG: /* Eq */0,
+                              _0: true,
+                              _1: Caml_obj.caml_lessthan(undefined, [
+                                    1,
+                                    30
+                                  ])
+                            };
                           })
                       ],
                       tl: {
@@ -234,13 +234,13 @@ const suites = {
                           "File \"jscomp/test/caml_compare_test.ml\", line 31, characters 4-11",
                           (function (param) {
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: true,
-                                      _1: Caml_obj.caml_greaterthan([
-                                            1,
-                                            30
-                                          ], undefined)
-                                    };
+                                TAG: /* Eq */0,
+                                _0: true,
+                                _1: Caml_obj.caml_greaterthan([
+                                      1,
+                                      30
+                                    ], undefined)
+                              };
                             })
                         ],
                         tl: {
@@ -248,67 +248,67 @@ const suites = {
                             "File \"jscomp/test/caml_compare_test.ml\", line 34, characters 4-11",
                             (function (param) {
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: true,
-                                        _1: Caml_obj.caml_lessthan({
-                                              hd: 2,
+                                  TAG: /* Eq */0,
+                                  _0: true,
+                                  _1: Caml_obj.caml_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: {
@@ -316,19 +316,19 @@ const suites = {
                               "File \"jscomp/test/caml_compare_test.ml\", line 37, characters 4-11",
                               (function (param) {
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: true,
-                                          _1: Caml_obj.caml_lessthan({
-                                                hd: 1,
-                                                tl: /* [] */0
-                                              }, {
-                                                hd: 1,
-                                                tl: {
-                                                  hd: 409,
-                                                  tl: /* [] */0
-                                                }
-                                              })
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: true,
+                                    _1: Caml_obj.caml_lessthan({
+                                          hd: 1,
+                                          tl: /* [] */0
+                                        }, {
+                                          hd: 1,
+                                          tl: {
+                                            hd: 409,
+                                            tl: /* [] */0
+                                          }
+                                        })
+                                  };
                                 })
                             ],
                             tl: {
@@ -336,13 +336,13 @@ const suites = {
                                 "File \"jscomp/test/caml_compare_test.ml\", line 40, characters 4-11",
                                 (function (param) {
                                     return {
-                                            TAG: /* Eq */0,
-                                            _0: true,
-                                            _1: Caml_obj.caml_lessthan(/* [] */0, {
-                                                  hd: 409,
-                                                  tl: /* [] */0
-                                                })
-                                          };
+                                      TAG: /* Eq */0,
+                                      _0: true,
+                                      _1: Caml_obj.caml_lessthan(/* [] */0, {
+                                            hd: 409,
+                                            tl: /* [] */0
+                                          })
+                                    };
                                   })
                               ],
                               tl: {
@@ -350,67 +350,67 @@ const suites = {
                                   "File \"jscomp/test/caml_compare_test.ml\", line 43, characters 4-11",
                                   (function (param) {
                                       return {
-                                              TAG: /* Eq */0,
-                                              _0: true,
-                                              _1: Caml_obj.caml_greaterthan({
-                                                    hd: 2,
+                                        TAG: /* Eq */0,
+                                        _0: true,
+                                        _1: Caml_obj.caml_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: {
@@ -418,13 +418,13 @@ const suites = {
                                     "File \"jscomp/test/caml_compare_test.ml\", line 47, characters 4-11",
                                     (function (param) {
                                         return {
-                                                TAG: /* Eq */0,
-                                                _0: false,
-                                                _1: undefined === [
-                                                  1,
-                                                  30
-                                                ]
-                                              };
+                                          TAG: /* Eq */0,
+                                          _0: false,
+                                          _1: undefined === [
+                                            1,
+                                            30
+                                          ]
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -432,13 +432,13 @@ const suites = {
                                       "File \"jscomp/test/caml_compare_test.ml\", line 50, characters 4-11",
                                       (function (param) {
                                           return {
-                                                  TAG: /* Eq */0,
-                                                  _0: false,
-                                                  _1: [
-                                                    1,
-                                                    30
-                                                  ] === undefined
-                                                };
+                                            TAG: /* Eq */0,
+                                            _0: false,
+                                            _1: [
+                                              1,
+                                              30
+                                            ] === undefined
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -446,67 +446,67 @@ const suites = {
                                         "File \"jscomp/test/caml_compare_test.ml\", line 53, characters 4-11",
                                         (function (param) {
                                             return {
-                                                    TAG: /* Eq */0,
-                                                    _0: false,
-                                                    _1: Caml_obj.caml_equal({
-                                                          hd: 2,
+                                              TAG: /* Eq */0,
+                                              _0: false,
+                                              _1: Caml_obj.caml_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: {
@@ -514,67 +514,67 @@ const suites = {
                                           "File \"jscomp/test/caml_compare_test.ml\", line 56, characters 4-11",
                                           (function (param) {
                                               return {
-                                                      TAG: /* Eq */0,
-                                                      _0: false,
-                                                      _1: Caml_obj.caml_equal({
-                                                            hd: 2,
+                                                TAG: /* Eq */0,
+                                                _0: false,
+                                                _1: Caml_obj.caml_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: {
@@ -582,16 +582,16 @@ const suites = {
                                             "cmp_id",
                                             (function (param) {
                                                 return {
-                                                        TAG: /* Eq */0,
-                                                        _0: Caml_obj.caml_compare({
-                                                              x: 1,
-                                                              y: 2
-                                                            }, {
-                                                              x: 1,
-                                                              y: 2
-                                                            }),
-                                                        _1: 0
-                                                      };
+                                                  TAG: /* Eq */0,
+                                                  _0: Caml_obj.caml_compare({
+                                                        x: 1,
+                                                        y: 2
+                                                      }, {
+                                                        x: 1,
+                                                        y: 2
+                                                      }),
+                                                  _1: 0
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -599,14 +599,14 @@ const suites = {
                                               "cmp_val",
                                               (function (param) {
                                                   return {
-                                                          TAG: /* Eq */0,
-                                                          _0: Caml_obj.caml_compare({
-                                                                x: 1
-                                                              }, {
-                                                                x: 2
-                                                              }),
-                                                          _1: -1
-                                                        };
+                                                    TAG: /* Eq */0,
+                                                    _0: Caml_obj.caml_compare({
+                                                          x: 1
+                                                        }, {
+                                                          x: 2
+                                                        }),
+                                                    _1: -1
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -614,14 +614,14 @@ const suites = {
                                                 "cmp_val2",
                                                 (function (param) {
                                                     return {
-                                                            TAG: /* Eq */0,
-                                                            _0: Caml_obj.caml_compare({
-                                                                  x: 2
-                                                                }, {
-                                                                  x: 1
-                                                                }),
-                                                            _1: 1
-                                                          };
+                                                      TAG: /* Eq */0,
+                                                      _0: Caml_obj.caml_compare({
+                                                            x: 2
+                                                          }, {
+                                                            x: 1
+                                                          }),
+                                                      _1: 1
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -629,10 +629,10 @@ const suites = {
                                                   "cmp_empty",
                                                   (function (param) {
                                                       return {
-                                                              TAG: /* Eq */0,
-                                                              _0: Caml_obj.caml_compare({}, {}),
-                                                              _1: 0
-                                                            };
+                                                        TAG: /* Eq */0,
+                                                        _0: Caml_obj.caml_compare({}, {}),
+                                                        _1: 0
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -640,10 +640,10 @@ const suites = {
                                                     "cmp_empty2",
                                                     (function (param) {
                                                         return {
-                                                                TAG: /* Eq */0,
-                                                                _0: Caml_obj.caml_compare({}, {x:1}),
-                                                                _1: -1
-                                                              };
+                                                          TAG: /* Eq */0,
+                                                          _0: Caml_obj.caml_compare({}, {x:1}),
+                                                          _1: -1
+                                                        };
                                                       })
                                                   ],
                                                   tl: {
@@ -651,16 +651,16 @@ const suites = {
                                                       "cmp_swap",
                                                       (function (param) {
                                                           return {
-                                                                  TAG: /* Eq */0,
-                                                                  _0: Caml_obj.caml_compare({
-                                                                        x: 1,
-                                                                        y: 2
-                                                                      }, {
-                                                                        y: 2,
-                                                                        x: 1
-                                                                      }),
-                                                                  _1: 0
-                                                                };
+                                                            TAG: /* Eq */0,
+                                                            _0: Caml_obj.caml_compare({
+                                                                  x: 1,
+                                                                  y: 2
+                                                                }, {
+                                                                  y: 2,
+                                                                  x: 1
+                                                                }),
+                                                            _1: 0
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -668,10 +668,10 @@ const suites = {
                                                         "cmp_size",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: /* Eq */0,
-                                                                    _0: Caml_obj.caml_compare({x:1}, {x:1, y:2}),
-                                                                    _1: -1
-                                                                  };
+                                                              TAG: /* Eq */0,
+                                                              _0: Caml_obj.caml_compare({x:1}, {x:1, y:2}),
+                                                              _1: -1
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -679,10 +679,10 @@ const suites = {
                                                           "cmp_size2",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: /* Eq */0,
-                                                                      _0: Caml_obj.caml_compare({x:1, y:2}, {x:1}),
-                                                                      _1: 1
-                                                                    };
+                                                                TAG: /* Eq */0,
+                                                                _0: Caml_obj.caml_compare({x:1, y:2}, {x:1}),
+                                                                _1: 1
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -690,16 +690,16 @@ const suites = {
                                                             "cmp_order",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: /* Eq */0,
-                                                                        _0: Caml_obj.caml_compare({
-                                                                              x: 0,
-                                                                              y: 1
-                                                                            }, {
-                                                                              x: 1,
-                                                                              y: 0
-                                                                            }),
-                                                                        _1: -1
-                                                                      };
+                                                                  TAG: /* Eq */0,
+                                                                  _0: Caml_obj.caml_compare({
+                                                                        x: 0,
+                                                                        y: 1
+                                                                      }, {
+                                                                        x: 1,
+                                                                        y: 0
+                                                                      }),
+                                                                  _1: -1
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -707,16 +707,16 @@ const suites = {
                                                               "cmp_order2",
                                                               (function (param) {
                                                                   return {
-                                                                          TAG: /* Eq */0,
-                                                                          _0: Caml_obj.caml_compare({
-                                                                                x: 1,
-                                                                                y: 0
-                                                                              }, {
-                                                                                x: 0,
-                                                                                y: 1
-                                                                              }),
-                                                                          _1: 1
-                                                                        };
+                                                                    TAG: /* Eq */0,
+                                                                    _0: Caml_obj.caml_compare({
+                                                                          x: 1,
+                                                                          y: 0
+                                                                        }, {
+                                                                          x: 0,
+                                                                          y: 1
+                                                                        }),
+                                                                    _1: 1
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -724,20 +724,20 @@ const suites = {
                                                                 "cmp_in_list",
                                                                 (function (param) {
                                                                     return {
-                                                                            TAG: /* Eq */0,
-                                                                            _0: Caml_obj.caml_compare({
-                                                                                  hd: {
-                                                                                    x: 1
-                                                                                  },
-                                                                                  tl: /* [] */0
-                                                                                }, {
-                                                                                  hd: {
-                                                                                    x: 2
-                                                                                  },
-                                                                                  tl: /* [] */0
-                                                                                }),
-                                                                            _1: -1
-                                                                          };
+                                                                      TAG: /* Eq */0,
+                                                                      _0: Caml_obj.caml_compare({
+                                                                            hd: {
+                                                                              x: 1
+                                                                            },
+                                                                            tl: /* [] */0
+                                                                          }, {
+                                                                            hd: {
+                                                                              x: 2
+                                                                            },
+                                                                            tl: /* [] */0
+                                                                          }),
+                                                                      _1: -1
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -745,20 +745,20 @@ const suites = {
                                                                   "cmp_in_list2",
                                                                   (function (param) {
                                                                       return {
-                                                                              TAG: /* Eq */0,
-                                                                              _0: Caml_obj.caml_compare({
-                                                                                    hd: {
-                                                                                      x: 2
-                                                                                    },
-                                                                                    tl: /* [] */0
-                                                                                  }, {
-                                                                                    hd: {
-                                                                                      x: 1
-                                                                                    },
-                                                                                    tl: /* [] */0
-                                                                                  }),
-                                                                              _1: 1
-                                                                            };
+                                                                        TAG: /* Eq */0,
+                                                                        _0: Caml_obj.caml_compare({
+                                                                              hd: {
+                                                                                x: 2
+                                                                              },
+                                                                              tl: /* [] */0
+                                                                            }, {
+                                                                              hd: {
+                                                                                x: 1
+                                                                              },
+                                                                              tl: /* [] */0
+                                                                            }),
+                                                                        _1: 1
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -766,20 +766,20 @@ const suites = {
                                                                     "cmp_with_list",
                                                                     (function (param) {
                                                                         return {
-                                                                                TAG: /* Eq */0,
-                                                                                _0: Caml_obj.caml_compare({
-                                                                                      x: {
-                                                                                        hd: 0,
-                                                                                        tl: /* [] */0
-                                                                                      }
-                                                                                    }, {
-                                                                                      x: {
-                                                                                        hd: 1,
-                                                                                        tl: /* [] */0
-                                                                                      }
-                                                                                    }),
-                                                                                _1: -1
-                                                                              };
+                                                                          TAG: /* Eq */0,
+                                                                          _0: Caml_obj.caml_compare({
+                                                                                x: {
+                                                                                  hd: 0,
+                                                                                  tl: /* [] */0
+                                                                                }
+                                                                              }, {
+                                                                                x: {
+                                                                                  hd: 1,
+                                                                                  tl: /* [] */0
+                                                                                }
+                                                                              }),
+                                                                          _1: -1
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -787,20 +787,20 @@ const suites = {
                                                                       "cmp_with_list2",
                                                                       (function (param) {
                                                                           return {
-                                                                                  TAG: /* Eq */0,
-                                                                                  _0: Caml_obj.caml_compare({
-                                                                                        x: {
-                                                                                          hd: 1,
-                                                                                          tl: /* [] */0
-                                                                                        }
-                                                                                      }, {
-                                                                                        x: {
-                                                                                          hd: 0,
-                                                                                          tl: /* [] */0
-                                                                                        }
-                                                                                      }),
-                                                                                  _1: 1
-                                                                                };
+                                                                            TAG: /* Eq */0,
+                                                                            _0: Caml_obj.caml_compare({
+                                                                                  x: {
+                                                                                    hd: 1,
+                                                                                    tl: /* [] */0
+                                                                                  }
+                                                                                }, {
+                                                                                  x: {
+                                                                                    hd: 0,
+                                                                                    tl: /* [] */0
+                                                                                  }
+                                                                                }),
+                                                                            _1: 1
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -808,15 +808,15 @@ const suites = {
                                                                         "eq_id",
                                                                         (function (param) {
                                                                             return {
-                                                                                    TAG: /* Ok */4,
-                                                                                    _0: Caml_obj.caml_equal({
-                                                                                          x: 1,
-                                                                                          y: 2
-                                                                                        }, {
-                                                                                          x: 1,
-                                                                                          y: 2
-                                                                                        })
-                                                                                  };
+                                                                              TAG: /* Ok */4,
+                                                                              _0: Caml_obj.caml_equal({
+                                                                                    x: 1,
+                                                                                    y: 2
+                                                                                  }, {
+                                                                                    x: 1,
+                                                                                    y: 2
+                                                                                  })
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -824,14 +824,14 @@ const suites = {
                                                                           "eq_val",
                                                                           (function (param) {
                                                                               return {
-                                                                                      TAG: /* Eq */0,
-                                                                                      _0: Caml_obj.caml_equal({
-                                                                                            x: 1
-                                                                                          }, {
-                                                                                            x: 2
-                                                                                          }),
-                                                                                      _1: false
-                                                                                    };
+                                                                                TAG: /* Eq */0,
+                                                                                _0: Caml_obj.caml_equal({
+                                                                                      x: 1
+                                                                                    }, {
+                                                                                      x: 2
+                                                                                    }),
+                                                                                _1: false
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -839,14 +839,14 @@ const suites = {
                                                                             "eq_val2",
                                                                             (function (param) {
                                                                                 return {
-                                                                                        TAG: /* Eq */0,
-                                                                                        _0: Caml_obj.caml_equal({
-                                                                                              x: 2
-                                                                                            }, {
-                                                                                              x: 1
-                                                                                            }),
-                                                                                        _1: false
-                                                                                      };
+                                                                                  TAG: /* Eq */0,
+                                                                                  _0: Caml_obj.caml_equal({
+                                                                                        x: 2
+                                                                                      }, {
+                                                                                        x: 1
+                                                                                      }),
+                                                                                  _1: false
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -854,10 +854,10 @@ const suites = {
                                                                               "eq_empty",
                                                                               (function (param) {
                                                                                   return {
-                                                                                          TAG: /* Eq */0,
-                                                                                          _0: Caml_obj.caml_equal({}, {}),
-                                                                                          _1: true
-                                                                                        };
+                                                                                    TAG: /* Eq */0,
+                                                                                    _0: Caml_obj.caml_equal({}, {}),
+                                                                                    _1: true
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -865,10 +865,10 @@ const suites = {
                                                                                 "eq_empty2",
                                                                                 (function (param) {
                                                                                     return {
-                                                                                            TAG: /* Eq */0,
-                                                                                            _0: Caml_obj.caml_equal({}, {x:1}),
-                                                                                            _1: false
-                                                                                          };
+                                                                                      TAG: /* Eq */0,
+                                                                                      _0: Caml_obj.caml_equal({}, {x:1}),
+                                                                                      _1: false
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -876,15 +876,15 @@ const suites = {
                                                                                   "eq_swap",
                                                                                   (function (param) {
                                                                                       return {
-                                                                                              TAG: /* Ok */4,
-                                                                                              _0: Caml_obj.caml_equal({
-                                                                                                    x: 1,
-                                                                                                    y: 2
-                                                                                                  }, {
-                                                                                                    y: 2,
-                                                                                                    x: 1
-                                                                                                  })
-                                                                                            };
+                                                                                        TAG: /* Ok */4,
+                                                                                        _0: Caml_obj.caml_equal({
+                                                                                              x: 1,
+                                                                                              y: 2
+                                                                                            }, {
+                                                                                              y: 2,
+                                                                                              x: 1
+                                                                                            })
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -892,10 +892,10 @@ const suites = {
                                                                                     "eq_size",
                                                                                     (function (param) {
                                                                                         return {
-                                                                                                TAG: /* Eq */0,
-                                                                                                _0: Caml_obj.caml_equal({x:1}, {x:1, y:2}),
-                                                                                                _1: false
-                                                                                              };
+                                                                                          TAG: /* Eq */0,
+                                                                                          _0: Caml_obj.caml_equal({x:1}, {x:1, y:2}),
+                                                                                          _1: false
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -903,10 +903,10 @@ const suites = {
                                                                                       "eq_size2",
                                                                                       (function (param) {
                                                                                           return {
-                                                                                                  TAG: /* Eq */0,
-                                                                                                  _0: Caml_obj.caml_equal({x:1, y:2}, {x:1}),
-                                                                                                  _1: false
-                                                                                                };
+                                                                                            TAG: /* Eq */0,
+                                                                                            _0: Caml_obj.caml_equal({x:1, y:2}, {x:1}),
+                                                                                            _1: false
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: {
@@ -914,20 +914,20 @@ const suites = {
                                                                                         "eq_in_list",
                                                                                         (function (param) {
                                                                                             return {
-                                                                                                    TAG: /* Eq */0,
-                                                                                                    _0: Caml_obj.caml_equal({
-                                                                                                          hd: {
-                                                                                                            x: 1
-                                                                                                          },
-                                                                                                          tl: /* [] */0
-                                                                                                        }, {
-                                                                                                          hd: {
-                                                                                                            x: 2
-                                                                                                          },
-                                                                                                          tl: /* [] */0
-                                                                                                        }),
-                                                                                                    _1: false
-                                                                                                  };
+                                                                                              TAG: /* Eq */0,
+                                                                                              _0: Caml_obj.caml_equal({
+                                                                                                    hd: {
+                                                                                                      x: 1
+                                                                                                    },
+                                                                                                    tl: /* [] */0
+                                                                                                  }, {
+                                                                                                    hd: {
+                                                                                                      x: 2
+                                                                                                    },
+                                                                                                    tl: /* [] */0
+                                                                                                  }),
+                                                                                              _1: false
+                                                                                            };
                                                                                           })
                                                                                       ],
                                                                                       tl: {
@@ -935,20 +935,20 @@ const suites = {
                                                                                           "eq_in_list2",
                                                                                           (function (param) {
                                                                                               return {
-                                                                                                      TAG: /* Eq */0,
-                                                                                                      _0: Caml_obj.caml_equal({
-                                                                                                            hd: {
-                                                                                                              x: 2
-                                                                                                            },
-                                                                                                            tl: /* [] */0
-                                                                                                          }, {
-                                                                                                            hd: {
-                                                                                                              x: 2
-                                                                                                            },
-                                                                                                            tl: /* [] */0
-                                                                                                          }),
-                                                                                                      _1: true
-                                                                                                    };
+                                                                                                TAG: /* Eq */0,
+                                                                                                _0: Caml_obj.caml_equal({
+                                                                                                      hd: {
+                                                                                                        x: 2
+                                                                                                      },
+                                                                                                      tl: /* [] */0
+                                                                                                    }, {
+                                                                                                      hd: {
+                                                                                                        x: 2
+                                                                                                      },
+                                                                                                      tl: /* [] */0
+                                                                                                    }),
+                                                                                                _1: true
+                                                                                              };
                                                                                             })
                                                                                         ],
                                                                                         tl: {
@@ -956,20 +956,20 @@ const suites = {
                                                                                             "eq_with_list",
                                                                                             (function (param) {
                                                                                                 return {
-                                                                                                        TAG: /* Eq */0,
-                                                                                                        _0: Caml_obj.caml_equal({
-                                                                                                              x: {
-                                                                                                                hd: 0,
-                                                                                                                tl: /* [] */0
-                                                                                                              }
-                                                                                                            }, {
-                                                                                                              x: {
-                                                                                                                hd: 0,
-                                                                                                                tl: /* [] */0
-                                                                                                              }
-                                                                                                            }),
-                                                                                                        _1: true
-                                                                                                      };
+                                                                                                  TAG: /* Eq */0,
+                                                                                                  _0: Caml_obj.caml_equal({
+                                                                                                        x: {
+                                                                                                          hd: 0,
+                                                                                                          tl: /* [] */0
+                                                                                                        }
+                                                                                                      }, {
+                                                                                                        x: {
+                                                                                                          hd: 0,
+                                                                                                          tl: /* [] */0
+                                                                                                        }
+                                                                                                      }),
+                                                                                                  _1: true
+                                                                                                };
                                                                                               })
                                                                                           ],
                                                                                           tl: {
@@ -977,20 +977,20 @@ const suites = {
                                                                                               "eq_with_list2",
                                                                                               (function (param) {
                                                                                                   return {
-                                                                                                          TAG: /* Eq */0,
-                                                                                                          _0: Caml_obj.caml_equal({
-                                                                                                                x: {
-                                                                                                                  hd: 0,
-                                                                                                                  tl: /* [] */0
-                                                                                                                }
-                                                                                                              }, {
-                                                                                                                x: {
-                                                                                                                  hd: 1,
-                                                                                                                  tl: /* [] */0
-                                                                                                                }
-                                                                                                              }),
-                                                                                                          _1: false
-                                                                                                        };
+                                                                                                    TAG: /* Eq */0,
+                                                                                                    _0: Caml_obj.caml_equal({
+                                                                                                          x: {
+                                                                                                            hd: 0,
+                                                                                                            tl: /* [] */0
+                                                                                                          }
+                                                                                                        }, {
+                                                                                                          x: {
+                                                                                                            hd: 1,
+                                                                                                            tl: /* [] */0
+                                                                                                          }
+                                                                                                        }),
+                                                                                                    _1: false
+                                                                                                  };
                                                                                                 })
                                                                                             ],
                                                                                             tl: {
@@ -998,11 +998,11 @@ const suites = {
                                                                                                 "eq_no_prototype",
                                                                                                 (function (param) {
                                                                                                     return {
-                                                                                                            TAG: /* Eq */0,
-                                                                                                            _0: Caml_obj.caml_equal({x:1}, ((function(){let o = Object.create(null);o.x = 1;return o;})()
-                                                                                                                )),
-                                                                                                            _1: true
-                                                                                                          };
+                                                                                                      TAG: /* Eq */0,
+                                                                                                      _0: Caml_obj.caml_equal({x:1}, ((function(){let o = Object.create(null);o.x = 1;return o;})()
+                                                                                                          )),
+                                                                                                      _1: true
+                                                                                                    };
                                                                                                   })
                                                                                               ],
                                                                                               tl: {
@@ -1010,13 +1010,13 @@ const suites = {
                                                                                                   "File \"jscomp/test/caml_compare_test.ml\", line 88, characters 4-11",
                                                                                                   (function (param) {
                                                                                                       return {
-                                                                                                              TAG: /* Eq */0,
-                                                                                                              _0: Caml_obj.caml_compare(null, {
-                                                                                                                    hd: 3,
-                                                                                                                    tl: /* [] */0
-                                                                                                                  }),
-                                                                                                              _1: -1
-                                                                                                            };
+                                                                                                        TAG: /* Eq */0,
+                                                                                                        _0: Caml_obj.caml_compare(null, {
+                                                                                                              hd: 3,
+                                                                                                              tl: /* [] */0
+                                                                                                            }),
+                                                                                                        _1: -1
+                                                                                                      };
                                                                                                     })
                                                                                                 ],
                                                                                                 tl: {
@@ -1024,13 +1024,13 @@ const suites = {
                                                                                                     "File \"jscomp/test/caml_compare_test.ml\", line 91, characters 4-11",
                                                                                                     (function (param) {
                                                                                                         return {
-                                                                                                                TAG: /* Eq */0,
-                                                                                                                _0: Caml_obj.caml_compare({
-                                                                                                                      hd: 3,
-                                                                                                                      tl: /* [] */0
-                                                                                                                    }, null),
-                                                                                                                _1: 1
-                                                                                                              };
+                                                                                                          TAG: /* Eq */0,
+                                                                                                          _0: Caml_obj.caml_compare({
+                                                                                                                hd: 3,
+                                                                                                                tl: /* [] */0
+                                                                                                              }, null),
+                                                                                                          _1: 1
+                                                                                                        };
                                                                                                       })
                                                                                                   ],
                                                                                                   tl: {
@@ -1038,10 +1038,10 @@ const suites = {
                                                                                                       "File \"jscomp/test/caml_compare_test.ml\", line 94, characters 4-11",
                                                                                                       (function (param) {
                                                                                                           return {
-                                                                                                                  TAG: /* Eq */0,
-                                                                                                                  _0: Caml_obj.caml_compare(null, 0),
-                                                                                                                  _1: -1
-                                                                                                                };
+                                                                                                            TAG: /* Eq */0,
+                                                                                                            _0: Caml_obj.caml_compare(null, 0),
+                                                                                                            _1: -1
+                                                                                                          };
                                                                                                         })
                                                                                                     ],
                                                                                                     tl: {
@@ -1049,10 +1049,10 @@ const suites = {
                                                                                                         "File \"jscomp/test/caml_compare_test.ml\", line 97, characters 4-11",
                                                                                                         (function (param) {
                                                                                                             return {
-                                                                                                                    TAG: /* Eq */0,
-                                                                                                                    _0: Caml_obj.caml_compare(0, null),
-                                                                                                                    _1: 1
-                                                                                                                  };
+                                                                                                              TAG: /* Eq */0,
+                                                                                                              _0: Caml_obj.caml_compare(0, null),
+                                                                                                              _1: 1
+                                                                                                            };
                                                                                                           })
                                                                                                       ],
                                                                                                       tl: {
@@ -1060,10 +1060,10 @@ const suites = {
                                                                                                           "File \"jscomp/test/caml_compare_test.ml\", line 100, characters 4-11",
                                                                                                           (function (param) {
                                                                                                               return {
-                                                                                                                      TAG: /* Eq */0,
-                                                                                                                      _0: Caml_obj.caml_compare(undefined, 0),
-                                                                                                                      _1: -1
-                                                                                                                    };
+                                                                                                                TAG: /* Eq */0,
+                                                                                                                _0: Caml_obj.caml_compare(undefined, 0),
+                                                                                                                _1: -1
+                                                                                                              };
                                                                                                             })
                                                                                                         ],
                                                                                                         tl: {
@@ -1071,10 +1071,10 @@ const suites = {
                                                                                                             "File \"jscomp/test/caml_compare_test.ml\", line 103, characters 4-11",
                                                                                                             (function (param) {
                                                                                                                 return {
-                                                                                                                        TAG: /* Eq */0,
-                                                                                                                        _0: Caml_obj.caml_compare(0, undefined),
-                                                                                                                        _1: 1
-                                                                                                                      };
+                                                                                                                  TAG: /* Eq */0,
+                                                                                                                  _0: Caml_obj.caml_compare(0, undefined),
+                                                                                                                  _1: 1
+                                                                                                                };
                                                                                                               })
                                                                                                           ],
                                                                                                           tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/caml_format_test.js b/jscomp/test/dist/jscomp/test/caml_format_test.js
index 98e059cdc..03ad446c3 100644
--- a/jscomp/test/dist/jscomp/test/caml_format_test.js
+++ b/jscomp/test/dist/jscomp/test/caml_format_test.js
@@ -86,55 +86,55 @@ const of_string = [
 
 function from_float_of_string(xs) {
   return Stdlib__Array.mapi((function (i, param) {
-                return Stdlib.string_of_float;
-              }), xs);
+          return Stdlib.string_of_float;
+        }), xs);
 }
 
 function from_of_string(xs) {
   return Stdlib__Array.to_list(Stdlib__Array.mapi((function (i, param) {
-                    const b = param[1];
-                    const a = param[0];
-                    return [
-                            Curry._1(Stdlib__Printf.sprintf({
-                                      TAG: /* Format */0,
-                                      _0: {
-                                        TAG: /* String_literal */11,
-                                        _0: "of_string ",
-                                        _1: {
-                                          TAG: /* Scan_get_counter */21,
-                                          _0: /* Token_counter */2,
-                                          _1: /* End_of_format */0
-                                        }
-                                      },
-                                      _1: "of_string %L"
-                                    }), i),
-                            (function (param) {
-                                return {
-                                        TAG: /* Eq */0,
-                                        _0: Caml_format.caml_int_of_string(b),
-                                        _1: a
-                                      };
-                              })
-                          ];
-                  }), of_string));
+              const b = param[1];
+              const a = param[0];
+              return [
+                Curry._1(Stdlib__Printf.sprintf({
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* String_literal */11,
+                            _0: "of_string ",
+                            _1: {
+                              TAG: /* Scan_get_counter */21,
+                              _0: /* Token_counter */2,
+                              _1: /* End_of_format */0
+                            }
+                          },
+                          _1: "of_string %L"
+                        }), i),
+                (function (param) {
+                    return {
+                      TAG: /* Eq */0,
+                      _0: Caml_format.caml_int_of_string(b),
+                      _1: a
+                    };
+                  })
+              ];
+            }), of_string));
 }
 
 function u(v) {
   return Curry._1(Stdlib__Printf.sprintf({
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Int */4,
-                    _0: /* Int_d */0,
-                    _1: {
-                      TAG: /* Lit_padding */0,
-                      _0: /* Right */1,
-                      _1: 33
-                    },
-                    _2: /* No_precision */0,
-                    _3: /* End_of_format */0
-                  },
-                  _1: "%33d"
-                }), v);
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Int */4,
+              _0: /* Int_d */0,
+              _1: {
+                TAG: /* Lit_padding */0,
+                _0: /* Right */1,
+                _1: 33
+              },
+              _2: /* No_precision */0,
+              _3: /* End_of_format */0
+            },
+            _1: "%33d"
+          }), v);
 }
 
 const to_str = Caml_format.caml_int_of_string;
@@ -198,10 +198,10 @@ const suites = Stdlib.$at(from_of_string(of_string), Stdlib.$at({
             "isnan_of_string",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: true,
-                        _1: Stdlib.classify_float(Caml_format.caml_float_of_string("nan")) === /* FP_nan */4
-                      };
+                  TAG: /* Eq */0,
+                  _0: true,
+                  _1: Stdlib.classify_float(Caml_format.caml_float_of_string("nan")) === /* FP_nan */4
+                };
               })
           ],
           tl: /* [] */0
@@ -209,39 +209,39 @@ const suites = Stdlib.$at(from_of_string(of_string), Stdlib.$at({
                         const b = param[1];
                         const a = param[0];
                         return [
-                                Curry._1(Stdlib__Printf.sprintf({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: "infinity_of_string ",
-                                            _1: {
-                                              TAG: /* Int */4,
-                                              _0: /* Int_d */0,
-                                              _1: /* No_padding */0,
-                                              _2: /* No_precision */0,
-                                              _3: /* End_of_format */0
-                                            }
-                                          },
-                                          _1: "infinity_of_string %d"
-                                        }), i),
-                                (function (param) {
-                                    return {
-                                            TAG: /* Eq */0,
-                                            _0: a,
-                                            _1: Stdlib.classify_float(Caml_format.caml_float_of_string(b))
-                                          };
-                                  })
-                              ];
+                          Curry._1(Stdlib__Printf.sprintf({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "infinity_of_string ",
+                                      _1: {
+                                        TAG: /* Int */4,
+                                        _0: /* Int_d */0,
+                                        _1: /* No_padding */0,
+                                        _2: /* No_precision */0,
+                                        _3: /* End_of_format */0
+                                      }
+                                    },
+                                    _1: "infinity_of_string %d"
+                                  }), i),
+                          (function (param) {
+                              return {
+                                TAG: /* Eq */0,
+                                _0: a,
+                                _1: Stdlib.classify_float(Caml_format.caml_float_of_string(b))
+                              };
+                            })
+                        ];
                       }), pairs)), Stdlib.$at({
                   hd: [
                     "throw",
                     (function (param) {
                         return {
-                                TAG: /* ThrowAny */7,
-                                _0: (function (param) {
-                                    Caml_format.caml_float_of_string("");
-                                  })
-                              };
+                          TAG: /* ThrowAny */7,
+                          _0: (function (param) {
+                              Caml_format.caml_float_of_string("");
+                            })
+                        };
                       })
                   ],
                   tl: {
@@ -249,10 +249,10 @@ const suites = Stdlib.$at(from_of_string(of_string), Stdlib.$at({
                       "format_int",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: "                              33",
-                                  _1: Caml_format.caml_format_int("%32d", 33)
-                                };
+                            TAG: /* Eq */0,
+                            _0: "                              33",
+                            _1: Caml_format.caml_format_int("%32d", 33)
+                          };
                         })
                     ],
                     tl: /* [] */0
@@ -261,37 +261,37 @@ const suites = Stdlib.$at(from_of_string(of_string), Stdlib.$at({
                             const b = param[1];
                             const a = param[0];
                             return [
-                                    Curry._1(Stdlib__Printf.sprintf({
-                                              TAG: /* Format */0,
-                                              _0: {
-                                                TAG: /* String_literal */11,
-                                                _0: "normal_float_of_string ",
-                                                _1: {
-                                                  TAG: /* Int */4,
-                                                  _0: /* Int_d */0,
-                                                  _1: /* No_padding */0,
-                                                  _2: /* No_precision */0,
-                                                  _3: /* End_of_format */0
-                                                }
-                                              },
-                                              _1: "normal_float_of_string %d"
-                                            }), i),
-                                    (function (param) {
-                                        return {
-                                                TAG: /* Eq */0,
-                                                _0: a,
-                                                _1: Caml_format.caml_float_of_string(b)
-                                              };
-                                      })
-                                  ];
+                              Curry._1(Stdlib__Printf.sprintf({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "normal_float_of_string ",
+                                          _1: {
+                                            TAG: /* Int */4,
+                                            _0: /* Int_d */0,
+                                            _1: /* No_padding */0,
+                                            _2: /* No_precision */0,
+                                            _3: /* End_of_format */0
+                                          }
+                                        },
+                                        _1: "normal_float_of_string %d"
+                                      }), i),
+                              (function (param) {
+                                  return {
+                                    TAG: /* Eq */0,
+                                    _0: a,
+                                    _1: Caml_format.caml_float_of_string(b)
+                                  };
+                                })
+                            ];
                           }), pairs$1))))));
 
 function $caret$caret(param, param$1) {
   return {
-          TAG: /* Format */0,
-          _0: CamlinternalFormatBasics.concat_fmt(param._0, param$1._0),
-          _1: param._1 + ("%," + param$1._1)
-        };
+    TAG: /* Format */0,
+    _0: CamlinternalFormatBasics.concat_fmt(param._0, param$1._0),
+    _1: param._1 + ("%," + param$1._1)
+  };
 }
 
 function ff(param) {
@@ -302,70 +302,70 @@ const formatter_suites_0 = [
   "fmt_concat",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: Curry._6(Stdlib__Format.asprintf($caret$caret({
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+        TAG: /* Eq */0,
+        _0: Curry._6(Stdlib__Format.asprintf($caret$caret({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: {
+                            TAG: /* Int */4,
+                            _0: /* Int_d */0,
+                            _1: {
+                              TAG: /* Lit_padding */0,
+                              _0: /* Zeros */2,
+                              _1: 3
+                            },
+                            _2: /* No_precision */0,
+                            _3: {
+                              TAG: /* Char_literal */12,
+                              _0: /* ' ' */32,
                               _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
-                                _1: {
-                                  TAG: /* Int */4,
-                                  _0: /* Int_d */0,
-                                  _1: {
-                                    TAG: /* Lit_padding */0,
-                                    _0: /* Zeros */2,
-                                    _1: 3
-                                  },
-                                  _2: /* No_precision */0,
-                                  _3: {
-                                    TAG: /* Char_literal */12,
-                                    _0: /* ' ' */32,
-                                    _1: {
-                                      TAG: /* Scan_get_counter */21,
-                                      _0: /* Token_counter */2,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* Scan_get_counter */21,
+                                _0: /* Token_counter */2,
+                                _1: /* End_of_format */0
                               }
+                            }
+                          }
+                        }
+                      },
+                      _1: "%s %03d %L"
+                    }, {
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Caml_string */3,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: {
+                            TAG: /* Int */4,
+                            _0: /* Int_d */0,
+                            _1: {
+                              TAG: /* Lit_padding */0,
+                              _0: /* Zeros */2,
+                              _1: 3
                             },
-                            _1: "%s %03d %L"
-                          }, {
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* Caml_string */3,
-                              _0: /* No_padding */0,
+                            _2: /* No_precision */0,
+                            _3: {
+                              TAG: /* Char_literal */12,
+                              _0: /* ' ' */32,
                               _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
-                                _1: {
-                                  TAG: /* Int */4,
-                                  _0: /* Int_d */0,
-                                  _1: {
-                                    TAG: /* Lit_padding */0,
-                                    _0: /* Zeros */2,
-                                    _1: 3
-                                  },
-                                  _2: /* No_precision */0,
-                                  _3: {
-                                    TAG: /* Char_literal */12,
-                                    _0: /* ' ' */32,
-                                    _1: {
-                                      TAG: /* Scan_get_counter */21,
-                                      _0: /* Token_counter */2,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* Scan_get_counter */21,
+                                _0: /* Token_counter */2,
+                                _1: /* End_of_format */0
                               }
-                            },
-                            _1: "%S %03d %L"
-                          })), "32", 33, 33, "a", 33, 3),
-              _1: "32 033 33\"a\" 033 3"
-            };
+                            }
+                          }
+                        }
+                      },
+                      _1: "%S %03d %L"
+                    })), "32", 33, 33, "a", 33, 3),
+        _1: "32 033 33\"a\" 033 3"
+      };
     })
 ];
 
@@ -374,370 +374,367 @@ const formatter_suites_1 = {
     "fmt_gen",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: Curry._8(Stdlib__Format.asprintf($caret$caret({
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
+          TAG: /* Eq */0,
+          _0: Curry._8(Stdlib__Format.asprintf($caret$caret({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
+                          _1: {
+                            TAG: /* Char_literal */12,
+                            _0: /* ' ' */32,
+                            _1: {
+                              TAG: /* Int */4,
+                              _0: /* Int_d */0,
+                              _1: {
+                                TAG: /* Lit_padding */0,
+                                _0: /* Zeros */2,
+                                _1: 3
+                              },
+                              _2: /* No_precision */0,
+                              _3: {
+                                TAG: /* Char_literal */12,
+                                _0: /* ' ' */32,
                                 _1: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* ' ' */32,
+                                  TAG: /* Scan_get_counter */21,
+                                  _0: /* Token_counter */2,
+                                  _1: /* End_of_format */0
+                                }
+                              }
+                            }
+                          }
+                        },
+                        _1: "%s %03d %L"
+                      }, {
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* Caml_string */3,
+                          _0: /* No_padding */0,
+                          _1: {
+                            TAG: /* Char_literal */12,
+                            _0: /* ' ' */32,
+                            _1: {
+                              TAG: /* Int */4,
+                              _0: /* Int_d */0,
+                              _1: {
+                                TAG: /* Lit_padding */0,
+                                _0: /* Zeros */2,
+                                _1: 3
+                              },
+                              _2: /* No_precision */0,
+                              _3: {
+                                TAG: /* Char_literal */12,
+                                _0: /* ' ' */32,
+                                _1: {
+                                  TAG: /* Scan_get_counter */21,
+                                  _0: /* Token_counter */2,
                                   _1: {
-                                    TAG: /* Int */4,
-                                    _0: /* Int_d */0,
+                                    TAG: /* Char_literal */12,
+                                    _0: /* ' ' */32,
                                     _1: {
-                                      TAG: /* Lit_padding */0,
-                                      _0: /* Zeros */2,
-                                      _1: 3
-                                    },
-                                    _2: /* No_precision */0,
-                                    _3: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* ' ' */32,
-                                      _1: {
-                                        TAG: /* Scan_get_counter */21,
-                                        _0: /* Token_counter */2,
-                                        _1: /* End_of_format */0
-                                      }
+                                      TAG: /* Alpha */15,
+                                      _0: /* End_of_format */0
                                     }
                                   }
                                 }
-                              },
-                              _1: "%s %03d %L"
-                            }, {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* Caml_string */3,
-                                _0: /* No_padding */0,
-                                _1: {
+                              }
+                            }
+                          }
+                        },
+                        _1: "%S %03d %L %a"
+                      })), "32", 33, 33, "a", 33, 3, (function (param, param$1) {
+                  return Stdlib__Format.pp_print_list(undefined, Stdlib__Format.pp_print_int, param, param$1);
+                }), {
+                hd: 1,
+                tl: {
+                  hd: 2,
+                  tl: {
+                    hd: 3,
+                    tl: /* [] */0
+                  }
+                }
+              }),
+          _1: "32 033 33\"a\" 033 3 12\n3"
+        };
+      })
+  ],
+  tl: {
+    hd: [
+      "long_fmt",
+      (function (param) {
+          return {
+            TAG: /* Eq */0,
+            _0: Curry.app(Stdlib__Format.asprintf({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Int */4,
+                        _0: /* Int_d */0,
+                        _1: /* No_padding */0,
+                        _2: /* No_precision */0,
+                        _3: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: {
+                            TAG: /* Int */4,
+                            _0: /* Int_i */3,
+                            _1: /* No_padding */0,
+                            _2: /* No_precision */0,
+                            _3: {
+                              TAG: /* Char_literal */12,
+                              _0: /* ' ' */32,
+                              _1: {
+                                TAG: /* Int */4,
+                                _0: /* Int_u */12,
+                                _1: /* No_padding */0,
+                                _2: /* No_precision */0,
+                                _3: {
                                   TAG: /* Char_literal */12,
                                   _0: /* ' ' */32,
                                   _1: {
-                                    TAG: /* Int */4,
-                                    _0: /* Int_d */0,
+                                    TAG: /* Scan_get_counter */21,
+                                    _0: /* Char_counter */1,
                                     _1: {
-                                      TAG: /* Lit_padding */0,
-                                      _0: /* Zeros */2,
-                                      _1: 3
-                                    },
-                                    _2: /* No_precision */0,
-                                    _3: {
                                       TAG: /* Char_literal */12,
                                       _0: /* ' ' */32,
                                       _1: {
                                         TAG: /* Scan_get_counter */21,
-                                        _0: /* Token_counter */2,
+                                        _0: /* Line_counter */0,
                                         _1: {
                                           TAG: /* Char_literal */12,
                                           _0: /* ' ' */32,
                                           _1: {
-                                            TAG: /* Alpha */15,
-                                            _0: /* End_of_format */0
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              },
-                              _1: "%S %03d %L %a"
-                            })), "32", 33, 33, "a", 33, 3, (function (param, param$1) {
-                        return Stdlib__Format.pp_print_list(undefined, Stdlib__Format.pp_print_int, param, param$1);
-                      }), {
-                      hd: 1,
-                      tl: {
-                        hd: 2,
-                        tl: {
-                          hd: 3,
-                          tl: /* [] */0
-                        }
-                      }
-                    }),
-                _1: "32 033 33\"a\" 033 3 12\n3"
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "long_fmt",
-      (function (param) {
-          return {
-                  TAG: /* Eq */0,
-                  _0: Curry.app(Stdlib__Format.asprintf({
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* Int */4,
-                              _0: /* Int_d */0,
-                              _1: /* No_padding */0,
-                              _2: /* No_precision */0,
-                              _3: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
-                                _1: {
-                                  TAG: /* Int */4,
-                                  _0: /* Int_i */3,
-                                  _1: /* No_padding */0,
-                                  _2: /* No_precision */0,
-                                  _3: {
-                                    TAG: /* Char_literal */12,
-                                    _0: /* ' ' */32,
-                                    _1: {
-                                      TAG: /* Int */4,
-                                      _0: /* Int_u */12,
-                                      _1: /* No_padding */0,
-                                      _2: /* No_precision */0,
-                                      _3: {
-                                        TAG: /* Char_literal */12,
-                                        _0: /* ' ' */32,
-                                        _1: {
-                                          TAG: /* Scan_get_counter */21,
-                                          _0: /* Char_counter */1,
-                                          _1: {
-                                            TAG: /* Char_literal */12,
-                                            _0: /* ' ' */32,
+                                            TAG: /* Scan_get_counter */21,
+                                            _0: /* Token_counter */2,
                                             _1: {
-                                              TAG: /* Scan_get_counter */21,
-                                              _0: /* Line_counter */0,
+                                              TAG: /* Char_literal */12,
+                                              _0: /* ' ' */32,
                                               _1: {
-                                                TAG: /* Char_literal */12,
-                                                _0: /* ' ' */32,
+                                                TAG: /* Scan_get_counter */21,
+                                                _0: /* Token_counter */2,
                                                 _1: {
-                                                  TAG: /* Scan_get_counter */21,
-                                                  _0: /* Token_counter */2,
+                                                  TAG: /* Char_literal */12,
+                                                  _0: /* ' ' */32,
                                                   _1: {
-                                                    TAG: /* Char_literal */12,
-                                                    _0: /* ' ' */32,
-                                                    _1: {
-                                                      TAG: /* Scan_get_counter */21,
-                                                      _0: /* Token_counter */2,
+                                                    TAG: /* Int */4,
+                                                    _0: /* Int_x */6,
+                                                    _1: /* No_padding */0,
+                                                    _2: /* No_precision */0,
+                                                    _3: {
+                                                      TAG: /* Char_literal */12,
+                                                      _0: /* ' ' */32,
                                                       _1: {
-                                                        TAG: /* Char_literal */12,
-                                                        _0: /* ' ' */32,
-                                                        _1: {
-                                                          TAG: /* Int */4,
-                                                          _0: /* Int_x */6,
-                                                          _1: /* No_padding */0,
-                                                          _2: /* No_precision */0,
-                                                          _3: {
-                                                            TAG: /* Char_literal */12,
-                                                            _0: /* ' ' */32,
-                                                            _1: {
-                                                              TAG: /* Int */4,
-                                                              _0: /* Int_X */8,
-                                                              _1: /* No_padding */0,
-                                                              _2: /* No_precision */0,
-                                                              _3: {
-                                                                TAG: /* Char_literal */12,
-                                                                _0: /* ' ' */32,
+                                                        TAG: /* Int */4,
+                                                        _0: /* Int_X */8,
+                                                        _1: /* No_padding */0,
+                                                        _2: /* No_precision */0,
+                                                        _3: {
+                                                          TAG: /* Char_literal */12,
+                                                          _0: /* ' ' */32,
+                                                          _1: {
+                                                            TAG: /* Int */4,
+                                                            _0: /* Int_o */10,
+                                                            _1: /* No_padding */0,
+                                                            _2: /* No_precision */0,
+                                                            _3: {
+                                                              TAG: /* Char_literal */12,
+                                                              _0: /* ' ' */32,
+                                                              _1: {
+                                                                TAG: /* String */2,
+                                                                _0: /* No_padding */0,
                                                                 _1: {
-                                                                  TAG: /* Int */4,
-                                                                  _0: /* Int_o */10,
-                                                                  _1: /* No_padding */0,
-                                                                  _2: /* No_precision */0,
-                                                                  _3: {
-                                                                    TAG: /* Char_literal */12,
-                                                                    _0: /* ' ' */32,
+                                                                  TAG: /* Char_literal */12,
+                                                                  _0: /* ' ' */32,
+                                                                  _1: {
+                                                                    TAG: /* Caml_string */3,
+                                                                    _0: /* No_padding */0,
                                                                     _1: {
-                                                                      TAG: /* String */2,
-                                                                      _0: /* No_padding */0,
+                                                                      TAG: /* Char_literal */12,
+                                                                      _0: /* ' ' */32,
                                                                       _1: {
-                                                                        TAG: /* Char_literal */12,
-                                                                        _0: /* ' ' */32,
-                                                                        _1: {
-                                                                          TAG: /* Caml_string */3,
-                                                                          _0: /* No_padding */0,
+                                                                        TAG: /* Char */0,
+                                                                        _0: {
+                                                                          TAG: /* Char_literal */12,
+                                                                          _0: /* ' ' */32,
                                                                           _1: {
-                                                                            TAG: /* Char_literal */12,
-                                                                            _0: /* ' ' */32,
-                                                                            _1: {
-                                                                              TAG: /* Char */0,
-                                                                              _0: {
-                                                                                TAG: /* Char_literal */12,
-                                                                                _0: /* ' ' */32,
-                                                                                _1: {
-                                                                                  TAG: /* Caml_char */1,
-                                                                                  _0: {
-                                                                                    TAG: /* Char_literal */12,
-                                                                                    _0: /* ' ' */32,
-                                                                                    _1: {
-                                                                                      TAG: /* Float */8,
-                                                                                      _0: [
-                                                                                        /* Float_flag_ */0,
-                                                                                        /* Float_f */0
-                                                                                      ],
-                                                                                      _1: /* No_padding */0,
-                                                                                      _2: /* No_precision */0,
-                                                                                      _3: {
-                                                                                        TAG: /* Char_literal */12,
-                                                                                        _0: /* ' ' */32,
-                                                                                        _1: {
-                                                                                          TAG: /* Float */8,
-                                                                                          _0: [
-                                                                                            /* Float_flag_ */0,
-                                                                                            /* Float_F */5
-                                                                                          ],
-                                                                                          _1: /* No_padding */0,
-                                                                                          _2: /* No_precision */0,
-                                                                                          _3: {
-                                                                                            TAG: /* Char_literal */12,
-                                                                                            _0: /* ' ' */32,
-                                                                                            _1: {
-                                                                                              TAG: /* Float */8,
-                                                                                              _0: [
-                                                                                                /* Float_flag_ */0,
-                                                                                                /* Float_e */1
-                                                                                              ],
-                                                                                              _1: /* No_padding */0,
-                                                                                              _2: /* No_precision */0,
-                                                                                              _3: {
-                                                                                                TAG: /* Char_literal */12,
-                                                                                                _0: /* ' ' */32,
-                                                                                                _1: {
-                                                                                                  TAG: /* Float */8,
-                                                                                                  _0: [
-                                                                                                    /* Float_flag_ */0,
-                                                                                                    /* Float_E */2
-                                                                                                  ],
-                                                                                                  _1: /* No_padding */0,
-                                                                                                  _2: /* No_precision */0,
-                                                                                                  _3: {
-                                                                                                    TAG: /* Char_literal */12,
-                                                                                                    _0: /* ' ' */32,
-                                                                                                    _1: {
-                                                                                                      TAG: /* Float */8,
-                                                                                                      _0: [
-                                                                                                        /* Float_flag_ */0,
-                                                                                                        /* Float_g */3
-                                                                                                      ],
-                                                                                                      _1: /* No_padding */0,
-                                                                                                      _2: /* No_precision */0,
-                                                                                                      _3: {
-                                                                                                        TAG: /* Char_literal */12,
-                                                                                                        _0: /* ' ' */32,
+                                                                            TAG: /* Caml_char */1,
+                                                                            _0: {
+                                                                              TAG: /* Char_literal */12,
+                                                                              _0: /* ' ' */32,
+                                                                              _1: {
+                                                                                TAG: /* Float */8,
+                                                                                _0: [
+                                                                                  /* Float_flag_ */0,
+                                                                                  /* Float_f */0
+                                                                                ],
+                                                                                _1: /* No_padding */0,
+                                                                                _2: /* No_precision */0,
+                                                                                _3: {
+                                                                                  TAG: /* Char_literal */12,
+                                                                                  _0: /* ' ' */32,
+                                                                                  _1: {
+                                                                                    TAG: /* Float */8,
+                                                                                    _0: [
+                                                                                      /* Float_flag_ */0,
+                                                                                      /* Float_F */5
+                                                                                    ],
+                                                                                    _1: /* No_padding */0,
+                                                                                    _2: /* No_precision */0,
+                                                                                    _3: {
+                                                                                      TAG: /* Char_literal */12,
+                                                                                      _0: /* ' ' */32,
+                                                                                      _1: {
+                                                                                        TAG: /* Float */8,
+                                                                                        _0: [
+                                                                                          /* Float_flag_ */0,
+                                                                                          /* Float_e */1
+                                                                                        ],
+                                                                                        _1: /* No_padding */0,
+                                                                                        _2: /* No_precision */0,
+                                                                                        _3: {
+                                                                                          TAG: /* Char_literal */12,
+                                                                                          _0: /* ' ' */32,
+                                                                                          _1: {
+                                                                                            TAG: /* Float */8,
+                                                                                            _0: [
+                                                                                              /* Float_flag_ */0,
+                                                                                              /* Float_E */2
+                                                                                            ],
+                                                                                            _1: /* No_padding */0,
+                                                                                            _2: /* No_precision */0,
+                                                                                            _3: {
+                                                                                              TAG: /* Char_literal */12,
+                                                                                              _0: /* ' ' */32,
+                                                                                              _1: {
+                                                                                                TAG: /* Float */8,
+                                                                                                _0: [
+                                                                                                  /* Float_flag_ */0,
+                                                                                                  /* Float_g */3
+                                                                                                ],
+                                                                                                _1: /* No_padding */0,
+                                                                                                _2: /* No_precision */0,
+                                                                                                _3: {
+                                                                                                  TAG: /* Char_literal */12,
+                                                                                                  _0: /* ' ' */32,
+                                                                                                  _1: {
+                                                                                                    TAG: /* Float */8,
+                                                                                                    _0: [
+                                                                                                      /* Float_flag_ */0,
+                                                                                                      /* Float_G */4
+                                                                                                    ],
+                                                                                                    _1: /* No_padding */0,
+                                                                                                    _2: /* No_precision */0,
+                                                                                                    _3: {
+                                                                                                      TAG: /* Char_literal */12,
+                                                                                                      _0: /* ' ' */32,
+                                                                                                      _1: {
+                                                                                                        TAG: /* Bool */9,
+                                                                                                        _0: /* No_padding */0,
                                                                                                         _1: {
-                                                                                                          TAG: /* Float */8,
-                                                                                                          _0: [
-                                                                                                            /* Float_flag_ */0,
-                                                                                                            /* Float_G */4
-                                                                                                          ],
-                                                                                                          _1: /* No_padding */0,
-                                                                                                          _2: /* No_precision */0,
-                                                                                                          _3: {
-                                                                                                            TAG: /* Char_literal */12,
-                                                                                                            _0: /* ' ' */32,
+                                                                                                          TAG: /* Char_literal */12,
+                                                                                                          _0: /* ' ' */32,
+                                                                                                          _1: {
+                                                                                                            TAG: /* Bool */9,
+                                                                                                            _0: /* No_padding */0,
                                                                                                             _1: {
-                                                                                                              TAG: /* Bool */9,
-                                                                                                              _0: /* No_padding */0,
+                                                                                                              TAG: /* Char_literal */12,
+                                                                                                              _0: /* ' ' */32,
                                                                                                               _1: {
-                                                                                                                TAG: /* Char_literal */12,
-                                                                                                                _0: /* ' ' */32,
-                                                                                                                _1: {
-                                                                                                                  TAG: /* Bool */9,
-                                                                                                                  _0: /* No_padding */0,
+                                                                                                                TAG: /* Int32 */5,
+                                                                                                                _0: /* Int_d */0,
+                                                                                                                _1: /* No_padding */0,
+                                                                                                                _2: /* No_precision */0,
+                                                                                                                _3: {
+                                                                                                                  TAG: /* Char_literal */12,
+                                                                                                                  _0: /* ' ' */32,
                                                                                                                   _1: {
-                                                                                                                    TAG: /* Char_literal */12,
-                                                                                                                    _0: /* ' ' */32,
-                                                                                                                    _1: {
-                                                                                                                      TAG: /* Int32 */5,
-                                                                                                                      _0: /* Int_d */0,
-                                                                                                                      _1: /* No_padding */0,
-                                                                                                                      _2: /* No_precision */0,
-                                                                                                                      _3: {
-                                                                                                                        TAG: /* Char_literal */12,
-                                                                                                                        _0: /* ' ' */32,
-                                                                                                                        _1: {
-                                                                                                                          TAG: /* Int32 */5,
-                                                                                                                          _0: /* Int_i */3,
-                                                                                                                          _1: /* No_padding */0,
-                                                                                                                          _2: /* No_precision */0,
-                                                                                                                          _3: {
-                                                                                                                            TAG: /* Char_literal */12,
-                                                                                                                            _0: /* ' ' */32,
-                                                                                                                            _1: {
-                                                                                                                              TAG: /* Int32 */5,
-                                                                                                                              _0: /* Int_u */12,
-                                                                                                                              _1: /* No_padding */0,
-                                                                                                                              _2: /* No_precision */0,
-                                                                                                                              _3: {
-                                                                                                                                TAG: /* Char_literal */12,
-                                                                                                                                _0: /* ' ' */32,
-                                                                                                                                _1: {
-                                                                                                                                  TAG: /* Int32 */5,
-                                                                                                                                  _0: /* Int_x */6,
-                                                                                                                                  _1: /* No_padding */0,
-                                                                                                                                  _2: /* No_precision */0,
-                                                                                                                                  _3: {
-                                                                                                                                    TAG: /* Char_literal */12,
-                                                                                                                                    _0: /* ' ' */32,
-                                                                                                                                    _1: {
-                                                                                                                                      TAG: /* Int32 */5,
-                                                                                                                                      _0: /* Int_X */8,
-                                                                                                                                      _1: /* No_padding */0,
-                                                                                                                                      _2: /* No_precision */0,
-                                                                                                                                      _3: {
-                                                                                                                                        TAG: /* Char_literal */12,
-                                                                                                                                        _0: /* ' ' */32,
-                                                                                                                                        _1: {
-                                                                                                                                          TAG: /* Int32 */5,
-                                                                                                                                          _0: /* Int_o */10,
-                                                                                                                                          _1: /* No_padding */0,
-                                                                                                                                          _2: /* No_precision */0,
-                                                                                                                                          _3: {
-                                                                                                                                            TAG: /* Char_literal */12,
-                                                                                                                                            _0: /* ' ' */32,
-                                                                                                                                            _1: {
-                                                                                                                                              TAG: /* Int */4,
-                                                                                                                                              _0: /* Int_d */0,
-                                                                                                                                              _1: /* No_padding */0,
-                                                                                                                                              _2: /* No_precision */0,
-                                                                                                                                              _3: {
-                                                                                                                                                TAG: /* Char_literal */12,
-                                                                                                                                                _0: /* ' ' */32,
-                                                                                                                                                _1: {
-                                                                                                                                                  TAG: /* Int */4,
-                                                                                                                                                  _0: /* Int_i */3,
-                                                                                                                                                  _1: /* No_padding */0,
-                                                                                                                                                  _2: /* No_precision */0,
-                                                                                                                                                  _3: {
-                                                                                                                                                    TAG: /* Char_literal */12,
-                                                                                                                                                    _0: /* ' ' */32,
-                                                                                                                                                    _1: {
-                                                                                                                                                      TAG: /* Int */4,
-                                                                                                                                                      _0: /* Int_u */12,
-                                                                                                                                                      _1: /* No_padding */0,
-                                                                                                                                                      _2: /* No_precision */0,
-                                                                                                                                                      _3: {
-                                                                                                                                                        TAG: /* Char_literal */12,
-                                                                                                                                                        _0: /* ' ' */32,
-                                                                                                                                                        _1: {
-                                                                                                                                                          TAG: /* Int */4,
-                                                                                                                                                          _0: /* Int_x */6,
-                                                                                                                                                          _1: /* No_padding */0,
-                                                                                                                                                          _2: /* No_precision */0,
-                                                                                                                                                          _3: {
-                                                                                                                                                            TAG: /* Char_literal */12,
-                                                                                                                                                            _0: /* ' ' */32,
-                                                                                                                                                            _1: {
-                                                                                                                                                              TAG: /* Int */4,
-                                                                                                                                                              _0: /* Int_x */6,
-                                                                                                                                                              _1: /* No_padding */0,
-                                                                                                                                                              _2: /* No_precision */0,
-                                                                                                                                                              _3: {
-                                                                                                                                                                TAG: /* Char_literal */12,
-                                                                                                                                                                _0: /* ' ' */32,
-                                                                                                                                                                _1: {
-                                                                                                                                                                  TAG: /* Int */4,
-                                                                                                                                                                  _0: /* Int_o */10,
-                                                                                                                                                                  _1: /* No_padding */0,
-                                                                                                                                                                  _2: /* No_precision */0,
-                                                                                                                                                                  _3: {
-                                                                                                                                                                    TAG: /* String_literal */11,
-                                                                                                                                                                    _0: "  ",
-                                                                                                                                                                    _1: /* End_of_format */0
-                                                                                                                                                                  }
-                                                                                                                                                                }
-                                                                                                                                                              }
+                                                                                                                    TAG: /* Int32 */5,
+                                                                                                                    _0: /* Int_i */3,
+                                                                                                                    _1: /* No_padding */0,
+                                                                                                                    _2: /* No_precision */0,
+                                                                                                                    _3: {
+                                                                                                                      TAG: /* Char_literal */12,
+                                                                                                                      _0: /* ' ' */32,
+                                                                                                                      _1: {
+                                                                                                                        TAG: /* Int32 */5,
+                                                                                                                        _0: /* Int_u */12,
+                                                                                                                        _1: /* No_padding */0,
+                                                                                                                        _2: /* No_precision */0,
+                                                                                                                        _3: {
+                                                                                                                          TAG: /* Char_literal */12,
+                                                                                                                          _0: /* ' ' */32,
+                                                                                                                          _1: {
+                                                                                                                            TAG: /* Int32 */5,
+                                                                                                                            _0: /* Int_x */6,
+                                                                                                                            _1: /* No_padding */0,
+                                                                                                                            _2: /* No_precision */0,
+                                                                                                                            _3: {
+                                                                                                                              TAG: /* Char_literal */12,
+                                                                                                                              _0: /* ' ' */32,
+                                                                                                                              _1: {
+                                                                                                                                TAG: /* Int32 */5,
+                                                                                                                                _0: /* Int_X */8,
+                                                                                                                                _1: /* No_padding */0,
+                                                                                                                                _2: /* No_precision */0,
+                                                                                                                                _3: {
+                                                                                                                                  TAG: /* Char_literal */12,
+                                                                                                                                  _0: /* ' ' */32,
+                                                                                                                                  _1: {
+                                                                                                                                    TAG: /* Int32 */5,
+                                                                                                                                    _0: /* Int_o */10,
+                                                                                                                                    _1: /* No_padding */0,
+                                                                                                                                    _2: /* No_precision */0,
+                                                                                                                                    _3: {
+                                                                                                                                      TAG: /* Char_literal */12,
+                                                                                                                                      _0: /* ' ' */32,
+                                                                                                                                      _1: {
+                                                                                                                                        TAG: /* Int */4,
+                                                                                                                                        _0: /* Int_d */0,
+                                                                                                                                        _1: /* No_padding */0,
+                                                                                                                                        _2: /* No_precision */0,
+                                                                                                                                        _3: {
+                                                                                                                                          TAG: /* Char_literal */12,
+                                                                                                                                          _0: /* ' ' */32,
+                                                                                                                                          _1: {
+                                                                                                                                            TAG: /* Int */4,
+                                                                                                                                            _0: /* Int_i */3,
+                                                                                                                                            _1: /* No_padding */0,
+                                                                                                                                            _2: /* No_precision */0,
+                                                                                                                                            _3: {
+                                                                                                                                              TAG: /* Char_literal */12,
+                                                                                                                                              _0: /* ' ' */32,
+                                                                                                                                              _1: {
+                                                                                                                                                TAG: /* Int */4,
+                                                                                                                                                _0: /* Int_u */12,
+                                                                                                                                                _1: /* No_padding */0,
+                                                                                                                                                _2: /* No_precision */0,
+                                                                                                                                                _3: {
+                                                                                                                                                  TAG: /* Char_literal */12,
+                                                                                                                                                  _0: /* ' ' */32,
+                                                                                                                                                  _1: {
+                                                                                                                                                    TAG: /* Int */4,
+                                                                                                                                                    _0: /* Int_x */6,
+                                                                                                                                                    _1: /* No_padding */0,
+                                                                                                                                                    _2: /* No_precision */0,
+                                                                                                                                                    _3: {
+                                                                                                                                                      TAG: /* Char_literal */12,
+                                                                                                                                                      _0: /* ' ' */32,
+                                                                                                                                                      _1: {
+                                                                                                                                                        TAG: /* Int */4,
+                                                                                                                                                        _0: /* Int_x */6,
+                                                                                                                                                        _1: /* No_padding */0,
+                                                                                                                                                        _2: /* No_precision */0,
+                                                                                                                                                        _3: {
+                                                                                                                                                          TAG: /* Char_literal */12,
+                                                                                                                                                          _0: /* ' ' */32,
+                                                                                                                                                          _1: {
+                                                                                                                                                            TAG: /* Int */4,
+                                                                                                                                                            _0: /* Int_o */10,
+                                                                                                                                                            _1: /* No_padding */0,
+                                                                                                                                                            _2: /* No_precision */0,
+                                                                                                                                                            _3: {
+                                                                                                                                                              TAG: /* String_literal */11,
+                                                                                                                                                              _0: "  ",
+                                                                                                                                                              _1: /* End_of_format */0
                                                                                                                                                             }
                                                                                                                                                           }
                                                                                                                                                         }
@@ -802,46 +799,49 @@ const formatter_suites_1 = {
                                   }
                                 }
                               }
-                            },
-                            _1: "%d %i %u %n %l %L %N %x %X %o %s %S %c %C %f %F %e %E %g %G %B %b %ld %li %lu %lx %lX %lo %d %i %u %x %x %o  "
-                          }), [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        "a",
-                        "b",
-                        /* 'c' */99,
-                        /* 'd' */100,
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        true,
-                        false,
-                        0,
-                        1,
-                        2,
-                        3,
-                        4,
-                        5,
-                        6,
-                        7,
-                        8,
-                        9,
-                        10,
-                        11
-                      ]),
-                  _1: "1 2 3 4 5 6 7 8 9 12 a \"b\" c 'd' 1.000000 2. 3.000000e+00 4.000000E+00 5 6 true false 0 1 2 3 4 5 6 7 8 9 a 13  "
-                };
+                            }
+                          }
+                        }
+                      },
+                      _1: "%d %i %u %n %l %L %N %x %X %o %s %S %c %C %f %F %e %E %g %G %B %b %ld %li %lu %lx %lX %lo %d %i %u %x %x %o  "
+                    }), [
+                  1,
+                  2,
+                  3,
+                  4,
+                  5,
+                  6,
+                  7,
+                  8,
+                  9,
+                  10,
+                  "a",
+                  "b",
+                  /* 'c' */99,
+                  /* 'd' */100,
+                  1,
+                  2,
+                  3,
+                  4,
+                  5,
+                  6,
+                  true,
+                  false,
+                  0,
+                  1,
+                  2,
+                  3,
+                  4,
+                  5,
+                  6,
+                  7,
+                  8,
+                  9,
+                  10,
+                  11
+                ]),
+            _1: "1 2 3 4 5 6 7 8 9 12 a \"b\" c 'd' 1.000000 2. 3.000000e+00 4.000000E+00 5 6 true false 0 1 2 3 4 5 6 7 8 9 a 13  "
+          };
         })
     ],
     tl: {
@@ -849,334 +849,331 @@ const formatter_suites_1 = {
         "long_fmt_2",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: Curry.app(Stdlib__Format.asprintf({
+              TAG: /* Eq */0,
+              _0: Curry.app(Stdlib__Format.asprintf({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* Formatting_gen */18,
+                          _0: {
+                            TAG: /* Open_box */1,
+                            _0: {
                               TAG: /* Format */0,
-                              _0: {
-                                TAG: /* Formatting_gen */18,
-                                _0: {
-                                  TAG: /* Open_box */1,
-                                  _0: {
-                                    TAG: /* Format */0,
-                                    _0: /* End_of_format */0,
-                                    _1: ""
-                                  }
-                                },
+                              _0: /* End_of_format */0,
+                              _1: ""
+                            }
+                          },
+                          _1: {
+                            TAG: /* Int */4,
+                            _0: /* Int_d */0,
+                            _1: {
+                              TAG: /* Lit_padding */0,
+                              _0: /* Right */1,
+                              _1: 23
+                            },
+                            _2: /* No_precision */0,
+                            _3: {
+                              TAG: /* Char_literal */12,
+                              _0: /* ' ' */32,
+                              _1: {
+                                TAG: /* Int */4,
+                                _0: /* Int_i */3,
                                 _1: {
-                                  TAG: /* Int */4,
-                                  _0: /* Int_d */0,
+                                  TAG: /* Lit_padding */0,
+                                  _0: /* Right */1,
+                                  _1: 2
+                                },
+                                _2: /* No_precision */0,
+                                _3: {
+                                  TAG: /* Char_literal */12,
+                                  _0: /* ' ' */32,
                                   _1: {
-                                    TAG: /* Lit_padding */0,
-                                    _0: /* Right */1,
-                                    _1: 23
-                                  },
-                                  _2: /* No_precision */0,
-                                  _3: {
-                                    TAG: /* Char_literal */12,
-                                    _0: /* ' ' */32,
+                                    TAG: /* Int */4,
+                                    _0: /* Int_u */12,
                                     _1: {
-                                      TAG: /* Int */4,
-                                      _0: /* Int_i */3,
+                                      TAG: /* Lit_padding */0,
+                                      _0: /* Right */1,
+                                      _1: 3
+                                    },
+                                    _2: /* No_precision */0,
+                                    _3: {
+                                      TAG: /* Char_literal */12,
+                                      _0: /* ' ' */32,
                                       _1: {
-                                        TAG: /* Lit_padding */0,
-                                        _0: /* Right */1,
-                                        _1: 2
-                                      },
-                                      _2: /* No_precision */0,
-                                      _3: {
-                                        TAG: /* Char_literal */12,
-                                        _0: /* ' ' */32,
+                                        TAG: /* Scan_get_counter */21,
+                                        _0: /* Char_counter */1,
                                         _1: {
-                                          TAG: /* Int */4,
-                                          _0: /* Int_u */12,
+                                          TAG: /* Char_literal */12,
+                                          _0: /* ' ' */32,
                                           _1: {
-                                            TAG: /* Lit_padding */0,
-                                            _0: /* Right */1,
-                                            _1: 3
-                                          },
-                                          _2: /* No_precision */0,
-                                          _3: {
-                                            TAG: /* Char_literal */12,
-                                            _0: /* ' ' */32,
+                                            TAG: /* Int */4,
+                                            _0: /* Int_x */6,
                                             _1: {
-                                              TAG: /* Scan_get_counter */21,
-                                              _0: /* Char_counter */1,
+                                              TAG: /* Lit_padding */0,
+                                              _0: /* Right */1,
+                                              _1: 0
+                                            },
+                                            _2: /* No_precision */0,
+                                            _3: {
+                                              TAG: /* String_literal */11,
+                                              _0: "l ",
                                               _1: {
-                                                TAG: /* Char_literal */12,
-                                                _0: /* ' ' */32,
+                                                TAG: /* Int */4,
+                                                _0: /* Int_x */6,
                                                 _1: {
-                                                  TAG: /* Int */4,
-                                                  _0: /* Int_x */6,
+                                                  TAG: /* Lit_padding */0,
+                                                  _0: /* Right */1,
+                                                  _1: 0
+                                                },
+                                                _2: /* No_precision */0,
+                                                _3: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "L ",
                                                   _1: {
-                                                    TAG: /* Lit_padding */0,
-                                                    _0: /* Right */1,
-                                                    _1: 0
-                                                  },
-                                                  _2: /* No_precision */0,
-                                                  _3: {
-                                                    TAG: /* String_literal */11,
-                                                    _0: "l ",
+                                                    TAG: /* Scan_get_counter */21,
+                                                    _0: /* Token_counter */2,
                                                     _1: {
-                                                      TAG: /* Int */4,
-                                                      _0: /* Int_x */6,
+                                                      TAG: /* Char_literal */12,
+                                                      _0: /* ' ' */32,
                                                       _1: {
-                                                        TAG: /* Lit_padding */0,
-                                                        _0: /* Right */1,
-                                                        _1: 0
-                                                      },
-                                                      _2: /* No_precision */0,
-                                                      _3: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "L ",
+                                                        TAG: /* Int */4,
+                                                        _0: /* Int_x */6,
                                                         _1: {
-                                                          TAG: /* Scan_get_counter */21,
-                                                          _0: /* Token_counter */2,
+                                                          TAG: /* Lit_padding */0,
+                                                          _0: /* Zeros */2,
+                                                          _1: 3
+                                                        },
+                                                        _2: /* No_precision */0,
+                                                        _3: {
+                                                          TAG: /* Char_literal */12,
+                                                          _0: /* ' ' */32,
                                                           _1: {
-                                                            TAG: /* Char_literal */12,
-                                                            _0: /* ' ' */32,
-                                                            _1: {
-                                                              TAG: /* Int */4,
-                                                              _0: /* Int_x */6,
+                                                            TAG: /* Int */4,
+                                                            _0: /* Int_X */8,
+                                                            _1: /* No_padding */0,
+                                                            _2: /* No_precision */0,
+                                                            _3: {
+                                                              TAG: /* Char_literal */12,
+                                                              _0: /* ' ' */32,
                                                               _1: {
-                                                                TAG: /* Lit_padding */0,
-                                                                _0: /* Zeros */2,
-                                                                _1: 3
-                                                              },
-                                                              _2: /* No_precision */0,
-                                                              _3: {
-                                                                TAG: /* Char_literal */12,
-                                                                _0: /* ' ' */32,
-                                                                _1: {
-                                                                  TAG: /* Int */4,
-                                                                  _0: /* Int_X */8,
-                                                                  _1: /* No_padding */0,
-                                                                  _2: /* No_precision */0,
-                                                                  _3: {
-                                                                    TAG: /* Char_literal */12,
-                                                                    _0: /* ' ' */32,
+                                                                TAG: /* Int */4,
+                                                                _0: /* Int_o */10,
+                                                                _1: /* No_padding */0,
+                                                                _2: /* No_precision */0,
+                                                                _3: {
+                                                                  TAG: /* Char_literal */12,
+                                                                  _0: /* ' ' */32,
+                                                                  _1: {
+                                                                    TAG: /* String */2,
+                                                                    _0: /* No_padding */0,
                                                                     _1: {
-                                                                      TAG: /* Int */4,
-                                                                      _0: /* Int_o */10,
-                                                                      _1: /* No_padding */0,
-                                                                      _2: /* No_precision */0,
-                                                                      _3: {
-                                                                        TAG: /* Char_literal */12,
-                                                                        _0: /* ' ' */32,
+                                                                      TAG: /* Char_literal */12,
+                                                                      _0: /* ' ' */32,
+                                                                      _1: {
+                                                                        TAG: /* Caml_string */3,
+                                                                        _0: /* No_padding */0,
                                                                         _1: {
-                                                                          TAG: /* String */2,
-                                                                          _0: /* No_padding */0,
+                                                                          TAG: /* Char_literal */12,
+                                                                          _0: /* ' ' */32,
                                                                           _1: {
-                                                                            TAG: /* Char_literal */12,
-                                                                            _0: /* ' ' */32,
-                                                                            _1: {
-                                                                              TAG: /* Caml_string */3,
-                                                                              _0: /* No_padding */0,
+                                                                            TAG: /* Char */0,
+                                                                            _0: {
+                                                                              TAG: /* Char_literal */12,
+                                                                              _0: /* ' ' */32,
                                                                               _1: {
-                                                                                TAG: /* Char_literal */12,
-                                                                                _0: /* ' ' */32,
-                                                                                _1: {
-                                                                                  TAG: /* Char */0,
-                                                                                  _0: {
-                                                                                    TAG: /* Char_literal */12,
-                                                                                    _0: /* ' ' */32,
+                                                                                TAG: /* Caml_char */1,
+                                                                                _0: {
+                                                                                  TAG: /* Char_literal */12,
+                                                                                  _0: /* ' ' */32,
+                                                                                  _1: {
+                                                                                    TAG: /* Float */8,
+                                                                                    _0: [
+                                                                                      /* Float_flag_ */0,
+                                                                                      /* Float_f */0
+                                                                                    ],
                                                                                     _1: {
-                                                                                      TAG: /* Caml_char */1,
-                                                                                      _0: {
-                                                                                        TAG: /* Char_literal */12,
-                                                                                        _0: /* ' ' */32,
+                                                                                      TAG: /* Lit_padding */0,
+                                                                                      _0: /* Right */1,
+                                                                                      _1: 3
+                                                                                    },
+                                                                                    _2: /* No_precision */0,
+                                                                                    _3: {
+                                                                                      TAG: /* Char_literal */12,
+                                                                                      _0: /* ' ' */32,
+                                                                                      _1: {
+                                                                                        TAG: /* Float */8,
+                                                                                        _0: [
+                                                                                          /* Float_flag_ */0,
+                                                                                          /* Float_F */5
+                                                                                        ],
                                                                                         _1: {
-                                                                                          TAG: /* Float */8,
-                                                                                          _0: [
-                                                                                            /* Float_flag_ */0,
-                                                                                            /* Float_f */0
-                                                                                          ],
+                                                                                          TAG: /* Lit_padding */0,
+                                                                                          _0: /* Right */1,
+                                                                                          _1: 2
+                                                                                        },
+                                                                                        _2: /* No_precision */0,
+                                                                                        _3: {
+                                                                                          TAG: /* Char_literal */12,
+                                                                                          _0: /* ' ' */32,
                                                                                           _1: {
-                                                                                            TAG: /* Lit_padding */0,
-                                                                                            _0: /* Right */1,
-                                                                                            _1: 3
-                                                                                          },
-                                                                                          _2: /* No_precision */0,
-                                                                                          _3: {
-                                                                                            TAG: /* Char_literal */12,
-                                                                                            _0: /* ' ' */32,
+                                                                                            TAG: /* Float */8,
+                                                                                            _0: [
+                                                                                              /* Float_flag_ */0,
+                                                                                              /* Float_e */1
+                                                                                            ],
                                                                                             _1: {
-                                                                                              TAG: /* Float */8,
-                                                                                              _0: [
-                                                                                                /* Float_flag_ */0,
-                                                                                                /* Float_F */5
-                                                                                              ],
+                                                                                              TAG: /* Lit_padding */0,
+                                                                                              _0: /* Right */1,
+                                                                                              _1: 2
+                                                                                            },
+                                                                                            _2: /* No_precision */0,
+                                                                                            _3: {
+                                                                                              TAG: /* Char_literal */12,
+                                                                                              _0: /* ' ' */32,
                                                                                               _1: {
-                                                                                                TAG: /* Lit_padding */0,
-                                                                                                _0: /* Right */1,
-                                                                                                _1: 2
-                                                                                              },
-                                                                                              _2: /* No_precision */0,
-                                                                                              _3: {
-                                                                                                TAG: /* Char_literal */12,
-                                                                                                _0: /* ' ' */32,
-                                                                                                _1: {
-                                                                                                  TAG: /* Float */8,
-                                                                                                  _0: [
-                                                                                                    /* Float_flag_ */0,
-                                                                                                    /* Float_e */1
-                                                                                                  ],
+                                                                                                TAG: /* Float */8,
+                                                                                                _0: [
+                                                                                                  /* Float_flag_ */0,
+                                                                                                  /* Float_E */2
+                                                                                                ],
+                                                                                                _1: /* No_padding */0,
+                                                                                                _2: /* No_precision */0,
+                                                                                                _3: {
+                                                                                                  TAG: /* Char_literal */12,
+                                                                                                  _0: /* ' ' */32,
                                                                                                   _1: {
-                                                                                                    TAG: /* Lit_padding */0,
-                                                                                                    _0: /* Right */1,
-                                                                                                    _1: 2
-                                                                                                  },
-                                                                                                  _2: /* No_precision */0,
-                                                                                                  _3: {
-                                                                                                    TAG: /* Char_literal */12,
-                                                                                                    _0: /* ' ' */32,
-                                                                                                    _1: {
-                                                                                                      TAG: /* Float */8,
-                                                                                                      _0: [
-                                                                                                        /* Float_flag_ */0,
-                                                                                                        /* Float_E */2
-                                                                                                      ],
-                                                                                                      _1: /* No_padding */0,
-                                                                                                      _2: /* No_precision */0,
-                                                                                                      _3: {
-                                                                                                        TAG: /* Char_literal */12,
-                                                                                                        _0: /* ' ' */32,
-                                                                                                        _1: {
-                                                                                                          TAG: /* Float */8,
-                                                                                                          _0: [
-                                                                                                            /* Float_flag_ */0,
-                                                                                                            /* Float_g */3
-                                                                                                          ],
-                                                                                                          _1: /* No_padding */0,
-                                                                                                          _2: /* No_precision */0,
-                                                                                                          _3: {
-                                                                                                            TAG: /* Char_literal */12,
-                                                                                                            _0: /* ' ' */32,
+                                                                                                    TAG: /* Float */8,
+                                                                                                    _0: [
+                                                                                                      /* Float_flag_ */0,
+                                                                                                      /* Float_g */3
+                                                                                                    ],
+                                                                                                    _1: /* No_padding */0,
+                                                                                                    _2: /* No_precision */0,
+                                                                                                    _3: {
+                                                                                                      TAG: /* Char_literal */12,
+                                                                                                      _0: /* ' ' */32,
+                                                                                                      _1: {
+                                                                                                        TAG: /* Float */8,
+                                                                                                        _0: [
+                                                                                                          /* Float_flag_ */0,
+                                                                                                          /* Float_G */4
+                                                                                                        ],
+                                                                                                        _1: /* No_padding */0,
+                                                                                                        _2: /* No_precision */0,
+                                                                                                        _3: {
+                                                                                                          TAG: /* Char_literal */12,
+                                                                                                          _0: /* ' ' */32,
+                                                                                                          _1: {
+                                                                                                            TAG: /* Bool */9,
+                                                                                                            _0: /* No_padding */0,
                                                                                                             _1: {
-                                                                                                              TAG: /* Float */8,
-                                                                                                              _0: [
-                                                                                                                /* Float_flag_ */0,
-                                                                                                                /* Float_G */4
-                                                                                                              ],
-                                                                                                              _1: /* No_padding */0,
-                                                                                                              _2: /* No_precision */0,
-                                                                                                              _3: {
-                                                                                                                TAG: /* Char_literal */12,
-                                                                                                                _0: /* ' ' */32,
+                                                                                                              TAG: /* Char_literal */12,
+                                                                                                              _0: /* ' ' */32,
+                                                                                                              _1: {
+                                                                                                                TAG: /* Bool */9,
+                                                                                                                _0: /* No_padding */0,
                                                                                                                 _1: {
-                                                                                                                  TAG: /* Bool */9,
-                                                                                                                  _0: /* No_padding */0,
+                                                                                                                  TAG: /* Char_literal */12,
+                                                                                                                  _0: /* ' ' */32,
                                                                                                                   _1: {
-                                                                                                                    TAG: /* Char_literal */12,
-                                                                                                                    _0: /* ' ' */32,
-                                                                                                                    _1: {
-                                                                                                                      TAG: /* Bool */9,
-                                                                                                                      _0: /* No_padding */0,
+                                                                                                                    TAG: /* Int32 */5,
+                                                                                                                    _0: /* Int_d */0,
+                                                                                                                    _1: /* No_padding */0,
+                                                                                                                    _2: /* No_precision */0,
+                                                                                                                    _3: {
+                                                                                                                      TAG: /* Char_literal */12,
+                                                                                                                      _0: /* ' ' */32,
                                                                                                                       _1: {
-                                                                                                                        TAG: /* Char_literal */12,
-                                                                                                                        _0: /* ' ' */32,
-                                                                                                                        _1: {
-                                                                                                                          TAG: /* Int32 */5,
-                                                                                                                          _0: /* Int_d */0,
-                                                                                                                          _1: /* No_padding */0,
-                                                                                                                          _2: /* No_precision */0,
-                                                                                                                          _3: {
-                                                                                                                            TAG: /* Char_literal */12,
-                                                                                                                            _0: /* ' ' */32,
-                                                                                                                            _1: {
-                                                                                                                              TAG: /* Int32 */5,
-                                                                                                                              _0: /* Int_i */3,
-                                                                                                                              _1: /* No_padding */0,
-                                                                                                                              _2: /* No_precision */0,
-                                                                                                                              _3: {
-                                                                                                                                TAG: /* Char_literal */12,
-                                                                                                                                _0: /* ' ' */32,
-                                                                                                                                _1: {
-                                                                                                                                  TAG: /* Int32 */5,
-                                                                                                                                  _0: /* Int_u */12,
-                                                                                                                                  _1: /* No_padding */0,
-                                                                                                                                  _2: /* No_precision */0,
-                                                                                                                                  _3: {
-                                                                                                                                    TAG: /* Char_literal */12,
-                                                                                                                                    _0: /* ' ' */32,
-                                                                                                                                    _1: {
-                                                                                                                                      TAG: /* Int32 */5,
-                                                                                                                                      _0: /* Int_x */6,
-                                                                                                                                      _1: /* No_padding */0,
-                                                                                                                                      _2: /* No_precision */0,
-                                                                                                                                      _3: {
-                                                                                                                                        TAG: /* Char_literal */12,
-                                                                                                                                        _0: /* ' ' */32,
-                                                                                                                                        _1: {
-                                                                                                                                          TAG: /* Int32 */5,
-                                                                                                                                          _0: /* Int_X */8,
-                                                                                                                                          _1: /* No_padding */0,
-                                                                                                                                          _2: /* No_precision */0,
-                                                                                                                                          _3: {
-                                                                                                                                            TAG: /* Char_literal */12,
-                                                                                                                                            _0: /* ' ' */32,
-                                                                                                                                            _1: {
-                                                                                                                                              TAG: /* Int32 */5,
-                                                                                                                                              _0: /* Int_o */10,
-                                                                                                                                              _1: /* No_padding */0,
-                                                                                                                                              _2: /* No_precision */0,
-                                                                                                                                              _3: {
-                                                                                                                                                TAG: /* Char_literal */12,
-                                                                                                                                                _0: /* ' ' */32,
-                                                                                                                                                _1: {
-                                                                                                                                                  TAG: /* Int */4,
-                                                                                                                                                  _0: /* Int_d */0,
-                                                                                                                                                  _1: /* No_padding */0,
-                                                                                                                                                  _2: /* No_precision */0,
-                                                                                                                                                  _3: {
-                                                                                                                                                    TAG: /* Char_literal */12,
-                                                                                                                                                    _0: /* ' ' */32,
-                                                                                                                                                    _1: {
-                                                                                                                                                      TAG: /* Int */4,
-                                                                                                                                                      _0: /* Int_i */3,
-                                                                                                                                                      _1: /* No_padding */0,
-                                                                                                                                                      _2: /* No_precision */0,
-                                                                                                                                                      _3: {
-                                                                                                                                                        TAG: /* Char_literal */12,
-                                                                                                                                                        _0: /* ' ' */32,
-                                                                                                                                                        _1: {
-                                                                                                                                                          TAG: /* Int */4,
-                                                                                                                                                          _0: /* Int_u */12,
-                                                                                                                                                          _1: /* No_padding */0,
-                                                                                                                                                          _2: /* No_precision */0,
-                                                                                                                                                          _3: {
-                                                                                                                                                            TAG: /* Char_literal */12,
-                                                                                                                                                            _0: /* ' ' */32,
-                                                                                                                                                            _1: {
-                                                                                                                                                              TAG: /* Int */4,
-                                                                                                                                                              _0: /* Int_x */6,
-                                                                                                                                                              _1: /* No_padding */0,
-                                                                                                                                                              _2: /* No_precision */0,
-                                                                                                                                                              _3: {
-                                                                                                                                                                TAG: /* Char_literal */12,
-                                                                                                                                                                _0: /* ' ' */32,
-                                                                                                                                                                _1: {
-                                                                                                                                                                  TAG: /* Int */4,
-                                                                                                                                                                  _0: /* Int_x */6,
-                                                                                                                                                                  _1: /* No_padding */0,
-                                                                                                                                                                  _2: /* No_precision */0,
-                                                                                                                                                                  _3: {
-                                                                                                                                                                    TAG: /* Char_literal */12,
-                                                                                                                                                                    _0: /* ' ' */32,
-                                                                                                                                                                    _1: {
-                                                                                                                                                                      TAG: /* Int */4,
-                                                                                                                                                                      _0: /* Int_o */10,
-                                                                                                                                                                      _1: /* No_padding */0,
-                                                                                                                                                                      _2: /* No_precision */0,
-                                                                                                                                                                      _3: {
-                                                                                                                                                                        TAG: /* String_literal */11,
-                                                                                                                                                                        _0: "  ",
-                                                                                                                                                                        _1: {
-                                                                                                                                                                          TAG: /* Formatting_lit */17,
-                                                                                                                                                                          _0: /* Close_box */0,
-                                                                                                                                                                          _1: /* End_of_format */0
-                                                                                                                                                                        }
-                                                                                                                                                                      }
-                                                                                                                                                                    }
+                                                                                                                        TAG: /* Int32 */5,
+                                                                                                                        _0: /* Int_i */3,
+                                                                                                                        _1: /* No_padding */0,
+                                                                                                                        _2: /* No_precision */0,
+                                                                                                                        _3: {
+                                                                                                                          TAG: /* Char_literal */12,
+                                                                                                                          _0: /* ' ' */32,
+                                                                                                                          _1: {
+                                                                                                                            TAG: /* Int32 */5,
+                                                                                                                            _0: /* Int_u */12,
+                                                                                                                            _1: /* No_padding */0,
+                                                                                                                            _2: /* No_precision */0,
+                                                                                                                            _3: {
+                                                                                                                              TAG: /* Char_literal */12,
+                                                                                                                              _0: /* ' ' */32,
+                                                                                                                              _1: {
+                                                                                                                                TAG: /* Int32 */5,
+                                                                                                                                _0: /* Int_x */6,
+                                                                                                                                _1: /* No_padding */0,
+                                                                                                                                _2: /* No_precision */0,
+                                                                                                                                _3: {
+                                                                                                                                  TAG: /* Char_literal */12,
+                                                                                                                                  _0: /* ' ' */32,
+                                                                                                                                  _1: {
+                                                                                                                                    TAG: /* Int32 */5,
+                                                                                                                                    _0: /* Int_X */8,
+                                                                                                                                    _1: /* No_padding */0,
+                                                                                                                                    _2: /* No_precision */0,
+                                                                                                                                    _3: {
+                                                                                                                                      TAG: /* Char_literal */12,
+                                                                                                                                      _0: /* ' ' */32,
+                                                                                                                                      _1: {
+                                                                                                                                        TAG: /* Int32 */5,
+                                                                                                                                        _0: /* Int_o */10,
+                                                                                                                                        _1: /* No_padding */0,
+                                                                                                                                        _2: /* No_precision */0,
+                                                                                                                                        _3: {
+                                                                                                                                          TAG: /* Char_literal */12,
+                                                                                                                                          _0: /* ' ' */32,
+                                                                                                                                          _1: {
+                                                                                                                                            TAG: /* Int */4,
+                                                                                                                                            _0: /* Int_d */0,
+                                                                                                                                            _1: /* No_padding */0,
+                                                                                                                                            _2: /* No_precision */0,
+                                                                                                                                            _3: {
+                                                                                                                                              TAG: /* Char_literal */12,
+                                                                                                                                              _0: /* ' ' */32,
+                                                                                                                                              _1: {
+                                                                                                                                                TAG: /* Int */4,
+                                                                                                                                                _0: /* Int_i */3,
+                                                                                                                                                _1: /* No_padding */0,
+                                                                                                                                                _2: /* No_precision */0,
+                                                                                                                                                _3: {
+                                                                                                                                                  TAG: /* Char_literal */12,
+                                                                                                                                                  _0: /* ' ' */32,
+                                                                                                                                                  _1: {
+                                                                                                                                                    TAG: /* Int */4,
+                                                                                                                                                    _0: /* Int_u */12,
+                                                                                                                                                    _1: /* No_padding */0,
+                                                                                                                                                    _2: /* No_precision */0,
+                                                                                                                                                    _3: {
+                                                                                                                                                      TAG: /* Char_literal */12,
+                                                                                                                                                      _0: /* ' ' */32,
+                                                                                                                                                      _1: {
+                                                                                                                                                        TAG: /* Int */4,
+                                                                                                                                                        _0: /* Int_x */6,
+                                                                                                                                                        _1: /* No_padding */0,
+                                                                                                                                                        _2: /* No_precision */0,
+                                                                                                                                                        _3: {
+                                                                                                                                                          TAG: /* Char_literal */12,
+                                                                                                                                                          _0: /* ' ' */32,
+                                                                                                                                                          _1: {
+                                                                                                                                                            TAG: /* Int */4,
+                                                                                                                                                            _0: /* Int_x */6,
+                                                                                                                                                            _1: /* No_padding */0,
+                                                                                                                                                            _2: /* No_precision */0,
+                                                                                                                                                            _3: {
+                                                                                                                                                              TAG: /* Char_literal */12,
+                                                                                                                                                              _0: /* ' ' */32,
+                                                                                                                                                              _1: {
+                                                                                                                                                                TAG: /* Int */4,
+                                                                                                                                                                _0: /* Int_o */10,
+                                                                                                                                                                _1: /* No_padding */0,
+                                                                                                                                                                _2: /* No_precision */0,
+                                                                                                                                                                _3: {
+                                                                                                                                                                  TAG: /* String_literal */11,
+                                                                                                                                                                  _0: "  ",
+                                                                                                                                                                  _1: {
+                                                                                                                                                                    TAG: /* Formatting_lit */17,
+                                                                                                                                                                    _0: /* Close_box */0,
+                                                                                                                                                                    _1: /* End_of_format */0
                                                                                                                                                                   }
                                                                                                                                                                 }
                                                                                                                                                               }
@@ -1243,46 +1240,49 @@ const formatter_suites_1 = {
                                     }
                                   }
                                 }
-                              },
-                              _1: "@[%23d %2i %3u %n %0xl %0xL %N %03x %X %o %s %S %c %C %3f %2F %2e %E %g %G %B %b %ld %li %lu %lx %lX %lo %d %i %u %x %x %o  @]"
-                            }), [
-                          1,
-                          2,
-                          3,
-                          4,
-                          5,
-                          6,
-                          7,
-                          8,
-                          9,
-                          10,
-                          "a",
-                          "b",
-                          /* 'c' */99,
-                          /* 'd' */100,
-                          1,
-                          2,
-                          3,
-                          4,
-                          5,
-                          6,
-                          true,
-                          false,
-                          0,
-                          1,
-                          2,
-                          3,
-                          4,
-                          5,
-                          6,
-                          7,
-                          8,
-                          9,
-                          10,
-                          11
-                        ]),
-                    _1: "                      1  2   3 4 5l 6L 7 008 9 12 a \"b\" c 'd' 1.000000 2. 3.000000e+00 4.000000E+00 5 6 true false 0 1 2 3 4 5 6 7 8 9 a 13  "
-                  };
+                              }
+                            }
+                          }
+                        },
+                        _1: "@[%23d %2i %3u %n %0xl %0xL %N %03x %X %o %s %S %c %C %3f %2F %2e %E %g %G %B %b %ld %li %lu %lx %lX %lo %d %i %u %x %x %o  @]"
+                      }), [
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                    6,
+                    7,
+                    8,
+                    9,
+                    10,
+                    "a",
+                    "b",
+                    /* 'c' */99,
+                    /* 'd' */100,
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                    6,
+                    true,
+                    false,
+                    0,
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                    6,
+                    7,
+                    8,
+                    9,
+                    10,
+                    11
+                  ]),
+              _1: "                      1  2   3 4 5l 6L 7 008 9 12 a \"b\" c 'd' 1.000000 2. 3.000000e+00 4.000000E+00 5 6 true false 0 1 2 3 4 5 6 7 8 9 a 13  "
+            };
           })
       ],
       tl: {
@@ -1290,24 +1290,24 @@ const formatter_suites_1 = {
           "width_1",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: Curry._1(Stdlib__Format.asprintf({
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* Int */4,
-                                  _0: /* Int_d */0,
-                                  _1: {
-                                    TAG: /* Lit_padding */0,
-                                    _0: /* Zeros */2,
-                                    _1: 14
-                                  },
-                                  _2: /* No_precision */0,
-                                  _3: /* End_of_format */0
-                                },
-                                _1: "%014d"
-                              }), 32),
-                      _1: "00000000000032"
-                    };
+                TAG: /* Eq */0,
+                _0: Curry._1(Stdlib__Format.asprintf({
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* Int */4,
+                            _0: /* Int_d */0,
+                            _1: {
+                              TAG: /* Lit_padding */0,
+                              _0: /* Zeros */2,
+                              _1: 14
+                            },
+                            _2: /* No_precision */0,
+                            _3: /* End_of_format */0
+                          },
+                          _1: "%014d"
+                        }), 32),
+                _1: "00000000000032"
+              };
             })
         ],
         tl: {
@@ -1315,30 +1315,30 @@ const formatter_suites_1 = {
             "width_2",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: Curry._1(Stdlib__Format.asprintf({
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* Float */8,
-                                    _0: [
-                                      /* Float_flag_ */0,
-                                      /* Float_f */0
-                                    ],
-                                    _1: {
-                                      TAG: /* Lit_padding */0,
-                                      _0: /* Right */1,
-                                      _1: 10
-                                    },
-                                    _2: {
-                                      TAG: /* Lit_precision */0,
-                                      _0: 3
-                                    },
-                                    _3: /* End_of_format */0
-                                  },
-                                  _1: "%10.3f"
-                                }), 32333.02),
-                        _1: " 32333.020"
-                      };
+                  TAG: /* Eq */0,
+                  _0: Curry._1(Stdlib__Format.asprintf({
+                            TAG: /* Format */0,
+                            _0: {
+                              TAG: /* Float */8,
+                              _0: [
+                                /* Float_flag_ */0,
+                                /* Float_f */0
+                              ],
+                              _1: {
+                                TAG: /* Lit_padding */0,
+                                _0: /* Right */1,
+                                _1: 10
+                              },
+                              _2: {
+                                TAG: /* Lit_precision */0,
+                                _0: 3
+                              },
+                              _3: /* End_of_format */0
+                            },
+                            _1: "%10.3f"
+                          }), 32333.02),
+                  _1: " 32333.020"
+                };
               })
           ],
           tl: {
@@ -1346,24 +1346,24 @@ const formatter_suites_1 = {
               "alternate_1",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: Curry._1(Stdlib__Format.asprintf({
-                                    TAG: /* Format */0,
-                                    _0: {
-                                      TAG: /* Int */4,
-                                      _0: /* Int_x */6,
-                                      _1: {
-                                        TAG: /* Lit_padding */0,
-                                        _0: /* Right */1,
-                                        _1: 0
-                                      },
-                                      _2: /* No_precision */0,
-                                      _3: /* End_of_format */0
-                                    },
-                                    _1: "%0x"
-                                  }), 32333),
-                          _1: "7e4d"
-                        };
+                    TAG: /* Eq */0,
+                    _0: Curry._1(Stdlib__Format.asprintf({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* Int */4,
+                                _0: /* Int_x */6,
+                                _1: {
+                                  TAG: /* Lit_padding */0,
+                                  _0: /* Right */1,
+                                  _1: 0
+                                },
+                                _2: /* No_precision */0,
+                                _3: /* End_of_format */0
+                              },
+                              _1: "%0x"
+                            }), 32333),
+                    _1: "7e4d"
+                  };
                 })
             ],
             tl: {
@@ -1371,24 +1371,24 @@ const formatter_suites_1 = {
                 "alternate_2",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: Curry._1(Stdlib__Format.asprintf({
-                                      TAG: /* Format */0,
-                                      _0: {
-                                        TAG: /* Int */4,
-                                        _0: /* Int_Cx */7,
-                                        _1: {
-                                          TAG: /* Lit_padding */0,
-                                          _0: /* Right */1,
-                                          _1: 0
-                                        },
-                                        _2: /* No_precision */0,
-                                        _3: /* End_of_format */0
-                                      },
-                                      _1: "%#0x"
-                                    }), 32333),
-                            _1: "0x7e4d"
-                          };
+                      TAG: /* Eq */0,
+                      _0: Curry._1(Stdlib__Format.asprintf({
+                                TAG: /* Format */0,
+                                _0: {
+                                  TAG: /* Int */4,
+                                  _0: /* Int_Cx */7,
+                                  _1: {
+                                    TAG: /* Lit_padding */0,
+                                    _0: /* Right */1,
+                                    _1: 0
+                                  },
+                                  _2: /* No_precision */0,
+                                  _3: /* End_of_format */0
+                                },
+                                _1: "%#0x"
+                              }), 32333),
+                      _1: "0x7e4d"
+                    };
                   })
               ],
               tl: {
@@ -1396,36 +1396,36 @@ const formatter_suites_1 = {
                   "alternate_3",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: [
-                                Curry._1(Stdlib__Format.asprintf({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* Int */4,
-                                            _0: /* Int_Co */11,
-                                            _1: /* No_padding */0,
-                                            _2: /* No_precision */0,
-                                            _3: /* End_of_format */0
-                                          },
-                                          _1: "%#o"
-                                        }), 32),
-                                Curry._1(Stdlib__Format.asprintf({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* Int */4,
-                                            _0: /* Int_o */10,
-                                            _1: /* No_padding */0,
-                                            _2: /* No_precision */0,
-                                            _3: /* End_of_format */0
-                                          },
-                                          _1: "%o"
-                                        }), 32)
-                              ],
-                              _1: [
-                                "040",
-                                "40"
-                              ]
-                            };
+                        TAG: /* Eq */0,
+                        _0: [
+                          Curry._1(Stdlib__Format.asprintf({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* Int */4,
+                                      _0: /* Int_Co */11,
+                                      _1: /* No_padding */0,
+                                      _2: /* No_precision */0,
+                                      _3: /* End_of_format */0
+                                    },
+                                    _1: "%#o"
+                                  }), 32),
+                          Curry._1(Stdlib__Format.asprintf({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* Int */4,
+                                      _0: /* Int_o */10,
+                                      _1: /* No_padding */0,
+                                      _2: /* No_precision */0,
+                                      _3: /* End_of_format */0
+                                    },
+                                    _1: "%o"
+                                  }), 32)
+                        ],
+                        _1: [
+                          "040",
+                          "40"
+                        ]
+                      };
                     })
                 ],
                 tl: {
@@ -1433,10 +1433,10 @@ const formatter_suites_1 = {
                     "justify_0",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: Caml_format.caml_format_int("%-8d", 32),
-                                _1: "32      "
-                              };
+                          TAG: /* Eq */0,
+                          _0: Caml_format.caml_format_int("%-8d", 32),
+                          _1: "32      "
+                        };
                       })
                   ],
                   tl: {
@@ -1444,24 +1444,24 @@ const formatter_suites_1 = {
                       "sign_p",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: Curry._1(Stdlib__Format.asprintf({
-                                            TAG: /* Format */0,
-                                            _0: {
-                                              TAG: /* Int */4,
-                                              _0: /* Int_pd */1,
-                                              _1: {
-                                                TAG: /* Lit_padding */0,
-                                                _0: /* Right */1,
-                                                _1: 4
-                                              },
-                                              _2: /* No_precision */0,
-                                              _3: /* End_of_format */0
-                                            },
-                                            _1: "%+4d"
-                                          }), 32),
-                                  _1: " +32"
-                                };
+                            TAG: /* Eq */0,
+                            _0: Curry._1(Stdlib__Format.asprintf({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Int */4,
+                                        _0: /* Int_pd */1,
+                                        _1: {
+                                          TAG: /* Lit_padding */0,
+                                          _0: /* Right */1,
+                                          _1: 4
+                                        },
+                                        _2: /* No_precision */0,
+                                        _3: /* End_of_format */0
+                                      },
+                                      _1: "%+4d"
+                                    }), 32),
+                            _1: " +32"
+                          };
                         })
                     ],
                     tl: {
@@ -1469,24 +1469,24 @@ const formatter_suites_1 = {
                         "sign_2p",
                         (function (param) {
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: Curry._1(Stdlib__Format.asprintf({
-                                              TAG: /* Format */0,
-                                              _0: {
-                                                TAG: /* Int */4,
-                                                _0: /* Int_sd */2,
-                                                _1: {
-                                                  TAG: /* Lit_padding */0,
-                                                  _0: /* Right */1,
-                                                  _1: 4
-                                                },
-                                                _2: /* No_precision */0,
-                                                _3: /* End_of_format */0
-                                              },
-                                              _1: "% 4d"
-                                            }), 32),
-                                    _1: "  32"
-                                  };
+                              TAG: /* Eq */0,
+                              _0: Curry._1(Stdlib__Format.asprintf({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Int */4,
+                                          _0: /* Int_sd */2,
+                                          _1: {
+                                            TAG: /* Lit_padding */0,
+                                            _0: /* Right */1,
+                                            _1: 4
+                                          },
+                                          _2: /* No_precision */0,
+                                          _3: /* End_of_format */0
+                                        },
+                                        _1: "% 4d"
+                                      }), 32),
+                              _1: "  32"
+                            };
                           })
                       ],
                       tl: {
@@ -1494,20 +1494,20 @@ const formatter_suites_1 = {
                           "sign_3p",
                           (function (param) {
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: Curry._1(Stdlib__Format.asprintf({
-                                                TAG: /* Format */0,
-                                                _0: {
-                                                  TAG: /* Int32 */5,
-                                                  _0: /* Int_u */12,
-                                                  _1: /* No_padding */0,
-                                                  _2: /* No_precision */0,
-                                                  _3: /* End_of_format */0
-                                                },
-                                                _1: "%lu"
-                                              }), -1),
-                                      _1: "4294967295"
-                                    };
+                                TAG: /* Eq */0,
+                                _0: Curry._1(Stdlib__Format.asprintf({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* Int32 */5,
+                                            _0: /* Int_u */12,
+                                            _1: /* No_padding */0,
+                                            _2: /* No_precision */0,
+                                            _3: /* End_of_format */0
+                                          },
+                                          _1: "%lu"
+                                        }), -1),
+                                _1: "4294967295"
+                              };
                             })
                         ],
                         tl: {
@@ -1515,20 +1515,20 @@ const formatter_suites_1 = {
                             "sign_4p",
                             (function (param) {
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: Curry._1(Stdlib__Format.asprintf({
-                                                  TAG: /* Format */0,
-                                                  _0: {
-                                                    TAG: /* Int32 */5,
-                                                    _0: /* Int_d */0,
-                                                    _1: /* No_padding */0,
-                                                    _2: /* No_precision */0,
-                                                    _3: /* End_of_format */0
-                                                  },
-                                                  _1: "%ld"
-                                                }), -1),
-                                        _1: "-1"
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: Curry._1(Stdlib__Format.asprintf({
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* Int32 */5,
+                                              _0: /* Int_d */0,
+                                              _1: /* No_padding */0,
+                                              _2: /* No_precision */0,
+                                              _3: /* End_of_format */0
+                                            },
+                                            _1: "%ld"
+                                          }), -1),
+                                  _1: "-1"
+                                };
                               })
                           ],
                           tl: {
@@ -1536,10 +1536,10 @@ const formatter_suites_1 = {
                               "width_3",
                               (function (param) {
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: Caml_format.caml_format_int("%032d", 32),
-                                          _1: "00000000000000000000000000000032"
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: Caml_format.caml_format_int("%032d", 32),
+                                    _1: "00000000000000000000000000000032"
+                                  };
                                 })
                             ],
                             tl: {
@@ -1547,23 +1547,23 @@ const formatter_suites_1 = {
                                 "prec_1",
                                 (function (param) {
                                     return {
-                                            TAG: /* Eq */0,
-                                            _0: Curry._1(Stdlib__Format.asprintf({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* Int */4,
-                                                        _0: /* Int_d */0,
-                                                        _1: /* No_padding */0,
-                                                        _2: {
-                                                          TAG: /* Lit_precision */0,
-                                                          _0: 10
-                                                        },
-                                                        _3: /* End_of_format */0
-                                                      },
-                                                      _1: "%.10d"
-                                                    }), 32),
-                                            _1: "0000000032"
-                                          };
+                                      TAG: /* Eq */0,
+                                      _0: Curry._1(Stdlib__Format.asprintf({
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* Int */4,
+                                                  _0: /* Int_d */0,
+                                                  _1: /* No_padding */0,
+                                                  _2: {
+                                                    TAG: /* Lit_precision */0,
+                                                    _0: 10
+                                                  },
+                                                  _3: /* End_of_format */0
+                                                },
+                                                _1: "%.10d"
+                                              }), 32),
+                                      _1: "0000000032"
+                                    };
                                   })
                               ],
                               tl: {
@@ -1571,10 +1571,10 @@ const formatter_suites_1 = {
                                   "prec_2",
                                   (function (param) {
                                       return {
-                                              TAG: /* Eq */0,
-                                              _0: Caml_format.caml_format_int("%.10d", 32),
-                                              _1: "0000000032"
-                                            };
+                                        TAG: /* Eq */0,
+                                        _0: Caml_format.caml_format_int("%.10d", 32),
+                                        _1: "0000000032"
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -1582,10 +1582,10 @@ const formatter_suites_1 = {
                                     "prec_3",
                                     (function (param) {
                                         return {
-                                                TAG: /* Eq */0,
-                                                _0: Caml_format.caml_format_int("%.d", 32),
-                                                _1: "32"
-                                              };
+                                          TAG: /* Eq */0,
+                                          _0: Caml_format.caml_format_int("%.d", 32),
+                                          _1: "32"
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -1593,10 +1593,10 @@ const formatter_suites_1 = {
                                       "prec_4",
                                       (function (param) {
                                           return {
-                                                  TAG: /* Eq */0,
-                                                  _0: Caml_format.caml_format_int("%.d", 32),
-                                                  _1: "32"
-                                                };
+                                            TAG: /* Eq */0,
+                                            _0: Caml_format.caml_format_int("%.d", 32),
+                                            _1: "32"
+                                          };
                                         })
                                     ],
                                     tl: /* [] */0
@@ -1760,13 +1760,13 @@ function pr_exp0(ppf, s) {
   switch (s.TAG) {
     case /* Var */1 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Alpha */15,
-                          _0: /* End_of_format */0
-                        },
-                        _1: "%a"
-                      }), ident, s._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Alpha */15,
+                    _0: /* End_of_format */0
+                  },
+                  _1: "%a"
+                }), ident, s._0);
     case /* Lambda */0 :
     case /* Apply */2 :
         break;
@@ -1846,7 +1846,52 @@ function pr_other_applications(ppf, f) {
         return pr_exp0(ppf, f);
     case /* Apply */2 :
         return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Alpha */15,
+                    _0: {
+                      TAG: /* Formatting_lit */17,
+                      _0: {
+                        TAG: /* Break */0,
+                        _0: "@ ",
+                        _1: 1,
+                        _2: 0
+                      },
+                      _1: {
+                        TAG: /* Alpha */15,
+                        _0: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "%a@ %a"
+                }), pr_app, f._0, pr_exp0, f._1);
+    
+  }
+}
+
+function pr_lambda(ppf, e) {
+  switch (e.TAG) {
+    case /* Lambda */0 :
+        return Curry._8(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: "<1>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<1>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: {
+                        TAG: /* Alpha */15,
                         _0: {
                           TAG: /* Alpha */15,
                           _0: {
@@ -1859,64 +1904,19 @@ function pr_other_applications(ppf, f) {
                             },
                             _1: {
                               TAG: /* Alpha */15,
-                              _0: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "%a@ %a"
-                      }), pr_app, f._0, pr_exp0, f._1);
-    
-  }
-}
-
-function pr_lambda(ppf, e) {
-  switch (e.TAG) {
-    case /* Lambda */0 :
-        return Curry._8(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
                               _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<1>",
+                                TAG: /* Formatting_lit */17,
+                                _0: /* Close_box */0,
                                 _1: /* End_of_format */0
-                              },
-                              _1: "<1>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@ ",
-                                    _1: 1,
-                                    _2: 0
-                                  },
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: /* Close_box */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
                               }
                             }
                           }
-                        },
-                        _1: "@[<1>%a%a%a@ %a@]"
-                      }), kwd, "\\", ident, e._0, kwd, ".", pr_lambda, e._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<1>%a%a%a@ %a@]"
+                }), kwd, "\\", ident, e._0, kwd, ".", pr_lambda, e._1);
     case /* Var */1 :
     case /* Apply */2 :
         return pr_app(ppf, e);
@@ -2009,68 +2009,68 @@ const lambda_suites = [
 
 function from_lambda_pairs(p) {
   return Stdlib__Array.to_list(Stdlib__Array.mapi((function (i, param) {
-                    const b = param[1];
-                    const a = param[0];
-                    return [
-                            Curry._1(Stdlib__Printf.sprintf({
-                                      TAG: /* Format */0,
-                                      _0: {
-                                        TAG: /* String_literal */11,
-                                        _0: "lambda_print ",
-                                        _1: {
-                                          TAG: /* Int */4,
-                                          _0: /* Int_d */0,
-                                          _1: /* No_padding */0,
-                                          _2: /* No_precision */0,
-                                          _3: /* End_of_format */0
-                                        }
-                                      },
-                                      _1: "lambda_print %d"
-                                    }), i),
-                            (function (param) {
-                                return {
-                                        TAG: /* Eq */0,
-                                        _0: Curry._1(string_of_lambda, a),
-                                        _1: b
-                                      };
-                              })
-                          ];
-                  }), lambda_suites));
-}
+              const b = param[1];
+              const a = param[0];
+              return [
+                Curry._1(Stdlib__Printf.sprintf({
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* String_literal */11,
+                            _0: "lambda_print ",
+                            _1: {
+                              TAG: /* Int */4,
+                              _0: /* Int_d */0,
+                              _1: /* No_padding */0,
+                              _2: /* No_precision */0,
+                              _3: /* End_of_format */0
+                            }
+                          },
+                          _1: "lambda_print %d"
+                        }), i),
+                (function (param) {
+                    return {
+                      TAG: /* Eq */0,
+                      _0: Curry._1(string_of_lambda, a),
+                      _1: b
+                    };
+                  })
+              ];
+            }), lambda_suites));
+}
 
 const ksprintf_suites_0 = [
   "ksprintf",
   (function (param) {
       const f = function (fmt) {
         return Stdlib__Format.ksprintf((function (x) {
-                      return x + x;
-                    }), fmt);
+                return x + x;
+              }), fmt);
       };
       return {
-              TAG: /* Eq */0,
-              _0: Curry._2(f({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ' ' */32,
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: " a ",
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
-                        },
-                        _1: "%s %s a "
-                      }), "x", "xx"),
-              _1: "x xx a x xx a "
-            };
+        TAG: /* Eq */0,
+        _0: Curry._2(f({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " a ",
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    }
+                  },
+                  _1: "%s %s a "
+                }), "x", "xx"),
+        _1: "x xx a x xx a "
+      };
     })
 ];
 
@@ -2079,26 +2079,26 @@ const ksprintf_suites_1 = {
     "sprintf",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: Curry._2(Stdlib__Format.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* Char_literal */12,
-                              _0: /* ' ' */32,
-                              _1: {
-                                TAG: /* Caml_string */3,
-                                _0: /* No_padding */0,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "%s %S"
-                        }), "x", "X"),
-                _1: "x \"X\""
-              };
+          TAG: /* Eq */0,
+          _0: Curry._2(Stdlib__Format.sprintf({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* Char_literal */12,
+                        _0: /* ' ' */32,
+                        _1: {
+                          TAG: /* Caml_string */3,
+                          _0: /* No_padding */0,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "%s %S"
+                  }), "x", "X"),
+          _1: "x \"X\""
+        };
       })
   ],
   tl: /* [] */0
@@ -2113,73 +2113,145 @@ const int64_suites_0 = [
   "i32_simple",
   (function (param) {
       return {
+        TAG: /* Eq */0,
+        _0: Curry._1(Stdlib__Format.asprintf({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Int */4,
+                    _0: /* Int_x */6,
+                    _1: /* No_padding */0,
+                    _2: /* No_precision */0,
+                    _3: /* End_of_format */0
+                  },
+                  _1: "%x"
+                }), -1),
+        _1: "ffffffff"
+      };
+    })
+];
+
+const int64_suites_1 = {
+  hd: [
+    "i32_simple1",
+    (function (param) {
+        return {
+          TAG: /* Eq */0,
+          _0: Curry._1(Stdlib__Format.asprintf({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Int */4,
+                      _0: /* Int_o */10,
+                      _1: /* No_padding */0,
+                      _2: /* No_precision */0,
+                      _3: /* End_of_format */0
+                    },
+                    _1: "%o"
+                  }), -1),
+          _1: "37777777777"
+        };
+      })
+  ],
+  tl: {
+    hd: [
+      "i64_simple",
+      (function (param) {
+          return {
+            TAG: /* Eq */0,
+            _0: Curry._1(Stdlib__Format.asprintf({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Int64 */7,
+                        _0: /* Int_d */0,
+                        _1: /* No_padding */0,
+                        _2: /* No_precision */0,
+                        _3: /* End_of_format */0
+                      },
+                      _1: "%Ld"
+                    }), [
+                  0,
+                  3
+                ]),
+            _1: "3"
+          };
+        })
+    ],
+    tl: {
+      hd: [
+        "i64_simple2",
+        (function (param) {
+            return {
               TAG: /* Eq */0,
               _0: Curry._1(Stdlib__Format.asprintf({
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Int */4,
+                          TAG: /* Int64 */7,
                           _0: /* Int_x */6,
                           _1: /* No_padding */0,
                           _2: /* No_precision */0,
                           _3: /* End_of_format */0
                         },
-                        _1: "%x"
-                      }), -1),
-              _1: "ffffffff"
+                        _1: "%Lx"
+                      }), [
+                    0,
+                    33
+                  ]),
+              _1: "21"
             };
-    })
-];
-
-const int64_suites_1 = {
-  hd: [
-    "i32_simple1",
-    (function (param) {
-        return {
+          })
+      ],
+      tl: {
+        hd: [
+          "i64_simple3",
+          (function (param) {
+              return {
                 TAG: /* Eq */0,
                 _0: Curry._1(Stdlib__Format.asprintf({
                           TAG: /* Format */0,
                           _0: {
-                            TAG: /* Int */4,
-                            _0: /* Int_o */10,
+                            TAG: /* Int64 */7,
+                            _0: /* Int_i */3,
                             _1: /* No_padding */0,
                             _2: /* No_precision */0,
                             _3: /* End_of_format */0
                           },
-                          _1: "%o"
-                        }), -1),
-                _1: "37777777777"
+                          _1: "%Li"
+                        }), [
+                      0,
+                      33
+                    ]),
+                _1: "33"
               };
-      })
-  ],
-  tl: {
-    hd: [
-      "i64_simple",
-      (function (param) {
-          return {
+            })
+        ],
+        tl: {
+          hd: [
+            "i64_simple4",
+            (function (param) {
+                return {
                   TAG: /* Eq */0,
                   _0: Curry._1(Stdlib__Format.asprintf({
                             TAG: /* Format */0,
                             _0: {
                               TAG: /* Int64 */7,
-                              _0: /* Int_d */0,
+                              _0: /* Int_X */8,
                               _1: /* No_padding */0,
                               _2: /* No_precision */0,
                               _3: /* End_of_format */0
                             },
-                            _1: "%Ld"
+                            _1: "%LX"
                           }), [
                         0,
-                        3
+                        44
                       ]),
-                  _1: "3"
+                  _1: "2C"
                 };
-        })
-    ],
-    tl: {
-      hd: [
-        "i64_simple2",
-        (function (param) {
-            return {
+              })
+          ],
+          tl: {
+            hd: [
+              "i64_simple5",
+              (function (param) {
+                  return {
                     TAG: /* Eq */0,
                     _0: Curry._1(Stdlib__Format.asprintf({
                               TAG: /* Format */0,
@@ -2193,267 +2265,258 @@ const int64_suites_1 = {
                               _1: "%Lx"
                             }), [
                           0,
-                          33
+                          44
                         ]),
-                    _1: "21"
+                    _1: "2c"
                   };
-          })
-      ],
-      tl: {
-        hd: [
-          "i64_simple3",
-          (function (param) {
-              return {
+                })
+            ],
+            tl: {
+              hd: [
+                "i64_simple6",
+                (function (param) {
+                    return {
                       TAG: /* Eq */0,
-                      _0: Curry._1(Stdlib__Format.asprintf({
+                      _0: Curry._2(Stdlib__Format.asprintf({
                                 TAG: /* Format */0,
                                 _0: {
                                   TAG: /* Int64 */7,
-                                  _0: /* Int_i */3,
-                                  _1: /* No_padding */0,
+                                  _0: /* Int_x */6,
+                                  _1: {
+                                    TAG: /* Arg_padding */1,
+                                    _0: /* Right */1
+                                  },
                                   _2: /* No_precision */0,
                                   _3: /* End_of_format */0
                                 },
-                                _1: "%Li"
-                              }), [
+                                _1: "%*Lx"
+                              }), 5, [
                             0,
-                            33
+                            44
                           ]),
-                      _1: "33"
+                      _1: "   2c"
                     };
-            })
-        ],
-        tl: {
-          hd: [
-            "i64_simple4",
-            (function (param) {
-                return {
+                  })
+              ],
+              tl: {
+                hd: [
+                  "i64_simple7",
+                  (function (param) {
+                      return {
                         TAG: /* Eq */0,
-                        _0: Curry._1(Stdlib__Format.asprintf({
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* Int64 */7,
-                                    _0: /* Int_X */8,
-                                    _1: /* No_padding */0,
-                                    _2: /* No_precision */0,
-                                    _3: /* End_of_format */0
-                                  },
-                                  _1: "%LX"
-                                }), [
+                        _0: Caml_format.caml_int64_format("%d", [
                               0,
-                              44
+                              3333
                             ]),
-                        _1: "2C"
+                        _1: "3333"
                       };
-              })
-          ],
-          tl: {
-            hd: [
-              "i64_simple5",
-              (function (param) {
-                  return {
+                    })
+                ],
+                tl: {
+                  hd: [
+                    "i64_simple8",
+                    (function (param) {
+                        return {
                           TAG: /* Eq */0,
-                          _0: Curry._1(Stdlib__Format.asprintf({
+                          _0: Curry._2(Stdlib__Format.asprintf({
                                     TAG: /* Format */0,
                                     _0: {
                                       TAG: /* Int64 */7,
-                                      _0: /* Int_x */6,
+                                      _0: /* Int_d */0,
                                       _1: /* No_padding */0,
                                       _2: /* No_precision */0,
-                                      _3: /* End_of_format */0
+                                      _3: {
+                                        TAG: /* Int64 */7,
+                                        _0: /* Int_d */0,
+                                        _1: {
+                                          TAG: /* Lit_padding */0,
+                                          _0: /* Zeros */2,
+                                          _1: 18
+                                        },
+                                        _2: /* No_precision */0,
+                                        _3: /* End_of_format */0
+                                      }
                                     },
-                                    _1: "%Lx"
+                                    _1: "%Ld%018Ld"
                                   }), [
                                 0,
-                                44
+                                3
+                              ], [
+                                0,
+                                3
                               ]),
-                          _1: "2c"
+                          _1: "3000000000000000003"
                         };
-                })
-            ],
-            tl: {
-              hd: [
-                "i64_simple6",
-                (function (param) {
-                    return {
+                      })
+                  ],
+                  tl: {
+                    hd: [
+                      "i64_simple9",
+                      (function (param) {
+                          return {
                             TAG: /* Eq */0,
                             _0: Curry._2(Stdlib__Format.asprintf({
                                       TAG: /* Format */0,
                                       _0: {
                                         TAG: /* Int64 */7,
-                                        _0: /* Int_x */6,
-                                        _1: {
-                                          TAG: /* Arg_padding */1,
-                                          _0: /* Right */1
-                                        },
+                                        _0: /* Int_d */0,
+                                        _1: /* No_padding */0,
                                         _2: /* No_precision */0,
-                                        _3: /* End_of_format */0
+                                        _3: {
+                                          TAG: /* Int64 */7,
+                                          _0: /* Int_d */0,
+                                          _1: {
+                                            TAG: /* Lit_padding */0,
+                                            _0: /* Zeros */2,
+                                            _1: 18
+                                          },
+                                          _2: /* No_precision */0,
+                                          _3: /* End_of_format */0
+                                        }
                                       },
-                                      _1: "%*Lx"
-                                    }), 5, [
-                                  0,
-                                  44
-                                ]),
-                            _1: "   2c"
+                                      _1: "%Ld%018Ld"
+                                    }), [
+                                  107288,
+                                  1548746752
+                                ], Caml_int64.zero),
+                            _1: "460800000000000000000000000000000"
                           };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "i64_simple7",
-                  (function (param) {
-                      return {
+                        })
+                    ],
+                    tl: {
+                      hd: [
+                        "i64_simple10",
+                        (function (param) {
+                            return {
                               TAG: /* Eq */0,
-                              _0: Caml_format.caml_int64_format("%d", [
-                                    0,
-                                    3333
-                                  ]),
-                              _1: "3333"
+                              _0: Curry._1(Stdlib__Format.asprintf({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Int64 */7,
+                                          _0: /* Int_x */6,
+                                          _1: /* No_padding */0,
+                                          _2: /* No_precision */0,
+                                          _3: /* End_of_format */0
+                                        },
+                                        _1: "%Lx"
+                                      }), Stdlib__Int64.max_int),
+                              _1: "7fffffffffffffff"
                             };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "i64_simple8",
-                    (function (param) {
-                        return {
+                          })
+                      ],
+                      tl: {
+                        hd: [
+                          "i64_simple15",
+                          (function (param) {
+                              return {
                                 TAG: /* Eq */0,
-                                _0: Curry._2(Stdlib__Format.asprintf({
+                                _0: Curry._1(Stdlib__Format.asprintf({
                                           TAG: /* Format */0,
                                           _0: {
                                             TAG: /* Int64 */7,
                                             _0: /* Int_d */0,
                                             _1: /* No_padding */0,
                                             _2: /* No_precision */0,
-                                            _3: {
-                                              TAG: /* Int64 */7,
-                                              _0: /* Int_d */0,
-                                              _1: {
-                                                TAG: /* Lit_padding */0,
-                                                _0: /* Zeros */2,
-                                                _1: 18
-                                              },
-                                              _2: /* No_precision */0,
-                                              _3: /* End_of_format */0
-                                            }
+                                            _3: /* End_of_format */0
                                           },
-                                          _1: "%Ld%018Ld"
-                                        }), [
-                                      0,
-                                      3
-                                    ], [
-                                      0,
-                                      3
-                                    ]),
-                                _1: "3000000000000000003"
+                                          _1: "%Ld"
+                                        }), Caml_int64.neg_one),
+                                _1: "-1"
                               };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "i64_simple9",
-                      (function (param) {
-                          return {
+                            })
+                        ],
+                        tl: {
+                          hd: [
+                            "i64_simple16",
+                            (function (param) {
+                                return {
                                   TAG: /* Eq */0,
-                                  _0: Curry._2(Stdlib__Format.asprintf({
+                                  _0: Curry._1(Stdlib__Format.asprintf({
                                             TAG: /* Format */0,
                                             _0: {
                                               TAG: /* Int64 */7,
                                               _0: /* Int_d */0,
                                               _1: /* No_padding */0,
                                               _2: /* No_precision */0,
-                                              _3: {
-                                                TAG: /* Int64 */7,
-                                                _0: /* Int_d */0,
-                                                _1: {
-                                                  TAG: /* Lit_padding */0,
-                                                  _0: /* Zeros */2,
-                                                  _1: 18
-                                                },
-                                                _2: /* No_precision */0,
-                                                _3: /* End_of_format */0
-                                              }
+                                              _3: /* End_of_format */0
                                             },
-                                            _1: "%Ld%018Ld"
+                                            _1: "%Ld"
                                           }), [
-                                        107288,
-                                        1548746752
-                                      ], Caml_int64.zero),
-                                  _1: "460800000000000000000000000000000"
+                                        -1,
+                                        4294956185
+                                      ]),
+                                  _1: "-11111"
                                 };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "i64_simple10",
-                        (function (param) {
-                            return {
+                              })
+                          ],
+                          tl: {
+                            hd: [
+                              "i64_simple14",
+                              (function (param) {
+                                  return {
                                     TAG: /* Eq */0,
                                     _0: Curry._1(Stdlib__Format.asprintf({
                                               TAG: /* Format */0,
                                               _0: {
                                                 TAG: /* Int64 */7,
-                                                _0: /* Int_x */6,
+                                                _0: /* Int_X */8,
                                                 _1: /* No_padding */0,
                                                 _2: /* No_precision */0,
                                                 _3: /* End_of_format */0
                                               },
-                                              _1: "%Lx"
-                                            }), Stdlib__Int64.max_int),
-                                    _1: "7fffffffffffffff"
+                                              _1: "%LX"
+                                            }), Caml_int64.neg_one),
+                                    _1: "FFFFFFFFFFFFFFFF"
                                   };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "i64_simple15",
-                          (function (param) {
-                              return {
+                                })
+                            ],
+                            tl: {
+                              hd: [
+                                "File \"jscomp/test/caml_format_test.ml\", line 207, characters 4-11",
+                                (function (param) {
+                                    return {
                                       TAG: /* Eq */0,
                                       _0: Curry._1(Stdlib__Format.asprintf({
                                                 TAG: /* Format */0,
                                                 _0: {
                                                   TAG: /* Int64 */7,
-                                                  _0: /* Int_d */0,
+                                                  _0: /* Int_x */6,
                                                   _1: /* No_padding */0,
                                                   _2: /* No_precision */0,
                                                   _3: /* End_of_format */0
                                                 },
-                                                _1: "%Ld"
+                                                _1: "%Lx"
                                               }), Caml_int64.neg_one),
-                                      _1: "-1"
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "i64_simple16",
-                            (function (param) {
-                                return {
+                                      _1: "ffffffffffffffff"
+                                    };
+                                  })
+                              ],
+                              tl: {
+                                hd: [
+                                  "i64_simple11",
+                                  (function (param) {
+                                      return {
                                         TAG: /* Eq */0,
                                         _0: Curry._1(Stdlib__Format.asprintf({
                                                   TAG: /* Format */0,
                                                   _0: {
                                                     TAG: /* Int64 */7,
-                                                    _0: /* Int_d */0,
+                                                    _0: /* Int_X */8,
                                                     _1: /* No_padding */0,
                                                     _2: /* No_precision */0,
                                                     _3: /* End_of_format */0
                                                   },
-                                                  _1: "%Ld"
-                                                }), [
-                                              -1,
-                                              4294956185
-                                            ]),
-                                        _1: "-11111"
+                                                  _1: "%LX"
+                                                }), Stdlib__Int64.max_int),
+                                        _1: "7FFFFFFFFFFFFFFF"
                                       };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "i64_simple14",
-                              (function (param) {
-                                  return {
+                                    })
+                                ],
+                                tl: {
+                                  hd: [
+                                    "File \"jscomp/test/caml_format_test.ml\", line 215, characters 4-11",
+                                    (function (param) {
+                                        return {
                                           TAG: /* Eq */0,
                                           _0: Curry._1(Stdlib__Format.asprintf({
                                                     TAG: /* Format */0,
@@ -2465,79 +2528,82 @@ const int64_suites_1 = {
                                                       _3: /* End_of_format */0
                                                     },
                                                     _1: "%LX"
-                                                  }), Caml_int64.neg_one),
-                                          _1: "FFFFFFFFFFFFFFFF"
+                                                  }), Stdlib__Int64.min_int),
+                                          _1: "8000000000000000"
                                         };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "File \"jscomp/test/caml_format_test.ml\", line 207, characters 4-11",
-                                (function (param) {
-                                    return {
+                                      })
+                                  ],
+                                  tl: {
+                                    hd: [
+                                      "File \"jscomp/test/caml_format_test.ml\", line 216, characters 4-11",
+                                      (function (param) {
+                                          return {
                                             TAG: /* Eq */0,
                                             _0: Curry._1(Stdlib__Format.asprintf({
                                                       TAG: /* Format */0,
                                                       _0: {
                                                         TAG: /* Int64 */7,
-                                                        _0: /* Int_x */6,
+                                                        _0: /* Int_u */12,
                                                         _1: /* No_padding */0,
                                                         _2: /* No_precision */0,
                                                         _3: /* End_of_format */0
                                                       },
-                                                      _1: "%Lx"
+                                                      _1: "%Lu"
                                                     }), Caml_int64.neg_one),
-                                            _1: "ffffffffffffffff"
+                                            _1: "18446744073709551615"
                                           };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "i64_simple11",
-                                  (function (param) {
-                                      return {
+                                        })
+                                    ],
+                                    tl: {
+                                      hd: [
+                                        "File \"jscomp/test/caml_format_test.ml\", line 220, characters 4-11",
+                                        (function (param) {
+                                            return {
                                               TAG: /* Eq */0,
                                               _0: Curry._1(Stdlib__Format.asprintf({
                                                         TAG: /* Format */0,
                                                         _0: {
                                                           TAG: /* Int64 */7,
-                                                          _0: /* Int_X */8,
+                                                          _0: /* Int_u */12,
                                                           _1: /* No_padding */0,
                                                           _2: /* No_precision */0,
                                                           _3: /* End_of_format */0
                                                         },
-                                                        _1: "%LX"
-                                                      }), Stdlib__Int64.max_int),
-                                              _1: "7FFFFFFFFFFFFFFF"
+                                                        _1: "%Lu"
+                                                      }), [
+                                                    -1,
+                                                    4294967196
+                                                  ]),
+                                              _1: "18446744073709551516"
                                             };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "File \"jscomp/test/caml_format_test.ml\", line 215, characters 4-11",
-                                    (function (param) {
-                                        return {
+                                          })
+                                      ],
+                                      tl: {
+                                        hd: [
+                                          "File \"jscomp/test/caml_format_test.ml\", line 223, characters 4-11",
+                                          (function (param) {
+                                              return {
                                                 TAG: /* Eq */0,
                                                 _0: Curry._1(Stdlib__Format.asprintf({
                                                           TAG: /* Format */0,
                                                           _0: {
                                                             TAG: /* Int64 */7,
-                                                            _0: /* Int_X */8,
+                                                            _0: /* Int_u */12,
                                                             _1: /* No_padding */0,
                                                             _2: /* No_precision */0,
                                                             _3: /* End_of_format */0
                                                           },
-                                                          _1: "%LX"
-                                                        }), Stdlib__Int64.min_int),
-                                                _1: "8000000000000000"
+                                                          _1: "%Lu"
+                                                        }), Caml_int64.add(Stdlib__Int64.min_int, Caml_int64.one)),
+                                                _1: "9223372036854775809"
                                               };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "File \"jscomp/test/caml_format_test.ml\", line 216, characters 4-11",
-                                      (function (param) {
-                                          return {
+                                            })
+                                        ],
+                                        tl: {
+                                          hd: [
+                                            "File \"jscomp/test/caml_format_test.ml\", line 226, characters 4-11",
+                                            (function (param) {
+                                                return {
                                                   TAG: /* Eq */0,
                                                   _0: Curry._1(Stdlib__Format.asprintf({
                                                             TAG: /* Format */0,
@@ -2549,200 +2615,134 @@ const int64_suites_1 = {
                                                               _3: /* End_of_format */0
                                                             },
                                                             _1: "%Lu"
-                                                          }), Caml_int64.neg_one),
-                                                  _1: "18446744073709551615"
+                                                          }), [
+                                                        -1,
+                                                        4294957296
+                                                      ]),
+                                                  _1: "18446744073709541616"
                                                 };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "File \"jscomp/test/caml_format_test.ml\", line 220, characters 4-11",
-                                        (function (param) {
-                                            return {
+                                              })
+                                          ],
+                                          tl: {
+                                            hd: [
+                                              "i64_simple19",
+                                              (function (param) {
+                                                  return {
                                                     TAG: /* Eq */0,
                                                     _0: Curry._1(Stdlib__Format.asprintf({
                                                               TAG: /* Format */0,
                                                               _0: {
                                                                 TAG: /* Int64 */7,
-                                                                _0: /* Int_u */12,
+                                                                _0: /* Int_o */10,
                                                                 _1: /* No_padding */0,
                                                                 _2: /* No_precision */0,
                                                                 _3: /* End_of_format */0
                                                               },
-                                                              _1: "%Lu"
-                                                            }), [
-                                                          -1,
-                                                          4294967196
-                                                        ]),
-                                                    _1: "18446744073709551516"
+                                                              _1: "%Lo"
+                                                            }), Stdlib__Int64.min_int),
+                                                    _1: "1000000000000000000000"
                                                   };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "File \"jscomp/test/caml_format_test.ml\", line 223, characters 4-11",
-                                          (function (param) {
-                                              return {
+                                                })
+                                            ],
+                                            tl: {
+                                              hd: [
+                                                "i64_simple13",
+                                                (function (param) {
+                                                    return {
                                                       TAG: /* Eq */0,
                                                       _0: Curry._1(Stdlib__Format.asprintf({
                                                                 TAG: /* Format */0,
                                                                 _0: {
                                                                   TAG: /* Int64 */7,
-                                                                  _0: /* Int_u */12,
+                                                                  _0: /* Int_X */8,
                                                                   _1: /* No_padding */0,
                                                                   _2: /* No_precision */0,
                                                                   _3: /* End_of_format */0
                                                                 },
-                                                                _1: "%Lu"
+                                                                _1: "%LX"
                                                               }), Caml_int64.add(Stdlib__Int64.min_int, Caml_int64.one)),
-                                                      _1: "9223372036854775809"
+                                                      _1: "8000000000000001"
                                                     };
-                                            })
-                                        ],
-                                        tl: {
-                                          hd: [
-                                            "File \"jscomp/test/caml_format_test.ml\", line 226, characters 4-11",
-                                            (function (param) {
-                                                return {
+                                                  })
+                                              ],
+                                              tl: {
+                                                hd: [
+                                                  "i64_simple20",
+                                                  (function (param) {
+                                                      return {
                                                         TAG: /* Eq */0,
                                                         _0: Curry._1(Stdlib__Format.asprintf({
                                                                   TAG: /* Format */0,
                                                                   _0: {
                                                                     TAG: /* Int64 */7,
-                                                                    _0: /* Int_u */12,
-                                                                    _1: /* No_padding */0,
+                                                                    _0: /* Int_x */6,
+                                                                    _1: {
+                                                                      TAG: /* Lit_padding */0,
+                                                                      _0: /* Right */1,
+                                                                      _1: 12
+                                                                    },
                                                                     _2: /* No_precision */0,
                                                                     _3: /* End_of_format */0
                                                                   },
-                                                                  _1: "%Lu"
+                                                                  _1: "%12Lx"
                                                                 }), [
-                                                              -1,
-                                                              4294957296
+                                                              0,
+                                                              3
                                                             ]),
-                                                        _1: "18446744073709541616"
+                                                        _1: "           3"
                                                       };
-                                              })
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "i64_simple19",
-                                              (function (param) {
-                                                  return {
+                                                    })
+                                                ],
+                                                tl: {
+                                                  hd: [
+                                                    "i64_simple21",
+                                                    (function (param) {
+                                                        return {
                                                           TAG: /* Eq */0,
                                                           _0: Curry._1(Stdlib__Format.asprintf({
                                                                     TAG: /* Format */0,
                                                                     _0: {
                                                                       TAG: /* Int64 */7,
-                                                                      _0: /* Int_o */10,
+                                                                      _0: /* Int_X */8,
                                                                       _1: /* No_padding */0,
                                                                       _2: /* No_precision */0,
                                                                       _3: /* End_of_format */0
                                                                     },
-                                                                    _1: "%Lo"
-                                                                  }), Stdlib__Int64.min_int),
-                                                          _1: "1000000000000000000000"
+                                                                    _1: "%LX"
+                                                                  }), [
+                                                                1859194407,
+                                                                1163551168
+                                                              ]),
+                                                          _1: "6ED10E27455A61C0"
                                                         };
-                                                })
-                                            ],
-                                            tl: {
-                                              hd: [
-                                                "i64_simple13",
-                                                (function (param) {
-                                                    return {
+                                                      })
+                                                  ],
+                                                  tl: {
+                                                    hd: [
+                                                      "missing_neline",
+                                                      (function (param) {
+                                                          return {
                                                             TAG: /* Eq */0,
                                                             _0: Curry._1(Stdlib__Format.asprintf({
                                                                       TAG: /* Format */0,
                                                                       _0: {
                                                                         TAG: /* Int64 */7,
-                                                                        _0: /* Int_X */8,
+                                                                        _0: /* Int_d */0,
                                                                         _1: /* No_padding */0,
                                                                         _2: /* No_precision */0,
-                                                                        _3: /* End_of_format */0
+                                                                        _3: {
+                                                                          TAG: /* Char_literal */12,
+                                                                          _0: /* '\n' */10,
+                                                                          _1: /* End_of_format */0
+                                                                        }
                                                                       },
-                                                                      _1: "%LX"
-                                                                    }), Caml_int64.add(Stdlib__Int64.min_int, Caml_int64.one)),
-                                                            _1: "8000000000000001"
+                                                                      _1: "%Ld\n"
+                                                                    }), [
+                                                                  0,
+                                                                  32
+                                                                ]),
+                                                            _1: "32\n"
                                                           };
-                                                  })
-                                              ],
-                                              tl: {
-                                                hd: [
-                                                  "i64_simple20",
-                                                  (function (param) {
-                                                      return {
-                                                              TAG: /* Eq */0,
-                                                              _0: Curry._1(Stdlib__Format.asprintf({
-                                                                        TAG: /* Format */0,
-                                                                        _0: {
-                                                                          TAG: /* Int64 */7,
-                                                                          _0: /* Int_x */6,
-                                                                          _1: {
-                                                                            TAG: /* Lit_padding */0,
-                                                                            _0: /* Right */1,
-                                                                            _1: 12
-                                                                          },
-                                                                          _2: /* No_precision */0,
-                                                                          _3: /* End_of_format */0
-                                                                        },
-                                                                        _1: "%12Lx"
-                                                                      }), [
-                                                                    0,
-                                                                    3
-                                                                  ]),
-                                                              _1: "           3"
-                                                            };
-                                                    })
-                                                ],
-                                                tl: {
-                                                  hd: [
-                                                    "i64_simple21",
-                                                    (function (param) {
-                                                        return {
-                                                                TAG: /* Eq */0,
-                                                                _0: Curry._1(Stdlib__Format.asprintf({
-                                                                          TAG: /* Format */0,
-                                                                          _0: {
-                                                                            TAG: /* Int64 */7,
-                                                                            _0: /* Int_X */8,
-                                                                            _1: /* No_padding */0,
-                                                                            _2: /* No_precision */0,
-                                                                            _3: /* End_of_format */0
-                                                                          },
-                                                                          _1: "%LX"
-                                                                        }), [
-                                                                      1859194407,
-                                                                      1163551168
-                                                                    ]),
-                                                                _1: "6ED10E27455A61C0"
-                                                              };
-                                                      })
-                                                  ],
-                                                  tl: {
-                                                    hd: [
-                                                      "missing_neline",
-                                                      (function (param) {
-                                                          return {
-                                                                  TAG: /* Eq */0,
-                                                                  _0: Curry._1(Stdlib__Format.asprintf({
-                                                                            TAG: /* Format */0,
-                                                                            _0: {
-                                                                              TAG: /* Int64 */7,
-                                                                              _0: /* Int_d */0,
-                                                                              _1: /* No_padding */0,
-                                                                              _2: /* No_precision */0,
-                                                                              _3: {
-                                                                                TAG: /* Char_literal */12,
-                                                                                _0: /* '\n' */10,
-                                                                                _1: /* End_of_format */0
-                                                                              }
-                                                                            },
-                                                                            _1: "%Ld\n"
-                                                                          }), [
-                                                                        0,
-                                                                        32
-                                                                      ]),
-                                                                  _1: "32\n"
-                                                                };
                                                         })
                                                     ],
                                                     tl: {
@@ -2751,27 +2751,27 @@ const int64_suites_1 = {
                                                         (function (param) {
                                                             const buf = Stdlib__Buffer.create(30);
                                                             return {
-                                                                    TAG: /* Eq */0,
-                                                                    _0: (Curry._1(Stdlib__Printf.bprintf(buf, {
-                                                                                TAG: /* Format */0,
-                                                                                _0: {
-                                                                                  TAG: /* Int64 */7,
-                                                                                  _0: /* Int_d */0,
-                                                                                  _1: /* No_padding */0,
-                                                                                  _2: /* No_precision */0,
-                                                                                  _3: {
-                                                                                    TAG: /* Char_literal */12,
-                                                                                    _0: /* '\n' */10,
-                                                                                    _1: /* End_of_format */0
-                                                                                  }
-                                                                                },
-                                                                                _1: "%Ld\n"
-                                                                              }), [
-                                                                            0,
-                                                                            32
-                                                                          ]), Stdlib__Buffer.contents(buf)),
-                                                                    _1: "32\n"
-                                                                  };
+                                                              TAG: /* Eq */0,
+                                                              _0: (Curry._1(Stdlib__Printf.bprintf(buf, {
+                                                                          TAG: /* Format */0,
+                                                                          _0: {
+                                                                            TAG: /* Int64 */7,
+                                                                            _0: /* Int_d */0,
+                                                                            _1: /* No_padding */0,
+                                                                            _2: /* No_precision */0,
+                                                                            _3: {
+                                                                              TAG: /* Char_literal */12,
+                                                                              _0: /* '\n' */10,
+                                                                              _1: /* End_of_format */0
+                                                                            }
+                                                                          },
+                                                                          _1: "%Ld\n"
+                                                                        }), [
+                                                                      0,
+                                                                      32
+                                                                    ]), Stdlib__Buffer.contents(buf)),
+                                                              _1: "32\n"
+                                                            };
                                                           })
                                                       ],
                                                       tl: /* [] */0
@@ -2870,60 +2870,60 @@ Mt.from_pair_suites("Caml_format_test", Stdlib.$at(suites, Stdlib.$at(formatter_
                                     const f = param[1];
                                     const fmt = param[0];
                                     return [
-                                            Curry._1(Stdlib__Printf.sprintf({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "float_format ",
-                                                        _1: {
-                                                          TAG: /* Int */4,
-                                                          _0: /* Int_d */0,
-                                                          _1: /* No_padding */0,
-                                                          _2: /* No_precision */0,
-                                                          _3: /* End_of_format */0
-                                                        }
-                                                      },
-                                                      _1: "float_format %d"
-                                                    }), i),
-                                            (function (param) {
-                                                return {
-                                                        TAG: /* Eq */0,
-                                                        _0: Caml_format.caml_format_float(fmt, f),
-                                                        _1: str_result
-                                                      };
-                                              })
-                                          ];
+                                      Curry._1(Stdlib__Printf.sprintf({
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "float_format ",
+                                                  _1: {
+                                                    TAG: /* Int */4,
+                                                    _0: /* Int_d */0,
+                                                    _1: /* No_padding */0,
+                                                    _2: /* No_precision */0,
+                                                    _3: /* End_of_format */0
+                                                  }
+                                                },
+                                                _1: "float_format %d"
+                                              }), i),
+                                      (function (param) {
+                                          return {
+                                            TAG: /* Eq */0,
+                                            _0: Caml_format.caml_format_float(fmt, f),
+                                            _1: str_result
+                                          };
+                                        })
+                                    ];
                                   }), float_data)), Stdlib.$at(int64_suites, Stdlib__Array.to_list(Stdlib__Array.mapi((function (i, param) {
                                         const b = param[1];
                                         const a = param[0];
                                         return [
-                                                Curry._1(Stdlib__Printf.sprintf({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "int64_of_string ",
-                                                            _1: {
-                                                              TAG: /* Int */4,
-                                                              _0: /* Int_d */0,
-                                                              _1: /* No_padding */0,
-                                                              _2: /* No_precision */0,
-                                                              _3: {
-                                                                TAG: /* Char_literal */12,
-                                                                _0: /* ' ' */32,
-                                                                _1: /* End_of_format */0
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "int64_of_string %d "
-                                                        }), i),
-                                                (function (param) {
-                                                    return {
-                                                            TAG: /* Eq */0,
-                                                            _0: Caml_format.caml_int64_of_string(b),
-                                                            _1: a
-                                                          };
-                                                  })
-                                              ];
+                                          Curry._1(Stdlib__Printf.sprintf({
+                                                    TAG: /* Format */0,
+                                                    _0: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: "int64_of_string ",
+                                                      _1: {
+                                                        TAG: /* Int */4,
+                                                        _0: /* Int_d */0,
+                                                        _1: /* No_padding */0,
+                                                        _2: /* No_precision */0,
+                                                        _3: {
+                                                          TAG: /* Char_literal */12,
+                                                          _0: /* ' ' */32,
+                                                          _1: /* End_of_format */0
+                                                        }
+                                                      }
+                                                    },
+                                                    _1: "int64_of_string %d "
+                                                  }), i),
+                                          (function (param) {
+                                              return {
+                                                TAG: /* Eq */0,
+                                                _0: Caml_format.caml_int64_of_string(b),
+                                                _1: a
+                                              };
+                                            })
+                                        ];
                                       }), of_string_data)))))))));
 
 const a = Stdlib__Format.asprintf;
diff --git a/jscomp/test/dist/jscomp/test/caml_sys_poly_fill_test.js b/jscomp/test/dist/jscomp/test/caml_sys_poly_fill_test.js
index f5292cc81..8599af5cf 100644
--- a/jscomp/test/dist/jscomp/test/caml_sys_poly_fill_test.js
+++ b/jscomp/test/dist/jscomp/test/caml_sys_poly_fill_test.js
@@ -23,10 +23,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/chain_code_test.js b/jscomp/test/dist/jscomp/test/chain_code_test.js
index 6b20c715c..3cd877ffc 100644
--- a/jscomp/test/dist/jscomp/test/chain_code_test.js
+++ b/jscomp/test/dist/jscomp/test/chain_code_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -52,12 +52,12 @@ function f4(h, x, y) {
 }
 
 eq("File \"jscomp/test/chain_code_test.ml\", line 28, characters 5-12", 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/dist/jscomp/test/chn_test.js b/jscomp/test/dist/jscomp/test/chn_test.js
index 5985273e3..ef731e982 100644
--- a/jscomp/test/dist/jscomp/test/chn_test.js
+++ b/jscomp/test/dist/jscomp/test/chn_test.js
@@ -21,10 +21,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -37,19 +37,19 @@ console.log("\x3f\u003f\b\t\n\v\f\r\0\"'");
 
 function convert(s) {
   return Stdlib__Array.to_list(Array.from(s, (function (x) {
-                    const x$1 = x.codePointAt(0);
-                    if (x$1 !== undefined) {
-                      return x$1;
-                    }
-                    throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                              MEL_EXN_ID: "Assert_failure",
-                              _1: [
-                                "jscomp/test/chn_test.ml",
-                                20,
-                                22
-                              ]
-                            });
-                  })));
+              const x$1 = x.codePointAt(0);
+              if (x$1 !== undefined) {
+                return x$1;
+              }
+              throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/chn_test.ml",
+                      20,
+                      22
+                    ]
+                  });
+            })));
 }
 
 eq("File \"jscomp/test/chn_test.ml\", line 25, characters 7-14", "你好，\n世界", "你好，\n世界");
diff --git a/jscomp/test/dist/jscomp/test/class3_test.js b/jscomp/test/dist/jscomp/test/class3_test.js
index 7b24f588d..4393bac5c 100644
--- a/jscomp/test/dist/jscomp/test/class3_test.js
+++ b/jscomp/test/dist/jscomp/test/class3_test.js
@@ -86,10 +86,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/class4_test.js b/jscomp/test/dist/jscomp/test/class4_test.js
index 616caa205..041eb2c8e 100644
--- a/jscomp/test/dist/jscomp/test/class4_test.js
+++ b/jscomp/test/dist/jscomp/test/class4_test.js
@@ -34,10 +34,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/class5_test.js b/jscomp/test/dist/jscomp/test/class5_test.js
index aff3ec4fa..c81271063 100644
--- a/jscomp/test/dist/jscomp/test/class5_test.js
+++ b/jscomp/test/dist/jscomp/test/class5_test.js
@@ -36,10 +36,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/class6_test.js b/jscomp/test/dist/jscomp/test/class6_test.js
index a0d2aae30..290e01de6 100644
--- a/jscomp/test/dist/jscomp/test/class6_test.js
+++ b/jscomp/test/dist/jscomp/test/class6_test.js
@@ -34,10 +34,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -118,8 +118,8 @@ function lookup_obj(obj, _param) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   };
 }
 
diff --git a/jscomp/test/dist/jscomp/test/class7_test.js b/jscomp/test/dist/jscomp/test/class7_test.js
index 7fd495c6f..84e71f29d 100644
--- a/jscomp/test/dist/jscomp/test/class7_test.js
+++ b/jscomp/test/dist/jscomp/test/class7_test.js
@@ -47,10 +47,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/class_fib_open_recursion_test.js b/jscomp/test/dist/jscomp/test/class_fib_open_recursion_test.js
index 333d4ed00..714abbe99 100644
--- a/jscomp/test/dist/jscomp/test/class_fib_open_recursion_test.js
+++ b/jscomp/test/dist/jscomp/test/class_fib_open_recursion_test.js
@@ -26,10 +26,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/class_repr.js b/jscomp/test/dist/jscomp/test/class_repr.js
index fa7c69f3d..e7d284724 100644
--- a/jscomp/test/dist/jscomp/test/class_repr.js
+++ b/jscomp/test/dist/jscomp/test/class_repr.js
@@ -51,24 +51,24 @@ const u = Caml_oo.caml_set_oo_id(Caml_obj.caml_obj_dup(v));
 
 if (Caml_oo_curry.js1(291546447, 1, v) !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/class_repr.ml",
-              28,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/class_repr.ml",
+          28,
+          9
+        ]
+      });
 }
 
 if (Caml_oo_curry.js1(291546447, 2, u) !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/class_repr.ml",
-              30,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/class_repr.ml",
+          30,
+          9
+        ]
+      });
 }
 
 function xx_init($$class) {
@@ -105,13 +105,13 @@ const v2 = Caml_oo_curry.js1(-977586732, 3, v1);
 
 if (Caml_oo_curry.js1(-804710761, 4, v1) !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/class_repr.ml",
-              42,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/class_repr.ml",
+          42,
+          9
+        ]
+      });
 }
 
 if (/* tag */typeof Stdlib__Sys.backend_type === "number" || typeof Stdlib__Sys.backend_type === "string") {
@@ -125,13 +125,13 @@ if (/* tag */typeof Stdlib__Sys.backend_type === "number" || typeof Stdlib__Sys.
 
 if (Caml_oo_curry.js1(-804710761, 7, v2) !== 9) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/class_repr.ml",
-              57,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/class_repr.ml",
+          57,
+          9
+        ]
+      });
 }
 
 function point_init($$class) {
@@ -168,13 +168,13 @@ const v$1 = Curry._1(point[0], undefined);
 
 if (Caml_oo_curry.js1(590348294, 8, v$1) !== 5) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/class_repr.ml",
-              104,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/class_repr.ml",
+          104,
+          2
+        ]
+      });
 }
 
 function xx0_init($$class) {
diff --git a/jscomp/test/dist/jscomp/test/class_setter_getter.js b/jscomp/test/dist/jscomp/test/class_setter_getter.js
index e38285304..c9d8adfab 100644
--- a/jscomp/test/dist/jscomp/test/class_setter_getter.js
+++ b/jscomp/test/dist/jscomp/test/class_setter_getter.js
@@ -8,12 +8,12 @@ function fff(x) {
 
 function ff(x, z) {
   return {
-          hd: x.height,
-          tl: {
-            hd: z.height,
-            tl: /* [] */0
-          }
-        };
+    hd: x.height,
+    tl: {
+      hd: z.height,
+      tl: /* [] */0
+    }
+  };
 }
 
 exports.fff = fff;
diff --git a/jscomp/test/dist/jscomp/test/class_test.js b/jscomp/test/dist/jscomp/test/class_test.js
index 8c8aae9ca..37305fa76 100644
--- a/jscomp/test/dist/jscomp/test/class_test.js
+++ b/jscomp/test/dist/jscomp/test/class_test.js
@@ -95,10 +95,10 @@ Mt.from_pair_suites("Class_test", {
         "File \"jscomp/test/class_test.ml\", line 38, characters 4-11",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: zero,
-                    _1: 0
-                  };
+              TAG: /* Eq */0,
+              _0: zero,
+              _1: 0
+            };
           })
       ],
       tl: {
@@ -106,10 +106,10 @@ Mt.from_pair_suites("Class_test", {
           "File \"jscomp/test/class_test.ml\", line 39, characters 4-11",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: three,
-                      _1: 3
-                    };
+                TAG: /* Eq */0,
+                _0: three,
+                _1: 3
+              };
             })
         ],
         tl: {
@@ -117,10 +117,10 @@ Mt.from_pair_suites("Class_test", {
             "File \"jscomp/test/class_test.ml\", line 40, characters 4-11",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: one,
-                        _1: 1
-                      };
+                  TAG: /* Eq */0,
+                  _0: one,
+                  _1: 1
+                };
               })
           ],
           tl: {
@@ -128,10 +128,10 @@ Mt.from_pair_suites("Class_test", {
               "File \"jscomp/test/class_test.ml\", line 41, characters 4-11",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: two,
-                          _1: 2
-                        };
+                    TAG: /* Eq */0,
+                    _0: two,
+                    _1: 2
+                  };
                 })
             ],
             tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/class_type_ffi_test.js b/jscomp/test/dist/jscomp/test/class_type_ffi_test.js
index 04fcb90f9..3db5c5347 100644
--- a/jscomp/test/dist/jscomp/test/class_type_ffi_test.js
+++ b/jscomp/test/dist/jscomp/test/class_type_ffi_test.js
@@ -51,41 +51,41 @@ function off2(o, 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
+        ]);
   };
 }
 
 function omk_f(param) {
   return {
-          huge_methdo: (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
-                        ]);
-            })
-        };
+    huge_methdo: (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
+            ]);
+      })
+  };
 }
 
 exports.sum_float_array = sum_float_array;
diff --git a/jscomp/test/dist/jscomp/test/coercion_module_alias_test.js b/jscomp/test/dist/jscomp/test/coercion_module_alias_test.js
index 90f83c985..389ec891f 100644
--- a/jscomp/test/dist/jscomp/test/coercion_module_alias_test.js
+++ b/jscomp/test/dist/jscomp/test/coercion_module_alias_test.js
@@ -29,8 +29,8 @@ const f = Stdlib__List.length;
 
 function g(x) {
   return Stdlib__List.length(Stdlib__List.map((function (prim) {
-                    return prim + 1 | 0;
-                  }), x));
+              return prim + 1 | 0;
+            }), x));
 }
 
 function F(X) {
@@ -96,8 +96,8 @@ function F0(X) {
     x: 1
   };
   return {
-          N: N
-        };
+    N: N
+  };
 }
 
 const N$2 = {
@@ -160,8 +160,8 @@ function G0(funarg) {
     x: 1
   };
   return {
-          N$p: N
-        };
+    N$p: N
+  };
 }
 
 const M1 = {
diff --git a/jscomp/test/dist/jscomp/test/complex_if_test.js b/jscomp/test/dist/jscomp/test/complex_if_test.js
index b3f751ed6..e75cde0a1 100644
--- a/jscomp/test/dist/jscomp/test/complex_if_test.js
+++ b/jscomp/test/dist/jscomp/test/complex_if_test.js
@@ -126,10 +126,10 @@ const suites_0 = [
   "complete_escape",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: Stdlib__Bytes.to_string(escaped(Stdlib__Bytes.of_string("\0\x01\x02\x03\x04\x05\x06\x07\b\t\n\x0b\f\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,
+        _0: Stdlib__Bytes.to_string(escaped(Stdlib__Bytes.of_string("\0\x01\x02\x03\x04\x05\x06\x07\b\t\n\x0b\f\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/dist/jscomp/test/complex_test.js b/jscomp/test/dist/jscomp/test/complex_test.js
index 4f4147a2d..793ee5f54 100644
--- a/jscomp/test/dist/jscomp/test/complex_test.js
+++ b/jscomp/test/dist/jscomp/test/complex_test.js
@@ -8,13 +8,13 @@ const suites_0 = [
   "basic_add",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: {
-                re: 2,
-                im: 2
-              },
-              _1: Stdlib__Complex.add(Stdlib__Complex.add(Stdlib__Complex.add(Stdlib__Complex.one, Stdlib__Complex.one), Stdlib__Complex.i), Stdlib__Complex.i)
-            };
+        TAG: /* Eq */0,
+        _0: {
+          re: 2,
+          im: 2
+        },
+        _1: Stdlib__Complex.add(Stdlib__Complex.add(Stdlib__Complex.add(Stdlib__Complex.one, Stdlib__Complex.one), Stdlib__Complex.i), Stdlib__Complex.i)
+      };
     })
 ];
 
diff --git a/jscomp/test/dist/jscomp/test/const_block_test.js b/jscomp/test/dist/jscomp/test/const_block_test.js
index b0fe488d7..946d3f3d9 100644
--- a/jscomp/test/dist/jscomp/test/const_block_test.js
+++ b/jscomp/test/dist/jscomp/test/const_block_test.js
@@ -37,16 +37,16 @@ function h(param) {
 function g(param) {
   f(undefined);
   return {
-          TAG: /* Eq */0,
-          _0: [
-            Caml_array.get(a, 0),
-            Caml_array.get(b, 0)
-          ],
-          _1: [
-            3.0,
-            3
-          ]
-        };
+    TAG: /* Eq */0,
+    _0: [
+      Caml_array.get(a, 0),
+      Caml_array.get(b, 0)
+    ],
+    _1: [
+      3.0,
+      3
+    ]
+  };
 }
 
 const suites_0 = [
@@ -61,17 +61,17 @@ const suites_1 = {
         Caml_array.set(c, 0, 3);
         Caml_array.set(c, 1, 4);
         return {
-                TAG: /* Eq */0,
-                _0: [
-                  3,
-                  4,
-                  2,
-                  3,
-                  4,
-                  5
-                ],
-                _1: c
-              };
+          TAG: /* Eq */0,
+          _0: [
+            3,
+            4,
+            2,
+            3,
+            4,
+            5
+          ],
+          _1: c
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/const_defs_test.js b/jscomp/test/dist/jscomp/test/const_defs_test.js
index aa3818f12..cb67d5266 100644
--- a/jscomp/test/dist/jscomp/test/const_defs_test.js
+++ b/jscomp/test/dist/jscomp/test/const_defs_test.js
@@ -7,9 +7,9 @@ const u = 3;
 
 function f(param) {
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "hi"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "hi"
+      });
 }
 
 exports.u = u;
diff --git a/jscomp/test/dist/jscomp/test/cps_test.js b/jscomp/test/dist/jscomp/test/cps_test.js
index 30380d769..e0a91456b 100644
--- a/jscomp/test/dist/jscomp/test/cps_test.js
+++ b/jscomp/test/dist/jscomp/test/cps_test.js
@@ -73,10 +73,10 @@ Mt.from_pair_suites("Cps_test", {
         "cps_test_sum",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: 55,
-                    _1: test(undefined)
-                  };
+              TAG: /* Eq */0,
+              _0: 55,
+              _1: test(undefined)
+            };
           })
       ],
       tl: {
@@ -84,10 +84,10 @@ Mt.from_pair_suites("Cps_test", {
           "cps_test_closure",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: 15,
-                      _1: test_closure(undefined)
-                    };
+                TAG: /* Eq */0,
+                _0: 15,
+                _1: test_closure(undefined)
+              };
             })
         ],
         tl: {
@@ -95,10 +95,10 @@ Mt.from_pair_suites("Cps_test", {
             "cps_test_closure2",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: 30,
-                        _1: test_closure2(undefined)
-                      };
+                  TAG: /* Eq */0,
+                  _0: 30,
+                  _1: test_closure2(undefined)
+                };
               })
           ],
           tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/defunctor_make_test.js b/jscomp/test/dist/jscomp/test/defunctor_make_test.js
index ddc491f7d..498a059fa 100644
--- a/jscomp/test/dist/jscomp/test/defunctor_make_test.js
+++ b/jscomp/test/dist/jscomp/test/defunctor_make_test.js
@@ -29,13 +29,13 @@ function create(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    _0: l,
+    _1: x,
+    _2: d,
+    _3: r,
+    _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -46,9 +46,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l._3;
     const ld = l._2;
@@ -61,25 +61,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      _0: l,
+      _1: x,
+      _2: d,
+      _3: r,
+      _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r._3;
   const rd = r._2;
@@ -92,21 +92,21 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add(x, data, compare, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return {
-            TAG: /* Node */0,
-            _0: /* Empty */0,
-            _1: x,
-            _2: data,
-            _3: /* Empty */0,
-            _4: 1
-          };
+      TAG: /* Node */0,
+      _0: /* Empty */0,
+      _1: x,
+      _2: data,
+      _3: /* Empty */0,
+      _4: 1
+    };
   }
   const r = param._3;
   const d = param._2;
@@ -115,13 +115,13 @@ function add(x, data, compare, param) {
   const c = compare(x, v);
   if (c === 0) {
     return {
-            TAG: /* Node */0,
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: param._4
-          };
+      TAG: /* Node */0,
+      _0: l,
+      _1: x,
+      _2: data,
+      _3: r,
+      _4: param._4
+    };
   } else if (c < 0) {
     return bal(add(x, data, compare, l), v, d, r);
   } else {
@@ -132,16 +132,16 @@ function add(x, data, compare, param) {
 function add$1(x, data, v) {
   const 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 */0
-        };
+    compare: v,
+    data: /* Empty */0
+  };
 }
 
 const compare = Caml.caml_int_compare;
diff --git a/jscomp/test/dist/jscomp/test/demo.js b/jscomp/test/dist/jscomp/test/demo.js
index 86626171c..3f01c2cbb 100644
--- a/jscomp/test/dist/jscomp/test/demo.js
+++ b/jscomp/test/dist/jscomp/test/demo.js
@@ -26,8 +26,8 @@ function ui_layout(compile, lookup, appContext) {
   const computeFunction = {
     contents: (function (env) {
         return Curry._1(init, (function (key) {
-                      return Curry._2(lookup, env, key);
-                    }));
+                return Curry._2(lookup, env, key);
+              }));
       })
   };
   const hw1 = new BUI.HostedWindow();
@@ -49,10 +49,10 @@ function ui_layout(compile, lookup, appContext) {
   stackPanel.addChild(button);
   const mk_titleRow = function (text) {
     return {
-            label: {
-              text: text
-            }
-          };
+      label: {
+        text: text
+      }
+    };
   };
   const u = {
     width: 200
@@ -95,8 +95,8 @@ function ui_layout(compile, lookup, appContext) {
             const hot_function = Curry._1(compile, inputCode.text);
             computeFunction.contents = (function (env) {
                 return Curry._1(hot_function, (function (key) {
-                              return Curry._2(lookup, env, key);
-                            }));
+                        return Curry._2(lookup, env, key);
+                      }));
               });
             return ;
           }
@@ -114,11 +114,11 @@ function ui_layout(compile, lookup, appContext) {
                         ask: ask
                       });
                   return [
-                          mk_titleRow(param.ticker),
-                          mk_titleRow(bid.toFixed(2)),
-                          mk_titleRow(ask.toFixed(2)),
-                          mk_titleRow(result.toFixed(2))
-                        ];
+                    mk_titleRow(param.ticker),
+                    mk_titleRow(bid.toFixed(2)),
+                    mk_titleRow(ask.toFixed(2)),
+                    mk_titleRow(result.toFixed(2))
+                  ];
                 }));
         }), 100);
   return hw1;
diff --git a/jscomp/test/dist/jscomp/test/demo_int_map.js b/jscomp/test/dist/jscomp/test/demo_int_map.js
index a6b106a20..23ff5d47a 100644
--- a/jscomp/test/dist/jscomp/test/demo_int_map.js
+++ b/jscomp/test/dist/jscomp/test/demo_int_map.js
@@ -25,13 +25,13 @@ function create(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -42,9 +42,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -57,25 +57,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -88,21 +88,21 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -114,13 +114,13 @@ function add(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -144,8 +144,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg.compare, x, param.v);
     if (c === 0) {
diff --git a/jscomp/test/dist/jscomp/test/demo_page.js b/jscomp/test/dist/jscomp/test/demo_page.js
index 85765caf2..dc9924eee 100644
--- a/jscomp/test/dist/jscomp/test/demo_page.js
+++ b/jscomp/test/dist/jscomp/test/demo_page.js
@@ -26,10 +26,10 @@ function map(f, param) {
     return /* Nil */0;
   } else {
     return {
-            TAG: /* Cons */0,
-            _0: Curry._1(f, param._0),
-            _1: map(f, param._1)
-          };
+      TAG: /* Cons */0,
+      _0: Curry._1(f, param._0),
+      _1: map(f, param._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/dist/jscomp/test/demo_pipe.js b/jscomp/test/dist/jscomp/test/demo_pipe.js
index 7c7c6df00..1d40d535b 100644
--- a/jscomp/test/dist/jscomp/test/demo_pipe.js
+++ b/jscomp/test/dist/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/dist/jscomp/test/derive_projector_test.js b/jscomp/test/dist/jscomp/test/derive_projector_test.js
index 93178b89d..49e838b3a 100644
--- a/jscomp/test/dist/jscomp/test/derive_projector_test.js
+++ b/jscomp/test/dist/jscomp/test/derive_projector_test.js
@@ -16,31 +16,31 @@ function c_x(param) {
 
 function d_int(param_0) {
   return {
-          TAG: /* D_int */0,
-          _0: param_0
-        };
+    TAG: /* D_int */0,
+    _0: param_0
+  };
 }
 
 function d_tuple(param_0, param_1) {
   return {
-          TAG: /* D_tuple */1,
-          _0: param_0,
-          _1: param_1
-        };
+    TAG: /* D_tuple */1,
+    _0: param_0,
+    _1: param_1
+  };
 }
 
 function newContent(param_0) {
   return {
-          TAG: /* NewContent */2,
-          _0: param_0
-        };
+    TAG: /* NewContent */2,
+    _0: param_0
+  };
 }
 
 function d_tweak(param_0) {
   return {
-          TAG: /* D_tweak */3,
-          _0: param_0
-        };
+    TAG: /* D_tweak */3,
+    _0: param_0
+  };
 }
 
 function u_X(param) {
@@ -93,16 +93,16 @@ const h = {
 
 function xx(param_0) {
   return {
-          TAG: /* Xx */0,
-          _0: param_0
-        };
+    TAG: /* Xx */0,
+    _0: param_0
+  };
 }
 
 function a(param_0) {
   return {
-          TAG: /* A */0,
-          _0: param_0
-        };
+    TAG: /* A */0,
+    _0: param_0
+  };
 }
 
 const d_empty = /* D_empty */0;
diff --git a/jscomp/test/dist/jscomp/test/digest_test.js b/jscomp/test/dist/jscomp/test/digest_test.js
index caf838dc3..62df5370a 100644
--- a/jscomp/test/dist/jscomp/test/digest_test.js
+++ b/jscomp/test/dist/jscomp/test/digest_test.js
@@ -154,10 +154,10 @@ Mt.from_pair_suites("Digest_test", Stdlib.$at({
             "File \"jscomp/test/digest_test.ml\", line 6, characters 4-11",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: Stdlib__Digest.to_hex(Stdlib__Digest.string("value")),
-                        _1: "2063c1608d6e0baf80249c42e2be5804"
-                      };
+                  TAG: /* Eq */0,
+                  _0: Stdlib__Digest.to_hex(Stdlib__Digest.string("value")),
+                  _1: "2063c1608d6e0baf80249c42e2be5804"
+                };
               })
           ],
           tl: {
@@ -165,10 +165,10 @@ Mt.from_pair_suites("Digest_test", Stdlib.$at({
               "File \"jscomp/test/digest_test.ml\", line 7, characters 4-11",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: Stdlib__Digest.to_hex(Stdlib__Digest.string("The quick brown fox jumps over the lazy dog")),
-                          _1: "9e107d9d372bb6826bd81d3542a419d6"
-                        };
+                    TAG: /* Eq */0,
+                    _0: Stdlib__Digest.to_hex(Stdlib__Digest.string("The quick brown fox jumps over the lazy dog")),
+                    _1: "9e107d9d372bb6826bd81d3542a419d6"
+                  };
                 })
             ],
             tl: {
@@ -176,10 +176,10 @@ Mt.from_pair_suites("Digest_test", Stdlib.$at({
                 "File \"jscomp/test/digest_test.ml\", line 9, characters 4-11",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: Stdlib__Digest.to_hex(Stdlib__Digest.string("The quick brown fox jumps over the lazy dog.")),
-                            _1: "e4d909c290d0fb1ca068ffaddf22cbd0"
-                          };
+                      TAG: /* Eq */0,
+                      _0: Stdlib__Digest.to_hex(Stdlib__Digest.string("The quick brown fox jumps over the lazy dog.")),
+                      _1: "e4d909c290d0fb1ca068ffaddf22cbd0"
+                    };
                   })
               ],
               tl: {
@@ -187,10 +187,10 @@ Mt.from_pair_suites("Digest_test", Stdlib.$at({
                   "File \"jscomp/test/digest_test.ml\", line 11, characters 4-11",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: Stdlib__Digest.to_hex(Stdlib__Digest.string("")),
-                              _1: "d41d8cd98f00b204e9800998ecf8427e"
-                            };
+                        TAG: /* Eq */0,
+                        _0: Stdlib__Digest.to_hex(Stdlib__Digest.string("")),
+                        _1: "d41d8cd98f00b204e9800998ecf8427e"
+                      };
                     })
                 ],
                 tl: {
@@ -198,10 +198,10 @@ Mt.from_pair_suites("Digest_test", Stdlib.$at({
                     "File \"jscomp/test/digest_test.ml\", line 12, characters 4-11",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: Stdlib__Digest.to_hex(Stdlib__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,
+                          _0: Stdlib__Digest.to_hex(Stdlib__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: {
@@ -209,10 +209,10 @@ Mt.from_pair_suites("Digest_test", Stdlib.$at({
                       "File \"jscomp/test/digest_test.ml\", line 13, characters 4-11",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: Stdlib__Digest.to_hex(Stdlib__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,
+                            _0: Stdlib__Digest.to_hex(Stdlib__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
@@ -223,25 +223,25 @@ Mt.from_pair_suites("Digest_test", Stdlib.$at({
           }
         }, Stdlib__Array.to_list(Stdlib__Array.map((function (i) {
                     return [
-                            Curry._1(Stdlib__Printf.sprintf({
-                                      TAG: /* Format */0,
-                                      _0: {
-                                        TAG: /* Int */4,
-                                        _0: /* Int_d */0,
-                                        _1: /* No_padding */0,
-                                        _2: /* No_precision */0,
-                                        _3: /* End_of_format */0
-                                      },
-                                      _1: "%d"
-                                    }), i),
-                            (function (param) {
-                                return {
-                                        TAG: /* Eq */0,
-                                        _0: Stdlib__Digest.to_hex(Stdlib__Digest.string(Caml_bytes.bytes_to_string(Stdlib__Bytes.make(i, /* 'a' */97)))),
-                                        _1: Caml_array.get(ref, i)
-                                      };
-                              })
-                          ];
+                      Curry._1(Stdlib__Printf.sprintf({
+                                TAG: /* Format */0,
+                                _0: {
+                                  TAG: /* Int */4,
+                                  _0: /* Int_d */0,
+                                  _1: /* No_padding */0,
+                                  _2: /* No_precision */0,
+                                  _3: /* End_of_format */0
+                                },
+                                _1: "%d"
+                              }), i),
+                      (function (param) {
+                          return {
+                            TAG: /* Eq */0,
+                            _0: Stdlib__Digest.to_hex(Stdlib__Digest.string(Caml_bytes.bytes_to_string(Stdlib__Bytes.make(i, /* 'a' */97)))),
+                            _1: Caml_array.get(ref, i)
+                          };
+                        })
+                    ];
                   }), Ext_array_test.range(0, 129)))));
 
 exports.f = f;
diff --git a/jscomp/test/dist/jscomp/test/div_by_zero_test.js b/jscomp/test/dist/jscomp/test/div_by_zero_test.js
index 6711f8527..2d749f419 100644
--- a/jscomp/test/dist/jscomp/test/div_by_zero_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -41,11 +41,11 @@ add([
       "File \"jscomp/test/div_by_zero_test.ml\", line 14, characters 7-14",
       (function (param) {
           return {
-                  TAG: /* ThrowAny */7,
-                  _0: (function (param) {
-                      Caml_int32.div(3, 0);
-                    })
-                };
+            TAG: /* ThrowAny */7,
+            _0: (function (param) {
+                Caml_int32.div(3, 0);
+              })
+          };
         })
     ]);
 
@@ -53,11 +53,11 @@ add([
       "File \"jscomp/test/div_by_zero_test.ml\", line 15, characters 7-14",
       (function (param) {
           return {
-                  TAG: /* ThrowAny */7,
-                  _0: (function (param) {
-                      Caml_int32.mod_(3, 0);
-                    })
-                };
+            TAG: /* ThrowAny */7,
+            _0: (function (param) {
+                Caml_int32.mod_(3, 0);
+              })
+          };
         })
     ]);
 
@@ -65,11 +65,11 @@ add([
       "File \"jscomp/test/div_by_zero_test.ml\", line 16, characters 7-14",
       (function (param) {
           return {
-                  TAG: /* ThrowAny */7,
-                  _0: (function (param) {
-                      Caml_int32.div(3, 0);
-                    })
-                };
+            TAG: /* ThrowAny */7,
+            _0: (function (param) {
+                Caml_int32.div(3, 0);
+              })
+          };
         })
     ]);
 
@@ -77,11 +77,11 @@ add([
       "File \"jscomp/test/div_by_zero_test.ml\", line 17, characters 7-14",
       (function (param) {
           return {
-                  TAG: /* ThrowAny */7,
-                  _0: (function (param) {
-                      Caml_int32.mod_(3, 0);
-                    })
-                };
+            TAG: /* ThrowAny */7,
+            _0: (function (param) {
+                Caml_int32.mod_(3, 0);
+              })
+          };
         })
     ]);
 
@@ -89,14 +89,14 @@ add([
       "File \"jscomp/test/div_by_zero_test.ml\", line 18, characters 7-14",
       (function (param) {
           return {
-                  TAG: /* ThrowAny */7,
-                  _0: (function (param) {
-                      Caml_int64.div([
-                            0,
-                            3
-                          ], Caml_int64.zero);
-                    })
-                };
+            TAG: /* ThrowAny */7,
+            _0: (function (param) {
+                Caml_int64.div([
+                      0,
+                      3
+                    ], Caml_int64.zero);
+              })
+          };
         })
     ]);
 
@@ -104,14 +104,14 @@ add([
       "File \"jscomp/test/div_by_zero_test.ml\", line 19, characters 7-14",
       (function (param) {
           return {
-                  TAG: /* ThrowAny */7,
-                  _0: (function (param) {
-                      Caml_int64.mod_([
-                            0,
-                            3
-                          ], Caml_int64.zero);
-                    })
-                };
+            TAG: /* ThrowAny */7,
+            _0: (function (param) {
+                Caml_int64.mod_([
+                      0,
+                      3
+                    ], Caml_int64.zero);
+              })
+          };
         })
     ]);
 
diff --git a/jscomp/test/dist/jscomp/test/dollar_escape_test.js b/jscomp/test/dist/jscomp/test/dollar_escape_test.js
index 29696effc..e94bfa20f 100644
--- a/jscomp/test/dist/jscomp/test/dollar_escape_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/earger_curry_test.js b/jscomp/test/dist/jscomp/test/earger_curry_test.js
index d3da34693..10a971671 100644
--- a/jscomp/test/dist/jscomp/test/earger_curry_test.js
+++ b/jscomp/test/dist/jscomp/test/earger_curry_test.js
@@ -27,9 +27,9 @@ function init(l, f) {
   }
   if (l < 0) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Array.init"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Array.init"
+        });
   }
   const res = Caml_array.make(l, f$1(0));
   for (let 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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/epsilon_test.js b/jscomp/test/dist/jscomp/test/epsilon_test.js
index cfd656cce..1cbfcf424 100644
--- a/jscomp/test/dist/jscomp/test/epsilon_test.js
+++ b/jscomp/test/dist/jscomp/test/epsilon_test.js
@@ -11,10 +11,10 @@ const suites_0 = [
   "epsilon",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: Stdlib.epsilon_float,
-              _1: v
-            };
+        TAG: /* Eq */0,
+        _0: Stdlib.epsilon_float,
+        _1: v
+      };
     })
 ];
 
@@ -23,10 +23,10 @@ const suites_1 = {
     "raw_epsilon",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: 2.220446049250313e-16,
-                _1: v
-              };
+          TAG: /* Eq */0,
+          _0: 2.220446049250313e-16,
+          _1: v
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/equal_exception_test.js b/jscomp/test/dist/jscomp/test/equal_exception_test.js
index a444f2c21..05e2ec7c4 100644
--- a/jscomp/test/dist/jscomp/test/equal_exception_test.js
+++ b/jscomp/test/dist/jscomp/test/equal_exception_test.js
@@ -14,35 +14,35 @@ const v = "gso";
 function is_equal(param) {
   if (Caml_bytes.get(Stdlib__Bytes.make(3, /* 'a' */97), 0) !== /* 'a' */97) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/equal_exception_test.ml",
-                9,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/equal_exception_test.ml",
+            9,
+            4
+          ]
+        });
   }
   if (Stdlib__Bytes.make(3, /* 'a' */97)[0] !== /* 'a' */97) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/equal_exception_test.ml",
-                10,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/equal_exception_test.ml",
+            10,
+            4
+          ]
+        });
   }
   const u = Stdlib__Bytes.make(3, /* 'a' */97);
   u[0] = /* 'b' */98;
   if (u[0] !== /* 'b' */98) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/equal_exception_test.ml",
-                13,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/equal_exception_test.ml",
+            13,
+            4
+          ]
+        });
   }
   
 }
@@ -50,8 +50,8 @@ function is_equal(param) {
 function is_exception(param) {
   try {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -87,8 +87,8 @@ function is_arbitrary_exception(param) {
   const A = /* @__PURE__ */Caml_exceptions.create("A");
   try {
     throw new Caml_js_exceptions.MelangeError(A, {
-              MEL_EXN_ID: A
-            });
+          MEL_EXN_ID: A
+        });
   }
   catch (exn){
     return ;
@@ -139,24 +139,24 @@ if (Caml_obj.caml_equal(e, {
         MEL_EXN_ID: Not_found
       }) !== false) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/equal_exception_test.ml",
-              50,
-              3
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/equal_exception_test.ml",
+          50,
+          3
+        ]
+      });
 }
 
 if (Not_found === Stdlib.Not_found !== false) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/equal_exception_test.ml",
-              51,
-              3
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/equal_exception_test.ml",
+          51,
+          3
+        ]
+      });
 }
 
 Mt.from_suites("exception", suites);
diff --git a/jscomp/test/dist/jscomp/test/exception_raise_test.js b/jscomp/test/dist/jscomp/test/exception_raise_test.js
index 37a3ecfa6..633025742 100644
--- a/jscomp/test/dist/jscomp/test/exception_raise_test.js
+++ b/jscomp/test/dist/jscomp/test/exception_raise_test.js
@@ -106,13 +106,13 @@ catch (raw_x$3){
     a0 = x$3._1;
   } else {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/exception_raise_test.ml",
-                102,
-                9
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/exception_raise_test.ml",
+            102,
+            9
+          ]
+        });
   }
 }
 
@@ -142,20 +142,20 @@ const suites = {
       "File \"jscomp/test/exception_raise_test.ml\", line 114, characters 4-11",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: [
-                    f,
-                    ff,
-                    fff,
-                    a0
-                  ],
-                  _1: [
-                    2,
-                    2,
-                    2,
-                    2
-                  ]
-                };
+            TAG: /* Eq */0,
+            _0: [
+              f,
+              ff,
+              fff,
+              a0
+            ],
+            _1: [
+              2,
+              2,
+              2,
+              2
+            ]
+          };
         })
     ],
     tl: {
@@ -164,19 +164,19 @@ const suites = {
         (function (param) {
             if (a1.MEL_EXN_ID === Js__Js_exn.$$Error) {
               return {
-                      TAG: /* Eq */0,
-                      _0: a1._1,
-                      _1: 2
-                    };
+                TAG: /* Eq */0,
+                _0: a1._1,
+                _1: 2
+              };
             }
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "jscomp/test/exception_raise_test.ml",
-                        119,
-                        15
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "jscomp/test/exception_raise_test.ml",
+                    119,
+                    15
+                  ]
+                });
           })
       ],
       tl: /* [] */0
@@ -203,8 +203,8 @@ catch (raw_e$2){
 
 try {
   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-            MEL_EXN_ID: Stdlib.Not_found
-          });
+        MEL_EXN_ID: Stdlib.Not_found
+      });
 }
 catch (raw_e$3){
   const e$1 = Caml_js_exceptions.internalToOCamlException(raw_e$3);
diff --git a/jscomp/test/dist/jscomp/test/exception_rebound_err_test.js b/jscomp/test/dist/jscomp/test/exception_rebound_err_test.js
index c91b2bbd0..098316b5c 100644
--- a/jscomp/test/dist/jscomp/test/exception_rebound_err_test.js
+++ b/jscomp/test/dist/jscomp/test/exception_rebound_err_test.js
@@ -22,10 +22,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/exception_repr_test.js b/jscomp/test/dist/jscomp/test/exception_repr_test.js
index 5744b1712..bce01bf43 100644
--- a/jscomp/test/dist/jscomp/test/exception_repr_test.js
+++ b/jscomp/test/dist/jscomp/test/exception_repr_test.js
@@ -23,10 +23,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -44,24 +44,24 @@ Stdlib__Printexc.register_printer(function (s) {
         return "hey";
       } else if (s.MEL_EXN_ID === A) {
         return Curry._1(Stdlib__Format.asprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "A(",
-                          _1: {
-                            TAG: /* Int */4,
-                            _0: /* Int_d */0,
-                            _1: /* No_padding */0,
-                            _2: /* No_precision */0,
-                            _3: {
-                              TAG: /* Char_literal */12,
-                              _0: /* ')' */41,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "A(%d)"
-                      }), s._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "A(",
+                    _1: {
+                      TAG: /* Int */4,
+                      _0: /* Int_d */0,
+                      _1: /* No_padding */0,
+                      _2: /* No_precision */0,
+                      _3: {
+                        TAG: /* Char_literal */12,
+                        _0: /* ')' */41,
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "A(%d)"
+                }), s._1);
       } else {
         return ;
       }
diff --git a/jscomp/test/dist/jscomp/test/exception_value_test.js b/jscomp/test/dist/jscomp/test/exception_value_test.js
index 4a24a6489..cb6d45a52 100644
--- a/jscomp/test/dist/jscomp/test/exception_value_test.js
+++ b/jscomp/test/dist/jscomp/test/exception_value_test.js
@@ -9,28 +9,28 @@ const Stdlib = require("melange/stdlib.js");
 
 function f(param) {
   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-            MEL_EXN_ID: Stdlib.Not_found
-          });
+        MEL_EXN_ID: Stdlib.Not_found
+      });
 }
 
 function assert_f(x) {
   if (x <= 3) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/exception_value_test.ml",
-                9,
-                12
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/exception_value_test.ml",
+            9,
+            12
+          ]
+        });
   }
   return 3;
 }
 
 function hh(param) {
   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-            MEL_EXN_ID: Stdlib.Not_found
-          });
+        MEL_EXN_ID: Stdlib.Not_found
+      });
 }
 
 const A = /* @__PURE__ */Caml_exceptions.create("Exception_value_test.A");
diff --git a/jscomp/test/dist/jscomp/test/ext_array_test.js b/jscomp/test/dist/jscomp/test/ext_array_test.js
index 91b9ffc5c..885e7dfd9 100644
--- a/jscomp/test/dist/jscomp/test/ext_array_test.js
+++ b/jscomp/test/dist/jscomp/test/ext_array_test.js
@@ -108,26 +108,26 @@ function filter_map(f, a) {
 function range(from, to_) {
   if (from > to_) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Ext_array_test.range"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Ext_array_test.range"
+        });
   }
   return Stdlib__Array.init((to_ - from | 0) + 1 | 0, (function (i) {
-                return i + from | 0;
-              }));
+          return i + from | 0;
+        }));
 }
 
 function map2i(f, a, b) {
   const len = a.length;
   if (len !== b.length) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Ext_array_test.map2i"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Ext_array_test.map2i"
+        });
   }
   return Stdlib__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) {
@@ -140,9 +140,9 @@ function tolist_aux(a, f, _i, _res) {
     const v = a[i];
     const 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 ;
   };
@@ -201,12 +201,12 @@ function rfind_and_split(arr, cmp, v) {
     return "No_split";
   } else {
     return {
-            NAME: "Split",
-            VAL: [
-              Stdlib__Array.sub(arr, 0, i),
-              Stdlib__Array.sub(arr, i + 1 | 0, (arr.length - i | 0) - 1 | 0)
-            ]
-          };
+      NAME: "Split",
+      VAL: [
+        Stdlib__Array.sub(arr, 0, i),
+        Stdlib__Array.sub(arr, i + 1 | 0, (arr.length - i | 0) - 1 | 0)
+      ]
+    };
   }
 }
 
@@ -232,12 +232,12 @@ function find_and_split(arr, cmp, v) {
     return "No_split";
   } else {
     return {
-            NAME: "Split",
-            VAL: [
-              Stdlib__Array.sub(arr, 0, i),
-              Stdlib__Array.sub(arr, i + 1 | 0, (arr.length - i | 0) - 1 | 0)
-            ]
-          };
+      NAME: "Split",
+      VAL: [
+        Stdlib__Array.sub(arr, 0, i),
+        Stdlib__Array.sub(arr, i + 1 | 0, (arr.length - i | 0) - 1 | 0)
+      ]
+    };
   }
 }
 
diff --git a/jscomp/test/dist/jscomp/test/ext_bytes_test.js b/jscomp/test/dist/jscomp/test/ext_bytes_test.js
index e9b6132de..7651e3044 100644
--- a/jscomp/test/dist/jscomp/test/ext_bytes_test.js
+++ b/jscomp/test/dist/jscomp/test/ext_bytes_test.js
@@ -138,8 +138,8 @@ function starts_with(xs, prefix, p) {
     for (let i = 0; i < len2; ++i) {
       if (!Curry._2(p, Caml_bytes.get(xs, i), Caml_bytes.get(prefix, i))) {
         throw new Caml_js_exceptions.MelangeError(H, {
-                  MEL_EXN_ID: H
-                });
+              MEL_EXN_ID: H
+            });
       }
       
     }
@@ -190,22 +190,22 @@ eq("File \"jscomp/test/ext_bytes_test.ml\", line 115, characters 7-14", s, s2);
 
 function f$1(a, b) {
   return [
-          Caml_bytes.caml_bytes_greaterthan(a, b),
-          Caml_bytes.caml_bytes_greaterequal(a, b),
-          Caml_bytes.caml_bytes_lessthan(a, b),
-          Caml_bytes.caml_bytes_lessequal(a, b),
-          Caml_bytes.caml_bytes_equal(a, b)
-        ];
+    Caml_bytes.caml_bytes_greaterthan(a, b),
+    Caml_bytes.caml_bytes_greaterequal(a, b),
+    Caml_bytes.caml_bytes_lessthan(a, b),
+    Caml_bytes.caml_bytes_lessequal(a, b),
+    Caml_bytes.caml_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/dist/jscomp/test/ext_filename_test.js b/jscomp/test/dist/jscomp/test/ext_filename_test.js
index e71ce1151..956dce59c 100644
--- a/jscomp/test/dist/jscomp/test/ext_filename_test.js
+++ b/jscomp/test/dist/jscomp/test/ext_filename_test.js
@@ -72,30 +72,30 @@ function chop_extension(locOpt, name) {
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Stdlib.Invalid_argument) {
       return Curry._2(Stdlib__Format.ksprintf(Stdlib.invalid_arg, {
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Filename.chop_extension ( ",
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Filename.chop_extension ( ",
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: " : ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
                         _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: " : ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: " )",
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
+                          TAG: /* String_literal */11,
+                          _0: " )",
+                          _1: /* End_of_format */0
                         }
-                      },
-                      _1: "Filename.chop_extension ( %s : %s )"
-                    }), loc, name);
+                      }
+                    }
+                  }
+                },
+                _1: "Filename.chop_extension ( %s : %s )"
+              }), loc, name);
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -131,8 +131,8 @@ function relative_path(file_or_dir_1, file_or_dir_2) {
         continue ;
       }
       return Stdlib.$at(Stdlib__List.map((function (param) {
-                        return node_parent;
-                      }), dir2), dir1);
+                  return node_parent;
+                }), dir2), dir1);
     };
   };
   const ys = go(dir1, dir2);
@@ -140,9 +140,9 @@ function relative_path(file_or_dir_1, file_or_dir_2) {
     return Stdlib__String.concat(node_sep, ys);
   } else {
     return Stdlib__String.concat(node_sep, {
-                hd: node_current,
-                tl: ys
-              });
+          hd: node_current,
+          tl: ys
+        });
   }
 }
 
@@ -152,36 +152,36 @@ function node_relative_path(node_modules_shorten, file1, dep_file) {
   const 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(Stdlib__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(Stdlib__Filename.basename, file2));
   }
   const skip = function (_i) {
     while(true) {
       const i = _i;
       if (i >= len) {
         return Curry._1(Ext_pervasives_test.failwithf("File \"jscomp/test/ext_filename_test.ml\", line 162, characters 43-50", {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "invalid path: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "invalid path: %s"
-                      }), file2);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "invalid path: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "invalid path: %s"
+                }), file2);
       }
       const curr_char = file2.charCodeAt(i);
       if (!(curr_char === os_path_separator_char || curr_char === /* '.' */46)) {
@@ -203,22 +203,22 @@ function find_root_filename(_cwd, filename) {
     const cwd$p = Curry._1(Stdlib__Filename.dirname, cwd);
     if (cwd$p.length >= cwd.length) {
       return Curry._2(Ext_pervasives_test.failwithf("File \"jscomp/test/ext_filename_test.ml\", line 205, characters 13-20", {
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
-                          TAG: /* String_literal */11,
-                          _0: " not found from ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      },
-                      _1: "%s not found from %s"
-                    }), filename, cwd);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* String_literal */11,
+                    _0: " not found from ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: /* End_of_format */0
+                    }
+                  }
+                },
+                _1: "%s not found from %s"
+              }), filename, cwd);
     }
     _cwd = cwd$p;
     continue ;
@@ -268,9 +268,9 @@ function split_aux(p) {
     const dir = Curry._1(Stdlib__Filename.dirname, p$1);
     if (dir === p$1) {
       return [
-              dir,
-              acc
-            ];
+        dir,
+        acc
+      ];
     }
     const new_path = Curry._1(Stdlib__Filename.basename, p$1);
     if (new_path === Stdlib__Filename.dir_sep) {
@@ -308,8 +308,8 @@ function rel_normalized_absolute_path(from, to_) {
     const xs = xss.tl;
     if (!yss) {
       return Stdlib__List.fold_left((function (acc, param) {
-                    return Stdlib__Filename.concat(acc, Ext_string_test.parent_dir_lit);
-                  }), Ext_string_test.parent_dir_lit, xs);
+              return Stdlib__Filename.concat(acc, Ext_string_test.parent_dir_lit);
+            }), Ext_string_test.parent_dir_lit, xs);
     }
     if (xss.hd === yss.hd) {
       _yss = yss.tl;
@@ -398,9 +398,9 @@ if (Stdlib__Sys.unix) {
 } else {
   const s = "Unknown OS : " + Stdlib__Sys.os_type;
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: s
-          });
+        MEL_EXN_ID: "Failure",
+        _1: s
+      });
 }
 
 const $slash$slash = Stdlib__Filename.concat;
diff --git a/jscomp/test/dist/jscomp/test/ext_list_test.js b/jscomp/test/dist/jscomp/test/ext_list_test.js
index 9cbb23673..93edbb58e 100644
--- a/jscomp/test/dist/jscomp/test/ext_list_test.js
+++ b/jscomp/test/dist/jscomp/test/ext_list_test.js
@@ -19,9 +19,9 @@ function filter_map(f, _xs) {
     const 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 ;
@@ -57,14 +57,14 @@ function excludes(p, l) {
   const v = aux(/* [] */0, l);
   if (excluded.contents) {
     return [
-            true,
-            v
-          ];
+      true,
+      v
+    ];
   } else {
     return [
-            false,
-            l
-          ];
+      false,
+      l
+    ];
   }
 }
 
@@ -96,9 +96,9 @@ function exclude_with_fact(p, l) {
   };
   const 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) {
@@ -137,10 +137,10 @@ function exclude_with_fact2(p1, p2, l) {
   };
   const 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) {
@@ -175,9 +175,9 @@ function filter_mapi(f, xs) {
       const 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;
@@ -198,26 +198,26 @@ function filter_map2(f, _xs, _ys) {
         const 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Ext_list_test.filter_map2"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Ext_list_test.filter_map2"
+          });
     }
     if (!ys) {
       return /* [] */0;
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Ext_list_test.filter_map2"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Ext_list_test.filter_map2"
+        });
   };
 }
 
@@ -234,9 +234,9 @@ function filter_map2i(f, xs, ys) {
           const 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,17 +244,17 @@ function filter_map2i(f, xs, ys) {
           continue ;
         }
         throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                  MEL_EXN_ID: "Invalid_argument",
-                  _1: "Ext_list_test.filter_map2i"
-                });
+              MEL_EXN_ID: "Invalid_argument",
+              _1: "Ext_list_test.filter_map2i"
+            });
       }
       if (!ys) {
         return /* [] */0;
       }
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Ext_list_test.filter_map2i"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Ext_list_test.filter_map2i"
+          });
     };
   };
   return aux(0, xs, ys);
@@ -292,15 +292,15 @@ function flat_map2(f, lx, ly) {
         continue ;
       }
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Ext_list_test.flat_map2"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Ext_list_test.flat_map2"
+          });
     }
     if (ly$1) {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Ext_list_test.flat_map2"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Ext_list_test.flat_map2"
+          });
     }
     return Stdlib__List.rev(acc);
   };
@@ -335,37 +335,37 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                  MEL_EXN_ID: "Invalid_argument",
-                  _1: "List.map2_last"
-                });
+              MEL_EXN_ID: "Invalid_argument",
+              _1: "List.map2_last"
+            });
       }
     }
     if (l2) {
       const 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "List.map2_last"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "List.map2_last"
+        });
   }
   if (!l2) {
     return /* [] */0;
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "List.map2_last"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "List.map2_last"
+      });
 }
 
 function map_last(f, l1) {
@@ -375,15 +375,15 @@ function map_last(f, l1) {
   const u = l1.hd;
   if (!l1.tl) {
     return {
-            hd: Curry._2(f, true, u),
-            tl: /* [] */0
-          };
+      hd: Curry._2(f, true, u),
+      tl: /* [] */0
+    };
   }
   const r = Curry._2(f, false, u);
   return {
-          hd: r,
-          tl: map_last(f, l1.tl)
-        };
+    hd: r,
+    tl: map_last(f, l1.tl)
+  };
 }
 
 function fold_right2_last(f, l1, l2, accu) {
@@ -398,24 +398,24 @@ function fold_right2_last(f, l1, l2, accu) {
         
       } else {
         throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                  MEL_EXN_ID: "Invalid_argument",
-                  _1: "List.fold_right2"
-                });
+              MEL_EXN_ID: "Invalid_argument",
+              _1: "List.fold_right2"
+            });
       }
     }
     if (l2) {
       return Curry._4(f, false, last1, l2.hd, fold_right2_last(f, l1$1, l2.tl, accu));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "List.fold_right2"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "List.fold_right2"
+        });
   }
   if (l2) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "List.fold_right2"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "List.fold_right2"
+        });
   }
   return accu;
 }
@@ -429,14 +429,14 @@ function take(n, l) {
   const arr_length = arr.length;
   if (arr_length < n) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Ext_list_test.take"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Ext_list_test.take"
+        });
   }
   return [
-          Stdlib__Array.to_list(Stdlib__Array.sub(arr, 0, n)),
-          Stdlib__Array.to_list(Stdlib__Array.sub(arr, n, arr_length - n | 0))
-        ];
+    Stdlib__Array.to_list(Stdlib__Array.sub(arr, 0, n)),
+    Stdlib__Array.to_list(Stdlib__Array.sub(arr, n, arr_length - n | 0))
+  ];
 }
 
 function try_take(n, l) {
@@ -444,16 +444,16 @@ function try_take(n, l) {
   const arr_length = arr.length;
   if (arr_length <= n) {
     return [
-            l,
-            arr_length,
-            /* [] */0
-          ];
+      l,
+      arr_length,
+      /* [] */0
+    ];
   } else {
     return [
-            Stdlib__Array.to_list(Stdlib__Array.sub(arr, 0, n)),
-            n,
-            Stdlib__Array.to_list(Stdlib__Array.sub(arr, n, arr_length - n | 0))
-          ];
+      Stdlib__Array.to_list(Stdlib__Array.sub(arr, 0, n)),
+      n,
+      Stdlib__Array.to_list(Stdlib__Array.sub(arr, n, arr_length - n | 0))
+    ];
   }
 }
 
@@ -503,9 +503,9 @@ function exclude_tail(x) {
       const x$2 = x$1.hd;
       if (!x$1.tl) {
         return [
-                x$2,
-                Stdlib__List.rev(acc)
-              ];
+          x$2,
+          Stdlib__List.rev(acc)
+        ];
       }
       _x = x$1.tl;
       _acc = {
@@ -515,9 +515,9 @@ function exclude_tail(x) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Ext_list_test.exclude_tail"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Ext_list_test.exclude_tail"
+        });
   };
 }
 
@@ -532,28 +532,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
+    };
   }
   const ys = xss.tl;
   const y = xss.hd;
   if (Curry._2(cmp, x, Stdlib__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)
+    };
   }
 }
 
@@ -567,18 +567,18 @@ function drop(_n, _h) {
     const n = _n;
     if (n < 0) {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Ext_list_test.drop"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Ext_list_test.drop"
+          });
     }
     if (n === 0) {
       return h;
     }
     if (Caml_obj.caml_equal(h, /* [] */0)) {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Ext_list_test.drop"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Ext_list_test.drop"
+          });
     }
     _h = Stdlib__List.tl(h);
     _n = n - 1 | 0;
@@ -618,8 +618,8 @@ function for_all_opt(p, _param) {
 
 function fold(f, l, init) {
   return Stdlib__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) {
@@ -643,9 +643,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;
   }
@@ -722,9 +722,9 @@ function split_map(f, xs) {
     const bs = _bs;
     if (!xs$1) {
       return [
-              Stdlib__List.rev(bs),
-              Stdlib__List.rev(cs)
-            ];
+        Stdlib__List.rev(bs),
+        Stdlib__List.rev(cs)
+      ];
     }
     const match = Curry._1(f, xs$1.hd);
     _xs = xs$1.tl;
@@ -744,13 +744,13 @@ function reduce_from_right(fn, lst) {
   const match = Stdlib__List.rev(lst);
   if (match) {
     return Stdlib__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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.reduce"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Ext_list_test.reduce"
+      });
 }
 
 function reduce_from_left(fn, lst) {
@@ -758,15 +758,15 @@ function reduce_from_left(fn, lst) {
     return Stdlib__List.fold_left(fn, lst.hd, lst.tl);
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.reduce_from_left"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Ext_list_test.reduce_from_left"
+      });
 }
 
 function create_ref_empty(param) {
   return {
-          contents: /* [] */0
-        };
+    contents: /* [] */0
+  };
 }
 
 function ref_top(x) {
@@ -775,9 +775,9 @@ function ref_top(x) {
     return match.hd;
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.ref_top"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Ext_list_test.ref_top"
+      });
 }
 
 function ref_empty(x) {
@@ -803,9 +803,9 @@ function ref_pop(refs) {
     return match.hd;
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.ref_pop"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Ext_list_test.ref_pop"
+      });
 }
 
 function rev_except_last(xs) {
@@ -818,9 +818,9 @@ function rev_except_last(xs) {
       const x = xs$1.hd;
       if (!xs$1.tl) {
         return [
-                acc,
-                x
-              ];
+          acc,
+          x
+        ];
       }
       _xs = xs$1.tl;
       _acc = {
@@ -830,9 +830,9 @@ function rev_except_last(xs) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Ext_list_test.rev_except_last"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Ext_list_test.rev_except_last"
+        });
   };
 }
 
@@ -853,9 +853,9 @@ function last(_xs) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Ext_list_test.last"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Ext_list_test.last"
+        });
   };
 }
 
@@ -874,13 +874,13 @@ function assoc_by_string(def, k, _lst) {
       return Caml_option.valFromOption(def);
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ext_list_test.ml",
-                399,
-                14
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ext_list_test.ml",
+            399,
+            14
+          ]
+        });
   };
 }
 
@@ -899,13 +899,13 @@ function assoc_by_int(def, k, _lst) {
       return Caml_option.valFromOption(def);
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ext_list_test.ml",
-                409,
-                14
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ext_list_test.ml",
+            409,
+            14
+          ]
+        });
   };
 }
 
diff --git a/jscomp/test/dist/jscomp/test/ext_log_test.js b/jscomp/test/dist/jscomp/test/ext_log_test.js
index 0572b1ddb..8f6c7a9f0 100644
--- a/jscomp/test/dist/jscomp/test/ext_log_test.js
+++ b/jscomp/test/dist/jscomp/test/ext_log_test.js
@@ -7,174 +7,174 @@ const Stdlib__Format = require("melange/format.js");
 
 function $caret$caret(param, param$1) {
   return {
-          TAG: /* Format */0,
-          _0: CamlinternalFormatBasics.concat_fmt(param._0, param$1._0),
-          _1: param._1 + ("%," + param$1._1)
-        };
+    TAG: /* Format */0,
+    _0: CamlinternalFormatBasics.concat_fmt(param._0, param$1._0),
+    _1: param._1 + ("%," + param$1._1)
+  };
 }
 
 function err(str, f) {
   return Curry._1(Stdlib__Format.fprintf(Stdlib__Format.err_formatter)($caret$caret({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
-                          TAG: /* Char_literal */12,
-                          _0: /* ' ' */32,
-                          _1: /* End_of_format */0
-                        }
-                      },
-                      _1: "%s "
-                    }, $caret$caret(f, {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Formatting_lit */17,
-                            _0: /* Flush_newline */4,
-                            _1: /* End_of_format */0
-                          },
-                          _1: "@."
-                        }))), str);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* Char_literal */12,
+                    _0: /* ' ' */32,
+                    _1: /* End_of_format */0
+                  }
+                },
+                _1: "%s "
+              }, $caret$caret(f, {
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_lit */17,
+                      _0: /* Flush_newline */4,
+                      _1: /* End_of_format */0
+                    },
+                    _1: "@."
+                  }))), str);
 }
 
 function ierr(b, str, f) {
   if (b) {
     return Curry._1(Stdlib__Format.fprintf(Stdlib__Format.err_formatter)($caret$caret({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ' ' */32,
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "%s "
-                      }, f)), str);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "%s "
+                }, f)), str);
   } else {
     return Stdlib__Format.ifprintf(Stdlib__Format.err_formatter, $caret$caret({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
-                          TAG: /* Char_literal */12,
-                          _0: /* ' ' */32,
-                          _1: /* End_of_format */0
-                        }
-                      },
-                      _1: "%s "
-                    }, f))(str);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* Char_literal */12,
+                    _0: /* ' ' */32,
+                    _1: /* End_of_format */0
+                  }
+                },
+                _1: "%s "
+              }, f))(str);
   }
 }
 
 function warn(str, f) {
   return Curry._1(Stdlib__Format.fprintf(Stdlib__Format.err_formatter)($caret$caret({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "WARN: ",
-                        _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ' ' */32,
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      },
-                      _1: "WARN: %s "
-                    }, $caret$caret(f, {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Formatting_lit */17,
-                            _0: /* Flush_newline */4,
-                            _1: /* End_of_format */0
-                          },
-                          _1: "@."
-                        }))), str);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "WARN: ",
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
+                      _1: /* End_of_format */0
+                    }
+                  }
+                },
+                _1: "WARN: %s "
+              }, $caret$caret(f, {
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_lit */17,
+                      _0: /* Flush_newline */4,
+                      _1: /* End_of_format */0
+                    },
+                    _1: "@."
+                  }))), str);
 }
 
 function iwarn(b, str, f) {
   if (b) {
     return Curry._1(Stdlib__Format.fprintf(Stdlib__Format.err_formatter)($caret$caret({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "WARN: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* Char_literal */12,
-                              _0: /* ' ' */32,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "WARN: %s "
-                      }, f)), str);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "WARN: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* Char_literal */12,
+                        _0: /* ' ' */32,
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "WARN: %s "
+                }, f)), str);
   } else {
     return Stdlib__Format.ifprintf(Stdlib__Format.err_formatter, $caret$caret({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "WARN: ",
-                        _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ' ' */32,
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      },
-                      _1: "WARN: %s "
-                    }, f))(str);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "WARN: ",
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
+                      _1: /* End_of_format */0
+                    }
+                  }
+                },
+                _1: "WARN: %s "
+              }, f))(str);
   }
 }
 
 function info(str, f) {
   return Curry._1(Stdlib__Format.fprintf(Stdlib__Format.err_formatter)($caret$caret({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "INFO: ",
-                        _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ' ' */32,
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      },
-                      _1: "INFO: %s "
-                    }, f)), str);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "INFO: ",
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
+                      _1: /* End_of_format */0
+                    }
+                  }
+                },
+                _1: "INFO: %s "
+              }, f)), str);
 }
 
 function iinfo(b, str, f) {
   return Curry._1(Stdlib__Format.fprintf(Stdlib__Format.err_formatter)($caret$caret({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "INFO: ",
-                        _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ' ' */32,
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      },
-                      _1: "INFO: %s "
-                    }, f)), str);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "INFO: ",
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
+                      _1: /* End_of_format */0
+                    }
+                  }
+                },
+                _1: "INFO: %s "
+              }, f)), str);
 }
 
 exports.$caret$caret = $caret$caret;
diff --git a/jscomp/test/dist/jscomp/test/ext_pervasives_test.js b/jscomp/test/dist/jscomp/test/ext_pervasives_test.js
index bd60a6de6..afae8848f 100644
--- a/jscomp/test/dist/jscomp/test/ext_pervasives_test.js
+++ b/jscomp/test/dist/jscomp/test/ext_pervasives_test.js
@@ -28,11 +28,11 @@ function with_file_as_chan(filename, f) {
 
 function with_file_as_pp(filename, f) {
   return $$finally(Stdlib.open_out_bin(filename), Stdlib.close_out, (function (chan) {
-                const fmt = Stdlib__Format.formatter_of_out_channel(chan);
-                const v = Curry._1(f, fmt);
-                Stdlib__Format.pp_print_flush(fmt, undefined);
-                return v;
-              }));
+          const fmt = Stdlib__Format.formatter_of_out_channel(chan);
+          const v = Curry._1(f, fmt);
+          Stdlib__Format.pp_print_flush(fmt, undefined);
+          return v;
+        }));
 }
 
 function is_pos_pow(n) {
@@ -55,8 +55,8 @@ function is_pos_pow(n) {
         continue ;
       }
       throw new Caml_js_exceptions.MelangeError(E, {
-                MEL_EXN_ID: E
-              });
+            MEL_EXN_ID: E
+          });
     };
   }
   catch (raw_exn){
@@ -70,12 +70,12 @@ function is_pos_pow(n) {
 
 function failwithf(loc, fmt) {
   return Stdlib__Format.ksprintf((function (s) {
-                const s$1 = loc + s;
-                throw new Caml_js_exceptions.MelangeError("Failure", {
-                          MEL_EXN_ID: "Failure",
-                          _1: s$1
-                        });
-              }), fmt);
+          const s$1 = loc + s;
+          throw new Caml_js_exceptions.MelangeError("Failure", {
+                MEL_EXN_ID: "Failure",
+                _1: s$1
+              });
+        }), fmt);
 }
 
 function invalid_argf(fmt) {
@@ -84,11 +84,11 @@ function invalid_argf(fmt) {
 
 function bad_argf(fmt) {
   return Stdlib__Format.ksprintf((function (x) {
-                throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                          MEL_EXN_ID: Stdlib__Arg.Bad,
-                          _1: x
-                        });
-              }), fmt);
+          throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
+                MEL_EXN_ID: Stdlib__Arg.Bad,
+                _1: x
+              });
+        }), fmt);
 }
 
 function hash_variant(s) {
diff --git a/jscomp/test/dist/jscomp/test/ext_string_test.js b/jscomp/test/dist/jscomp/test/ext_string_test.js
index 0a71dc939..ee30a8ee5 100644
--- a/jscomp/test/dist/jscomp/test/ext_string_test.js
+++ b/jscomp/test/dist/jscomp/test/ext_string_test.js
@@ -26,9 +26,9 @@ function split_by(keep_emptyOpt, is_delim, str) {
         return acc;
       } else {
         return {
-                hd: Stdlib__String.sub(str, 0, last_pos),
-                tl: acc
-              };
+          hd: Stdlib__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 Stdlib__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,9 +219,9 @@ function for_all_range(s, start, finish, p) {
   const len = s.length;
   if (start < 0 || finish >= len) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Ext_string_test.for_all_range"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Ext_string_test.for_all_range"
+        });
   }
   return unsafe_for_all_range(s, start, finish, p);
 }
@@ -273,8 +273,8 @@ function find(startOpt, sub, s) {
     while((i + n | 0) <= s_len) {
       if (unsafe_is_sub(sub, 0, s, i, n)) {
         throw new Caml_js_exceptions.MelangeError(Local_exit, {
-                  MEL_EXN_ID: Local_exit
-                });
+              MEL_EXN_ID: Local_exit
+            });
       }
       i = i + 1 | 0;
     };
@@ -297,9 +297,9 @@ function non_overlap_count(sub, s) {
   const sub_len = sub.length;
   if (sub.length === 0) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Ext_string_test.non_overlap_count"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Ext_string_test.non_overlap_count"
+        });
   }
   let _acc = 0;
   let _off = 0;
@@ -323,8 +323,8 @@ function rfind(sub, s) {
     while(i >= 0) {
       if (unsafe_is_sub(sub, 0, s, i, n)) {
         throw new Caml_js_exceptions.MelangeError(Local_exit, {
-                  MEL_EXN_ID: Local_exit
-                });
+              MEL_EXN_ID: Local_exit
+            });
       }
       i = i - 1 | 0;
     };
@@ -346,9 +346,9 @@ function tail_from(s, x) {
   }
   const s$1 = "Ext_string_test.tail_from " + (s + (" : " + String(x)));
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: s$1
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: s$1
+      });
 }
 
 function digits_of_str(s, offset, x) {
@@ -461,18 +461,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) {
@@ -493,18 +493,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) {
@@ -564,9 +564,9 @@ function no_char(x, ch, i, len) {
   const str_len = x.length;
   if (i < 0 || i >= str_len || len >= str_len) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Ext_string_test.no_char"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Ext_string_test.no_char"
+        });
   }
   return unsafe_no_char(x, ch, i, len);
 }
@@ -585,12 +585,12 @@ function replace_slash_backward(x) {
     return x;
   } else {
     return Stdlib__String.map((function (x) {
-                  if (x !== 47) {
-                    return x;
-                  } else {
-                    return /* '\\' */92;
-                  }
-                }), x);
+            if (x !== 47) {
+              return x;
+            } else {
+              return /* '\\' */92;
+            }
+          }), x);
   }
 }
 
@@ -600,12 +600,12 @@ function replace_backward_slash(x) {
     return x;
   } else {
     return Stdlib__String.map((function (x) {
-                  if (x !== 92) {
-                    return x;
-                  } else {
-                    return /* '/' */47;
-                  }
-                }), x);
+            if (x !== 92) {
+              return x;
+            } else {
+              return /* '/' */47;
+            }
+          }), x);
   }
 }
 
@@ -694,11 +694,11 @@ function inter3(a, b, c) {
 
 function inter4(a, b, c, d) {
   return concat_array(single_space, [
-              a,
-              b,
-              c,
-              d
-            ]);
+        a,
+        b,
+        c,
+        d
+      ]);
 }
 
 const check_suffix_case = ends_with;
diff --git a/jscomp/test/dist/jscomp/test/extensible_variant_test.js b/jscomp/test/dist/jscomp/test/extensible_variant_test.js
index 2881ee2b1..dd436b128 100644
--- a/jscomp/test/dist/jscomp/test/extensible_variant_test.js
+++ b/jscomp/test/dist/jscomp/test/extensible_variant_test.js
@@ -26,27 +26,27 @@ function to_int(x) {
     return x._2;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/extensible_variant_test.ml",
-              16,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/extensible_variant_test.ml",
+          16,
+          9
+        ]
+      });
 }
 
 const suites_0 = [
   "test_int",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: 3,
-              _1: to_int({
-                    MEL_EXN_ID: Int,
-                    _1: 3,
-                    _2: 0
-                  })
-            };
+        TAG: /* Eq */0,
+        _0: 3,
+        _1: to_int({
+              MEL_EXN_ID: Int,
+              _1: 3,
+              _2: 0
+            })
+      };
     })
 ];
 
@@ -55,14 +55,14 @@ const suites_1 = {
     "test_int2",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: 0,
-                _1: to_int({
-                      MEL_EXN_ID: Int$1,
-                      _1: 3,
-                      _2: 0
-                    })
-              };
+          TAG: /* Eq */0,
+          _0: 0,
+          _1: to_int({
+                MEL_EXN_ID: Int$1,
+                _1: 3,
+                _2: 0
+              })
+        };
       })
   ],
   tl: {
@@ -70,13 +70,13 @@ const suites_1 = {
       "test_string",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: -1,
-                  _1: to_int({
-                        MEL_EXN_ID: Str,
-                        _1: "x"
-                      })
-                };
+            TAG: /* Eq */0,
+            _0: -1,
+            _1: to_int({
+                  MEL_EXN_ID: Str,
+                  _1: "x"
+                })
+          };
         })
     ],
     tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/ffi_arity_test.js b/jscomp/test/dist/jscomp/test/ffi_arity_test.js
index 7de514bf3..d0b23611d 100644
--- a/jscomp/test/dist/jscomp/test/ffi_arity_test.js
+++ b/jscomp/test/dist/jscomp/test/ffi_arity_test.js
@@ -73,14 +73,14 @@ Mt.from_pair_suites("Ffi_arity_test", {
         "File \"jscomp/test/ffi_arity_test.ml\", line 45, characters 4-11",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: v,
-                    _1: [
-                      0,
-                      1,
-                      4
-                    ]
-                  };
+              TAG: /* Eq */0,
+              _0: v,
+              _1: [
+                0,
+                1,
+                4
+              ]
+            };
           })
       ],
       tl: {
@@ -88,14 +88,14 @@ Mt.from_pair_suites("Ffi_arity_test", {
           "File \"jscomp/test/ffi_arity_test.ml\", line 46, characters 4-11",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: vv,
-                      _1: [
-                        1,
-                        3,
-                        5
-                      ]
-                    };
+                TAG: /* Eq */0,
+                _0: vv,
+                _1: [
+                  1,
+                  3,
+                  5
+                ]
+              };
             })
         ],
         tl: {
@@ -103,14 +103,14 @@ Mt.from_pair_suites("Ffi_arity_test", {
             "File \"jscomp/test/ffi_arity_test.ml\", line 47, characters 4-11",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: hh,
-                        _1: [
-                          1,
-                          2,
-                          3
-                        ]
-                      };
+                  TAG: /* Eq */0,
+                  _0: hh,
+                  _1: [
+                    1,
+                    2,
+                    3
+                  ]
+                };
               })
           ],
           tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/ffi_array_test.js b/jscomp/test/dist/jscomp/test/ffi_array_test.js
index 2dcd7a394..2e38398ea 100644
--- a/jscomp/test/dist/jscomp/test/ffi_array_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/ffi_js_test.js b/jscomp/test/dist/jscomp/test/ffi_js_test.js
index cd8ae507c..d68cce5a2 100644
--- a/jscomp/test/dist/jscomp/test/ffi_js_test.js
+++ b/jscomp/test/dist/jscomp/test/ffi_js_test.js
@@ -30,10 +30,10 @@ function eq(loc, param) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -140,10 +140,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/dist/jscomp/test/ffi_splice_test.js b/jscomp/test/dist/jscomp/test/ffi_splice_test.js
index 2d7276e01..99d0e2ea4 100644
--- a/jscomp/test/dist/jscomp/test/ffi_splice_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/flexible_array_test.js b/jscomp/test/dist/jscomp/test/flexible_array_test.js
index ce2df2845..a8b90c9af 100644
--- a/jscomp/test/dist/jscomp/test/flexible_array_test.js
+++ b/jscomp/test/dist/jscomp/test/flexible_array_test.js
@@ -15,8 +15,8 @@ function sub(_tr, _k) {
     const tr = _tr;
     if (/* tag */typeof tr === "number" || typeof tr === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     if (k === 1) {
       return tr._0;
@@ -36,49 +36,49 @@ function update(tr, k, w) {
   if (/* tag */typeof tr === "number" || typeof tr === "string") {
     if (k === 1) {
       return {
-              TAG: /* Br */0,
-              _0: w,
-              _1: /* Lf */0,
-              _2: /* Lf */0
-            };
+        TAG: /* Br */0,
+        _0: w,
+        _1: /* Lf */0,
+        _2: /* Lf */0
+      };
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   }
   const r = tr._2;
   const l = tr._1;
   if (k === 1) {
     return {
-            TAG: /* Br */0,
-            _0: w,
-            _1: l,
-            _2: r
-          };
+      TAG: /* Br */0,
+      _0: w,
+      _1: l,
+      _2: r
+    };
   }
   const v = tr._0;
   if (k % 2 === 0) {
     return {
-            TAG: /* Br */0,
-            _0: v,
-            _1: update(l, k / 2 | 0, w),
-            _2: r
-          };
+      TAG: /* Br */0,
+      _0: v,
+      _1: update(l, k / 2 | 0, w),
+      _2: r
+    };
   } else {
     return {
-            TAG: /* Br */0,
-            _0: v,
-            _1: l,
-            _2: update(r, k / 2 | 0, w)
-          };
+      TAG: /* Br */0,
+      _0: v,
+      _1: l,
+      _2: update(r, k / 2 | 0, w)
+    };
   }
 }
 
 function $$delete(tr, n) {
   if (/* tag */typeof tr === "number" || typeof tr === "string") {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   }
   if (n === 1) {
     return /* Lf */0;
@@ -88,66 +88,66 @@ function $$delete(tr, n) {
   const v = tr._0;
   if (n % 2 === 0) {
     return {
-            TAG: /* Br */0,
-            _0: v,
-            _1: $$delete(l, n / 2 | 0),
-            _2: r
-          };
+      TAG: /* Br */0,
+      _0: v,
+      _1: $$delete(l, n / 2 | 0),
+      _2: r
+    };
   } else {
     return {
-            TAG: /* Br */0,
-            _0: v,
-            _1: l,
-            _2: $$delete(r, n / 2 | 0)
-          };
+      TAG: /* Br */0,
+      _0: v,
+      _1: l,
+      _2: $$delete(r, n / 2 | 0)
+    };
   }
 }
 
 function loext(tr, w) {
   if (/* tag */typeof tr === "number" || typeof tr === "string") {
     return {
-            TAG: /* Br */0,
-            _0: w,
-            _1: /* Lf */0,
-            _2: /* Lf */0
-          };
+      TAG: /* Br */0,
+      _0: w,
+      _1: /* Lf */0,
+      _2: /* Lf */0
+    };
   } else {
     return {
-            TAG: /* Br */0,
-            _0: w,
-            _1: loext(tr._2, tr._0),
-            _2: tr._1
-          };
+      TAG: /* Br */0,
+      _0: w,
+      _1: loext(tr._2, tr._0),
+      _2: tr._1
+    };
   }
 }
 
 function lorem(tr) {
   if (/* tag */typeof tr === "number" || typeof tr === "string") {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   }
   const l = tr._1;
   if (!/* tag */(typeof l === "number" || typeof l === "string")) {
     return {
-            TAG: /* Br */0,
-            _0: l._0,
-            _1: tr._2,
-            _2: lorem(l)
-          };
+      TAG: /* Br */0,
+      _0: l._0,
+      _1: tr._2,
+      _2: lorem(l)
+    };
   }
   let tmp = tr._2;
   if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
     return /* Lf */0;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/flexible_array_test.ml",
-              66,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/flexible_array_test.ml",
+          66,
+          9
+        ]
+      });
 }
 
 const empty = [
@@ -164,66 +164,66 @@ function get(param, i) {
     return sub(param[0], i + 1 | 0);
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Array.get"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Array.get"
+      });
 }
 
 function set(param, i, v) {
   const 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Array.set"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Array.set"
+      });
 }
 
 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) {
   const k = param[1];
   if (k > 0) {
     return [
-            lorem(param[0]),
-            k - 1 | 0
-          ];
+      lorem(param[0]),
+      k - 1 | 0
+    ];
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Array.pop_front"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Array.pop_front"
+      });
 }
 
 function push_back(param, v) {
   const 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) {
   const k = param[1];
   if (k > 0) {
     return [
-            $$delete(param[0], k),
-            k - 1 | 0
-          ];
+      $$delete(param[0], k),
+      k - 1 | 0
+    ];
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Array.pop_back"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Array.pop_back"
+      });
 }
 
 function pp(fmt, s) {
@@ -330,13 +330,13 @@ if (!Caml_obj.caml_equal(x, of_array([
             6
           ]))) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/flexible_array_test.ml",
-              166,
-              4
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/flexible_array_test.ml",
+          166,
+          4
+        ]
+      });
 }
 
 const v = Stdlib__Array.init(500, (function (i) {
diff --git a/jscomp/test/dist/jscomp/test/float_array.js b/jscomp/test/dist/jscomp/test/float_array.js
index cc2f6fc6a..d70dc56ca 100644
--- a/jscomp/test/dist/jscomp/test/float_array.js
+++ b/jscomp/test/dist/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/dist/jscomp/test/float_of_bits_test.js b/jscomp/test/dist/jscomp/test/float_of_bits_test.js
index d9f075ccd..bafa82707 100644
--- a/jscomp/test/dist/jscomp/test/float_of_bits_test.js
+++ b/jscomp/test/dist/jscomp/test/float_of_bits_test.js
@@ -28,62 +28,62 @@ const int32_pairs = [
 
 function from_pairs(pair) {
   return Stdlib__List.concat(Stdlib__Array.to_list(Stdlib__Array.mapi((function (i, param) {
-                        const f = param[1];
-                        const i32 = param[0];
-                        return {
-                                hd: [
-                                  Curry._1(Stdlib__Printf.sprintf({
-                                            TAG: /* Format */0,
-                                            _0: {
-                                              TAG: /* String_literal */11,
-                                              _0: "int32_float_of_bits ",
-                                              _1: {
-                                                TAG: /* Int */4,
-                                                _0: /* Int_d */0,
-                                                _1: /* No_padding */0,
-                                                _2: /* No_precision */0,
-                                                _3: /* End_of_format */0
-                                              }
-                                            },
-                                            _1: "int32_float_of_bits %d"
-                                          }), i),
-                                  (function (param) {
-                                      return {
-                                              TAG: /* Eq */0,
-                                              _0: Caml_float.caml_int32_float_of_bits(i32),
-                                              _1: f
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    Curry._1(Stdlib__Printf.sprintf({
-                                              TAG: /* Format */0,
-                                              _0: {
-                                                TAG: /* String_literal */11,
-                                                _0: "int32_bits_of_float ",
-                                                _1: {
-                                                  TAG: /* Int */4,
-                                                  _0: /* Int_d */0,
-                                                  _1: /* No_padding */0,
-                                                  _2: /* No_precision */0,
-                                                  _3: /* End_of_format */0
-                                                }
-                                              },
-                                              _1: "int32_bits_of_float %d"
-                                            }), i),
-                                    (function (param) {
-                                        return {
-                                                TAG: /* Eq */0,
-                                                _0: Caml_float.caml_int32_bits_of_float(f),
-                                                _1: i32
-                                              };
-                                      })
-                                  ],
-                                  tl: /* [] */0
-                                }
-                              };
-                      }), int32_pairs)));
+                  const f = param[1];
+                  const i32 = param[0];
+                  return {
+                    hd: [
+                      Curry._1(Stdlib__Printf.sprintf({
+                                TAG: /* Format */0,
+                                _0: {
+                                  TAG: /* String_literal */11,
+                                  _0: "int32_float_of_bits ",
+                                  _1: {
+                                    TAG: /* Int */4,
+                                    _0: /* Int_d */0,
+                                    _1: /* No_padding */0,
+                                    _2: /* No_precision */0,
+                                    _3: /* End_of_format */0
+                                  }
+                                },
+                                _1: "int32_float_of_bits %d"
+                              }), i),
+                      (function (param) {
+                          return {
+                            TAG: /* Eq */0,
+                            _0: Caml_float.caml_int32_float_of_bits(i32),
+                            _1: f
+                          };
+                        })
+                    ],
+                    tl: {
+                      hd: [
+                        Curry._1(Stdlib__Printf.sprintf({
+                                  TAG: /* Format */0,
+                                  _0: {
+                                    TAG: /* String_literal */11,
+                                    _0: "int32_bits_of_float ",
+                                    _1: {
+                                      TAG: /* Int */4,
+                                      _0: /* Int_d */0,
+                                      _1: /* No_padding */0,
+                                      _2: /* No_precision */0,
+                                      _3: /* End_of_format */0
+                                    }
+                                  },
+                                  _1: "int32_bits_of_float %d"
+                                }), i),
+                        (function (param) {
+                            return {
+                              TAG: /* Eq */0,
+                              _0: Caml_float.caml_int32_bits_of_float(f),
+                              _1: i32
+                            };
+                          })
+                      ],
+                      tl: /* [] */0
+                    }
+                  };
+                }), int32_pairs)));
 }
 
 const suites = Stdlib.$at({
@@ -91,10 +91,10 @@ const suites = Stdlib.$at({
         "one",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: Caml_int64.bits_of_float(1.0),
-                    _1: one_float
-                  };
+              TAG: /* Eq */0,
+              _0: Caml_int64.bits_of_float(1.0),
+              _1: one_float
+            };
           })
       ],
       tl: {
@@ -102,10 +102,10 @@ const suites = Stdlib.$at({
           "two",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: Caml_int64.float_of_bits(one_float),
-                      _1: 1.0
-                    };
+                TAG: /* Eq */0,
+                _0: Caml_int64.float_of_bits(one_float),
+                _1: 1.0
+              };
             })
         ],
         tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/float_test.js b/jscomp/test/dist/jscomp/test/float_test.js
index 58927aaf6..99d9513bb 100644
--- a/jscomp/test/dist/jscomp/test/float_test.js
+++ b/jscomp/test/dist/jscomp/test/float_test.js
@@ -126,33 +126,33 @@ const results = Stdlib__Array.append([
 
 function from_pairs(ps) {
   return Stdlib__Array.to_list(Stdlib__Array.mapi((function (i, param) {
-                    const b = param[1];
-                    const a = param[0];
-                    return [
-                            Curry._1(Stdlib__Printf.sprintf({
-                                      TAG: /* Format */0,
-                                      _0: {
-                                        TAG: /* String_literal */11,
-                                        _0: "pair ",
-                                        _1: {
-                                          TAG: /* Int */4,
-                                          _0: /* Int_d */0,
-                                          _1: /* No_padding */0,
-                                          _2: /* No_precision */0,
-                                          _3: /* End_of_format */0
-                                        }
-                                      },
-                                      _1: "pair %d"
-                                    }), i),
-                            (function (param) {
-                                return {
-                                        TAG: /* Approx */5,
-                                        _0: a,
-                                        _1: b
-                                      };
-                              })
-                          ];
-                  }), ps));
+              const b = param[1];
+              const a = param[0];
+              return [
+                Curry._1(Stdlib__Printf.sprintf({
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* String_literal */11,
+                            _0: "pair ",
+                            _1: {
+                              TAG: /* Int */4,
+                              _0: /* Int_d */0,
+                              _1: /* No_padding */0,
+                              _2: /* No_precision */0,
+                              _3: /* End_of_format */0
+                            }
+                          },
+                          _1: "pair %d"
+                        }), i),
+                (function (param) {
+                    return {
+                      TAG: /* Approx */5,
+                      _0: a,
+                      _1: b
+                    };
+                  })
+              ];
+            }), ps));
 }
 
 const float_compare = Caml.caml_float_compare;
@@ -352,10 +352,10 @@ Mt.from_pair_suites("Float_test", Stdlib.$at({
             "mod_float",
             (function (param) {
                 return {
-                        TAG: /* Approx */5,
-                        _0: 3.2 % 0.5,
-                        _1: 0.200000000000000178
-                      };
+                  TAG: /* Approx */5,
+                  _0: 3.2 % 0.5,
+                  _1: 0.200000000000000178
+                };
               })
           ],
           tl: {
@@ -363,10 +363,10 @@ Mt.from_pair_suites("Float_test", Stdlib.$at({
               "modf_float1",
               (function (param) {
                   return {
-                          TAG: /* Approx */5,
-                          _0: a,
-                          _1: 0.299999999999997158
-                        };
+                    TAG: /* Approx */5,
+                    _0: a,
+                    _1: 0.299999999999997158
+                  };
                 })
             ],
             tl: {
@@ -374,10 +374,10 @@ Mt.from_pair_suites("Float_test", Stdlib.$at({
                 "modf_float2",
                 (function (param) {
                     return {
-                            TAG: /* Approx */5,
-                            _0: b,
-                            _1: 32
-                          };
+                      TAG: /* Approx */5,
+                      _0: b,
+                      _1: 32
+                    };
                   })
               ],
               tl: {
@@ -385,10 +385,10 @@ Mt.from_pair_suites("Float_test", Stdlib.$at({
                   "int_of_float",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: 3,
-                              _1: 3
-                            };
+                        TAG: /* Eq */0,
+                        _0: 3,
+                        _1: 3
+                      };
                     })
                 ],
                 tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/flow_parser_reg_test.js b/jscomp/test/dist/jscomp/test/flow_parser_reg_test.js
index 58d0d424f..5feed997b 100644
--- a/jscomp/test/dist/jscomp/test/flow_parser_reg_test.js
+++ b/jscomp/test/dist/jscomp/test/flow_parser_reg_test.js
@@ -43,18 +43,18 @@ const none = {
 
 function from_lb_p(source, start, _end) {
   return {
-          source: source,
-          start: {
-            line: start.pos_lnum,
-            column: start.pos_cnum - start.pos_bol | 0,
-            offset: start.pos_cnum
-          },
-          _end: {
-            line: _end.pos_lnum,
-            column: Caml.caml_int_max(0, _end.pos_cnum - _end.pos_bol | 0),
-            offset: _end.pos_cnum
-          }
-        };
+    source: source,
+    start: {
+      line: start.pos_lnum,
+      column: start.pos_cnum - start.pos_bol | 0,
+      offset: start.pos_cnum
+    },
+    _end: {
+      line: _end.pos_lnum,
+      column: Caml.caml_int_max(0, _end.pos_cnum - _end.pos_bol | 0),
+      offset: _end.pos_cnum
+    }
+  };
 }
 
 function from_lb(source, lb) {
@@ -70,18 +70,18 @@ function from_curr_lb(source, lb) {
 
 function btwn(loc1, loc2) {
   return {
-          source: loc1.source,
-          start: loc1.start,
-          _end: loc2._end
-        };
+    source: loc1.source,
+    start: loc1.start,
+    _end: loc2._end
+  };
 }
 
 function btwn_exclusive(loc1, loc2) {
   return {
-          source: loc1.source,
-          start: loc1._end,
-          _end: loc2.start
-        };
+    source: loc1.source,
+    start: loc1._end,
+    _end: loc2.start
+  };
 }
 
 function string_of_filename(param) {
@@ -127,12 +127,12 @@ function source_cmp(a, b) {
 
 function pos_cmp(a, b) {
   return Caml_obj.caml_compare([
-              a.line,
-              a.column
-            ], [
-              b.line,
-              b.column
-            ]);
+        a.line,
+        a.column
+      ], [
+        b.line,
+        b.column
+      ]);
 }
 
 function compare(loc1, loc2) {
@@ -287,30 +287,30 @@ function error(str) {
           return "Unexpected token " + str._0;
       case /* UnexpectedTokenWithSuggestion */2 :
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Unexpected token `",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Unexpected token `",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: "`. Did you mean `",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: "`. Did you mean `",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: "`?",
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* String_literal */11,
+                              _0: "`?",
+                              _1: /* End_of_format */0
                             }
-                          },
-                          _1: "Unexpected token `%s`. Did you mean `%s`?"
-                        }), str._0, str._1);
+                          }
+                        }
+                      }
+                    },
+                    _1: "Unexpected token `%s`. Did you mean `%s`?"
+                  }), str._0, str._1);
       case /* InvalidRegExpFlags */3 :
           return "Invalid flags supplied to RegExp constructor '" + (str._0 + "'");
       case /* UnknownLabel */4 :
@@ -321,22 +321,22 @@ function error(str) {
           return "Expected corresponding JSX closing tag for " + str._0;
       case /* DuplicateExport */7 :
           return Curry._1(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Duplicate export for `",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* '`' */96,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "Duplicate export for `%s`"
-                        }), str._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Duplicate export for `",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* '`' */96,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "Duplicate export for `%s`"
+                  }), str._0);
       
     }
   }
@@ -1963,48 +1963,48 @@ const empty_lex_state = {
 
 function new_lex_env(lex_source, lex_lb, enable_types_in_comments) {
   return {
-          lex_source: lex_source,
-          lex_lb: lex_lb,
-          lex_in_comment_syntax: false,
-          lex_enable_comment_syntax: enable_types_in_comments,
-          lex_state: empty_lex_state
-        };
+    lex_source: lex_source,
+    lex_lb: lex_lb,
+    lex_in_comment_syntax: false,
+    lex_enable_comment_syntax: enable_types_in_comments,
+    lex_state: empty_lex_state
+  };
 }
 
 function get_and_clear_state(env) {
   const state = env.lex_state;
   const env$1 = state !== empty_lex_state ? ({
-        lex_source: env.lex_source,
-        lex_lb: env.lex_lb,
-        lex_in_comment_syntax: env.lex_in_comment_syntax,
-        lex_enable_comment_syntax: env.lex_enable_comment_syntax,
-        lex_state: empty_lex_state
-      }) : env;
+      lex_source: env.lex_source,
+      lex_lb: env.lex_lb,
+      lex_in_comment_syntax: env.lex_in_comment_syntax,
+      lex_enable_comment_syntax: env.lex_enable_comment_syntax,
+      lex_state: empty_lex_state
+    }) : env;
   return [
-          env$1,
-          state
-        ];
+    env$1,
+    state
+  ];
 }
 
 function with_lexbuf(lexbuf, env) {
   return {
-          lex_source: env.lex_source,
-          lex_lb: lexbuf,
-          lex_in_comment_syntax: env.lex_in_comment_syntax,
-          lex_enable_comment_syntax: env.lex_enable_comment_syntax,
-          lex_state: env.lex_state
-        };
+    lex_source: env.lex_source,
+    lex_lb: lexbuf,
+    lex_in_comment_syntax: env.lex_in_comment_syntax,
+    lex_enable_comment_syntax: env.lex_enable_comment_syntax,
+    lex_state: env.lex_state
+  };
 }
 
 function in_comment_syntax(is_in, env) {
   if (is_in !== env.lex_in_comment_syntax) {
     return {
-            lex_source: env.lex_source,
-            lex_lb: env.lex_lb,
-            lex_in_comment_syntax: is_in,
-            lex_enable_comment_syntax: env.lex_enable_comment_syntax,
-            lex_state: env.lex_state
-          };
+      lex_source: env.lex_source,
+      lex_lb: env.lex_lb,
+      lex_in_comment_syntax: is_in,
+      lex_enable_comment_syntax: env.lex_enable_comment_syntax,
+      lex_state: env.lex_state
+    };
   } else {
     return env;
   }
@@ -2060,15 +2060,15 @@ function get_result_and_clear_state(param) {
     
   }
   return [
-          env,
-          {
-            lex_token: lex_token,
-            lex_loc: match$1[0],
-            lex_value: match$1[1],
-            lex_errors: Stdlib__List.rev(state.lex_errors_acc),
-            lex_comments: Stdlib__List.rev(state.lex_comments_acc)
-          }
-        ];
+    env,
+    {
+      lex_token: lex_token,
+      lex_loc: match$1[0],
+      lex_value: match$1[1],
+      lex_errors: Stdlib__List.rev(state.lex_errors_acc),
+      lex_comments: Stdlib__List.rev(state.lex_comments_acc)
+    }
+  ];
 }
 
 function lex_error(env, loc, err) {
@@ -2083,30 +2083,30 @@ function lex_error(env, loc, err) {
   };
   const init = env.lex_state;
   return {
-          lex_source: env.lex_source,
-          lex_lb: env.lex_lb,
-          lex_in_comment_syntax: env.lex_in_comment_syntax,
-          lex_enable_comment_syntax: env.lex_enable_comment_syntax,
-          lex_state: {
-            lex_errors_acc: lex_errors_acc,
-            lex_comments_acc: init.lex_comments_acc
-          }
-        };
+    lex_source: env.lex_source,
+    lex_lb: env.lex_lb,
+    lex_in_comment_syntax: env.lex_in_comment_syntax,
+    lex_enable_comment_syntax: env.lex_enable_comment_syntax,
+    lex_state: {
+      lex_errors_acc: lex_errors_acc,
+      lex_comments_acc: init.lex_comments_acc
+    }
+  };
 }
 
 function unexpected_error(env, loc, value) {
   return lex_error(env, loc, {
-              TAG: /* UnexpectedToken */1,
-              _0: value
-            });
+        TAG: /* UnexpectedToken */1,
+        _0: value
+      });
 }
 
 function unexpected_error_w_suggest(env, loc, value, suggest) {
   return lex_error(env, loc, {
-              TAG: /* UnexpectedTokenWithSuggestion */2,
-              _0: value,
-              _1: suggest
-            });
+        TAG: /* UnexpectedTokenWithSuggestion */2,
+        _0: value,
+        _1: suggest
+      });
 }
 
 function illegal_number(env, lexbuf, word, token) {
@@ -2117,9 +2117,9 @@ function illegal_number(env, lexbuf, word, token) {
         _0: "ILLEGAL"
       });
   return [
-          env$1,
-          token
-        ];
+    env$1,
+    token
+  ];
 }
 
 const No_good = /* @__PURE__ */Caml_exceptions.create("Flow_parser_reg_test.Lexer_flow.FloatOfString.No_good");
@@ -2128,16 +2128,16 @@ function eat(f) {
   const match = f.todo;
   if (match) {
     return {
-            negative: f.negative,
-            mantissa: f.mantissa,
-            exponent: f.exponent,
-            decimal_exponent: f.decimal_exponent,
-            todo: match.tl
-          };
+      negative: f.negative,
+      mantissa: f.mantissa,
+      exponent: f.exponent,
+      decimal_exponent: f.decimal_exponent,
+      todo: match.tl
+    };
   }
   throw new Caml_js_exceptions.MelangeError(No_good, {
-            MEL_EXN_ID: No_good
-          });
+        MEL_EXN_ID: No_good
+      });
 }
 
 function start(str) {
@@ -2151,12 +2151,12 @@ function start(str) {
           };
         }), str);
   return {
-          negative: false,
-          mantissa: 0,
-          exponent: 0,
-          decimal_exponent: undefined,
-          todo: Stdlib__List.rev(todo.contents)
-        };
+    negative: false,
+    mantissa: 0,
+    exponent: 0,
+    decimal_exponent: undefined,
+    todo: Stdlib__List.rev(todo.contents)
+  };
 }
 
 function parse_sign(f) {
@@ -2172,12 +2172,12 @@ function parse_sign(f) {
     case 45 :
         const init = eat(f);
         return {
-                negative: true,
-                mantissa: init.mantissa,
-                exponent: init.exponent,
-                decimal_exponent: init.decimal_exponent,
-                todo: init.todo
-              };
+          negative: true,
+          mantissa: init.mantissa,
+          exponent: init.exponent,
+          decimal_exponent: init.decimal_exponent,
+          todo: init.todo
+        };
     default:
       return f;
   }
@@ -2188,8 +2188,8 @@ function parse_hex_symbol(f) {
   if (match) {
     if (match.hd !== 48) {
       throw new Caml_js_exceptions.MelangeError(No_good, {
-                MEL_EXN_ID: No_good
-              });
+            MEL_EXN_ID: No_good
+          });
     }
     const match$1 = match.tl;
     if (match$1) {
@@ -2199,18 +2199,18 @@ function parse_hex_symbol(f) {
       }
       if (match$2 !== 120) {
         throw new Caml_js_exceptions.MelangeError(No_good, {
-                  MEL_EXN_ID: No_good
-                });
+              MEL_EXN_ID: No_good
+            });
       }
       return eat(eat(f));
     }
     throw new Caml_js_exceptions.MelangeError(No_good, {
-              MEL_EXN_ID: No_good
-            });
+          MEL_EXN_ID: No_good
+        });
   }
   throw new Caml_js_exceptions.MelangeError(No_good, {
-            MEL_EXN_ID: No_good
-          });
+        MEL_EXN_ID: No_good
+      });
 }
 
 function parse_exponent(f) {
@@ -2223,18 +2223,18 @@ function parse_exponent(f) {
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Stdlib.Failure) {
       throw new Caml_js_exceptions.MelangeError(No_good, {
-                MEL_EXN_ID: No_good
-              });
+            MEL_EXN_ID: No_good
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
   return {
-          negative: f.negative,
-          mantissa: f.mantissa,
-          exponent: exponent,
-          decimal_exponent: f.decimal_exponent,
-          todo: /* [] */0
-        };
+    negative: f.negative,
+    mantissa: f.mantissa,
+    exponent: exponent,
+    decimal_exponent: f.decimal_exponent,
+    todo: /* [] */0
+  };
 }
 
 function parse_body(_f) {
@@ -2273,8 +2273,8 @@ function parse_body(_f) {
         continue ;
       }
       throw new Caml_js_exceptions.MelangeError(No_good, {
-                MEL_EXN_ID: No_good
-              });
+            MEL_EXN_ID: No_good
+          });
     }
     let ref_char_code;
     if (c >= /* '0' */48 && c <= /* '9' */57) {
@@ -2285,8 +2285,8 @@ function parse_body(_f) {
       ref_char_code = 87;
     } else {
       throw new Caml_js_exceptions.MelangeError(No_good, {
-                MEL_EXN_ID: No_good
-              });
+            MEL_EXN_ID: No_good
+          });
     }
     const value = c - ref_char_code | 0;
     const e = f.decimal_exponent;
@@ -2314,13 +2314,13 @@ function float_of_string(str) {
         let f = parse_body(parse_hex_symbol(parse_sign(start(str))));
         if (!Caml_obj.caml_equal(f.todo, /* [] */0)) {
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "lexer_flow.mll",
-                      546,
-                      4
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "lexer_flow.mll",
+                  546,
+                  4
+                ]
+              });
         }
         const ret = f.mantissa;
         const decimal_exponent = f.decimal_exponent;
@@ -2349,12 +2349,12 @@ function save_comment(env, start, _end, buf, multiline) {
   const loc = btwn(start, _end);
   const s = Stdlib__Buffer.contents(buf);
   const c = multiline ? ({
-        TAG: /* Block */0,
-        _0: s
-      }) : ({
-        TAG: /* Line */1,
-        _0: s
-      });
+      TAG: /* Block */0,
+      _0: s
+    }) : ({
+      TAG: /* Line */1,
+      _0: s
+    });
   const lex_comments_acc_0 = [
     loc,
     c
@@ -2366,15 +2366,15 @@ function save_comment(env, start, _end, buf, multiline) {
   };
   const init = env.lex_state;
   return {
-          lex_source: env.lex_source,
-          lex_lb: env.lex_lb,
-          lex_in_comment_syntax: env.lex_in_comment_syntax,
-          lex_enable_comment_syntax: env.lex_enable_comment_syntax,
-          lex_state: {
-            lex_errors_acc: init.lex_errors_acc,
-            lex_comments_acc: lex_comments_acc
-          }
-        };
+    lex_source: env.lex_source,
+    lex_lb: env.lex_lb,
+    lex_in_comment_syntax: env.lex_in_comment_syntax,
+    lex_enable_comment_syntax: env.lex_enable_comment_syntax,
+    lex_state: {
+      lex_errors_acc: init.lex_errors_acc,
+      lex_comments_acc: lex_comments_acc
+    }
+  };
 }
 
 function unicode_fix_cols(lb) {
@@ -2406,13 +2406,13 @@ function unicode_fix_cols(lb) {
 function oct_to_int(x) {
   if (x > 55 || x < 48) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "lexer_flow.mll",
-                604,
-                11
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "lexer_flow.mll",
+            604,
+            11
+          ]
+        });
   }
   return x - /* '0' */48 | 0;
 }
@@ -2432,54 +2432,54 @@ function hexa_to_int(x) {
     return x - /* '0' */48 | 0;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "lexer_flow.mll",
-              610,
-              11
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "lexer_flow.mll",
+          610,
+          11
+        ]
+      });
 }
 
 function utf16to8(code) {
   if (code >= 65536) {
     return {
-            hd: Stdlib__Char.chr(240 | (code >>> 18)),
-            tl: {
-              hd: Stdlib__Char.chr(128 | (code >>> 12) & 63),
-              tl: {
-                hd: Stdlib__Char.chr(128 | (code >>> 6) & 63),
-                tl: {
-                  hd: Stdlib__Char.chr(128 | code & 63),
-                  tl: /* [] */0
-                }
-              }
-            }
-          };
+      hd: Stdlib__Char.chr(240 | (code >>> 18)),
+      tl: {
+        hd: Stdlib__Char.chr(128 | (code >>> 12) & 63),
+        tl: {
+          hd: Stdlib__Char.chr(128 | (code >>> 6) & 63),
+          tl: {
+            hd: Stdlib__Char.chr(128 | code & 63),
+            tl: /* [] */0
+          }
+        }
+      }
+    };
   } else if (code >= 2048) {
     return {
-            hd: Stdlib__Char.chr(224 | (code >>> 12)),
-            tl: {
-              hd: Stdlib__Char.chr(128 | (code >>> 6) & 63),
-              tl: {
-                hd: Stdlib__Char.chr(128 | code & 63),
-                tl: /* [] */0
-              }
-            }
-          };
+      hd: Stdlib__Char.chr(224 | (code >>> 12)),
+      tl: {
+        hd: Stdlib__Char.chr(128 | (code >>> 6) & 63),
+        tl: {
+          hd: Stdlib__Char.chr(128 | code & 63),
+          tl: /* [] */0
+        }
+      }
+    };
   } else if (code >= 128) {
     return {
-            hd: Stdlib__Char.chr(192 | (code >>> 6)),
-            tl: {
-              hd: Stdlib__Char.chr(128 | code & 63),
-              tl: /* [] */0
-            }
-          };
+      hd: Stdlib__Char.chr(192 | (code >>> 6)),
+      tl: {
+        hd: Stdlib__Char.chr(128 | code & 63),
+        tl: /* [] */0
+      }
+    };
   } else {
     return {
-            hd: Stdlib__Char.chr(code),
-            tl: /* [] */0
-          };
+      hd: Stdlib__Char.chr(code),
+      tl: /* [] */0
+    };
   }
 }
 
@@ -2500,10 +2500,10 @@ function mk_num_singleton(number_type, num, neg) {
   }
   const value$1 = neg === "" ? value : - value;
   return {
-          TAG: /* T_NUMBER_SINGLETON_TYPE */5,
-          _0: number_type,
-          _1: value$1
-        };
+    TAG: /* T_NUMBER_SINGLETON_TYPE */5,
+    _0: number_type,
+    _1: value$1
+  };
 }
 
 const keywords = Stdlib__Hashtbl.create(undefined, 53);
@@ -2938,9 +2938,9 @@ function token(env, lexbuf) {
             const env$4 = in_comment_syntax(true, env$3);
             if (escape_type === ":") {
               return [
-                      env$4,
-                      /* T_COLON */77
-                    ];
+                env$4,
+                /* T_COLON */77
+              ];
             } else {
               return token(env$4, lexbuf);
             }
@@ -2959,9 +2959,9 @@ function token(env, lexbuf) {
           }
           yyback(1, lexbuf);
           return [
-                  env,
-                  /* T_MULT */97
-                ];
+            env,
+            /* T_MULT */97
+          ];
       case 6 :
           const start$2 = from_lb(env.lex_source, lexbuf);
           const buf$2 = Stdlib__Buffer.create(127);
@@ -2971,9 +2971,9 @@ function token(env, lexbuf) {
       case 7 :
           if (lexbuf.lex_start_pos !== 0) {
             return [
-                    env,
-                    /* T_ERROR */104
-                  ];
+              env,
+              /* T_ERROR */104
+            ];
           }
           const match$3 = line_comment(env, Stdlib__Buffer.create(127), lexbuf);
           return token(match$3[0], lexbuf);
@@ -2985,17 +2985,17 @@ function token(env, lexbuf) {
           Stdlib__Buffer.add_char(raw, quote);
           const match$4 = string_quote(env, quote, buf$3, raw, false, lexbuf);
           return [
-                  match$4[0],
-                  {
-                    TAG: /* T_STRING */1,
-                    _0: [
-                      btwn(start$3, match$4[1]),
-                      Stdlib__Buffer.contents(buf$3),
-                      Stdlib__Buffer.contents(raw),
-                      match$4[2]
-                    ]
-                  }
-                ];
+            match$4[0],
+            {
+              TAG: /* T_STRING */1,
+              _0: [
+                btwn(start$3, match$4[1]),
+                Stdlib__Buffer.contents(buf$3),
+                Stdlib__Buffer.contents(raw),
+                match$4[2]
+              ]
+            }
+          ];
       case 9 :
           const cooked = Stdlib__Buffer.create(127);
           const raw$1 = Stdlib__Buffer.create(127);
@@ -3004,62 +3004,62 @@ function token(env, lexbuf) {
           const start$4 = from_lb(env.lex_source, lexbuf);
           const match$5 = template_part(env, start$4, cooked, raw$1, literal, lexbuf);
           return [
-                  match$5[0],
-                  {
-                    TAG: /* T_TEMPLATE_PART */2,
-                    _0: [
-                      match$5[1],
-                      {
-                        cooked: Stdlib__Buffer.contents(cooked),
-                        raw: Stdlib__Buffer.contents(raw$1),
-                        literal: Stdlib__Buffer.contents(literal)
-                      },
-                      match$5[2]
-                    ]
-                  }
-                ];
+            match$5[0],
+            {
+              TAG: /* T_TEMPLATE_PART */2,
+              _0: [
+                match$5[1],
+                {
+                  cooked: Stdlib__Buffer.contents(cooked),
+                  raw: Stdlib__Buffer.contents(raw$1),
+                  literal: Stdlib__Buffer.contents(literal)
+                },
+                match$5[2]
+              ]
+            }
+          ];
       case 10 :
           const w = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos);
           return illegal_number(env, lexbuf, w, {
-                      TAG: /* T_NUMBER */0,
-                      _0: /* BINARY */0
-                    });
+                TAG: /* T_NUMBER */0,
+                _0: /* BINARY */0
+              });
       case 11 :
           return [
-                  env,
-                  {
-                    TAG: /* T_NUMBER */0,
-                    _0: /* BINARY */0
-                  }
-                ];
+            env,
+            {
+              TAG: /* T_NUMBER */0,
+              _0: /* BINARY */0
+            }
+          ];
       case 12 :
           const w$1 = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos);
           return illegal_number(env, lexbuf, w$1, {
-                      TAG: /* T_NUMBER */0,
-                      _0: /* OCTAL */2
-                    });
+                TAG: /* T_NUMBER */0,
+                _0: /* OCTAL */2
+              });
       case 13 :
           return [
-                  env,
-                  {
-                    TAG: /* T_NUMBER */0,
-                    _0: /* OCTAL */2
-                  }
-                ];
+            env,
+            {
+              TAG: /* T_NUMBER */0,
+              _0: /* OCTAL */2
+            }
+          ];
       case 14 :
           const w$2 = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos);
           return illegal_number(env, lexbuf, w$2, {
-                      TAG: /* T_NUMBER */0,
-                      _0: /* LEGACY_OCTAL */1
-                    });
+                TAG: /* T_NUMBER */0,
+                _0: /* LEGACY_OCTAL */1
+              });
       case 15 :
           return [
-                  env,
-                  {
-                    TAG: /* T_NUMBER */0,
-                    _0: /* LEGACY_OCTAL */1
-                  }
-                ];
+            env,
+            {
+              TAG: /* T_NUMBER */0,
+              _0: /* LEGACY_OCTAL */1
+            }
+          ];
       case 16 :
       case 18 :
       case 20 :
@@ -3068,296 +3068,296 @@ function token(env, lexbuf) {
       case 19 :
       case 21 :
           return [
-                  env,
-                  {
-                    TAG: /* T_NUMBER */0,
-                    _0: /* NORMAL */3
-                  }
-                ];
+            env,
+            {
+              TAG: /* T_NUMBER */0,
+              _0: /* NORMAL */3
+            }
+          ];
       case 22 :
           const word = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos);
           unicode_fix_cols(lexbuf);
           try {
             return [
-                    env,
-                    Stdlib__Hashtbl.find(keywords, word)
-                  ];
+              env,
+              Stdlib__Hashtbl.find(keywords, word)
+            ];
           }
           catch (raw_exn){
             const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn.MEL_EXN_ID === Stdlib.Not_found) {
               return [
-                      env,
-                      /* T_IDENTIFIER */0
-                    ];
+                env,
+                /* T_IDENTIFIER */0
+              ];
             }
             throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
           }
       case 23 :
           return [
-                  env,
-                  /* T_LCURLY */1
-                ];
+            env,
+            /* T_LCURLY */1
+          ];
       case 24 :
           return [
-                  env,
-                  /* T_RCURLY */2
-                ];
+            env,
+            /* T_RCURLY */2
+          ];
       case 25 :
           return [
-                  env,
-                  /* T_LPAREN */3
-                ];
+            env,
+            /* T_LPAREN */3
+          ];
       case 26 :
           return [
-                  env,
-                  /* T_RPAREN */4
-                ];
+            env,
+            /* T_RPAREN */4
+          ];
       case 27 :
           return [
-                  env,
-                  /* T_LBRACKET */5
-                ];
+            env,
+            /* T_LBRACKET */5
+          ];
       case 28 :
           return [
-                  env,
-                  /* T_RBRACKET */6
-                ];
+            env,
+            /* T_RBRACKET */6
+          ];
       case 29 :
           return [
-                  env,
-                  /* T_ELLIPSIS */11
-                ];
+            env,
+            /* T_ELLIPSIS */11
+          ];
       case 30 :
           return [
-                  env,
-                  /* T_PERIOD */9
-                ];
+            env,
+            /* T_PERIOD */9
+          ];
       case 31 :
           return [
-                  env,
-                  /* T_SEMICOLON */7
-                ];
+            env,
+            /* T_SEMICOLON */7
+          ];
       case 32 :
           return [
-                  env,
-                  /* T_COMMA */8
-                ];
+            env,
+            /* T_COMMA */8
+          ];
       case 33 :
           return [
-                  env,
-                  /* T_COLON */77
-                ];
+            env,
+            /* T_COLON */77
+          ];
       case 34 :
           return [
-                  env,
-                  /* T_PLING */76
-                ];
+            env,
+            /* T_PLING */76
+          ];
       case 35 :
           return [
-                  env,
-                  /* T_AND */79
-                ];
+            env,
+            /* T_AND */79
+          ];
       case 36 :
           return [
-                  env,
-                  /* T_OR */78
-                ];
+            env,
+            /* T_OR */78
+          ];
       case 37 :
           return [
-                  env,
-                  /* T_STRICT_EQUAL */85
-                ];
+            env,
+            /* T_STRICT_EQUAL */85
+          ];
       case 38 :
           return [
-                  env,
-                  /* T_STRICT_NOT_EQUAL */86
-                ];
+            env,
+            /* T_STRICT_NOT_EQUAL */86
+          ];
       case 39 :
           return [
-                  env,
-                  /* T_LESS_THAN_EQUAL */87
-                ];
+            env,
+            /* T_LESS_THAN_EQUAL */87
+          ];
       case 40 :
           return [
-                  env,
-                  /* T_GREATER_THAN_EQUAL */88
-                ];
+            env,
+            /* T_GREATER_THAN_EQUAL */88
+          ];
       case 41 :
           return [
-                  env,
-                  /* T_EQUAL */83
-                ];
+            env,
+            /* T_EQUAL */83
+          ];
       case 42 :
           return [
-                  env,
-                  /* T_NOT_EQUAL */84
-                ];
+            env,
+            /* T_NOT_EQUAL */84
+          ];
       case 43 :
           return [
-                  env,
-                  /* T_INCR */102
-                ];
+            env,
+            /* T_INCR */102
+          ];
       case 44 :
           return [
-                  env,
-                  /* T_DECR */103
-                ];
+            env,
+            /* T_DECR */103
+          ];
       case 45 :
           return [
-                  env,
-                  /* T_LSHIFT_ASSIGN */65
-                ];
+            env,
+            /* T_LSHIFT_ASSIGN */65
+          ];
       case 46 :
           return [
-                  env,
-                  /* T_LSHIFT */91
-                ];
+            env,
+            /* T_LSHIFT */91
+          ];
       case 47 :
           return [
-                  env,
-                  /* T_RSHIFT_ASSIGN */64
-                ];
+            env,
+            /* T_RSHIFT_ASSIGN */64
+          ];
       case 48 :
           return [
-                  env,
-                  /* T_RSHIFT3_ASSIGN */63
-                ];
+            env,
+            /* T_RSHIFT3_ASSIGN */63
+          ];
       case 49 :
           return [
-                  env,
-                  /* T_RSHIFT3 */93
-                ];
+            env,
+            /* T_RSHIFT3 */93
+          ];
       case 50 :
           return [
-                  env,
-                  /* T_RSHIFT */92
-                ];
+            env,
+            /* T_RSHIFT */92
+          ];
       case 51 :
           return [
-                  env,
-                  /* T_PLUS_ASSIGN */74
-                ];
+            env,
+            /* T_PLUS_ASSIGN */74
+          ];
       case 52 :
           return [
-                  env,
-                  /* T_MINUS_ASSIGN */73
-                ];
+            env,
+            /* T_MINUS_ASSIGN */73
+          ];
       case 53 :
           return [
-                  env,
-                  /* T_MULT_ASSIGN */71
-                ];
+            env,
+            /* T_MULT_ASSIGN */71
+          ];
       case 54 :
           return [
-                  env,
-                  /* T_EXP_ASSIGN */72
-                ];
+            env,
+            /* T_EXP_ASSIGN */72
+          ];
       case 55 :
           return [
-                  env,
-                  /* T_MOD_ASSIGN */69
-                ];
+            env,
+            /* T_MOD_ASSIGN */69
+          ];
       case 56 :
           return [
-                  env,
-                  /* T_BIT_AND_ASSIGN */68
-                ];
+            env,
+            /* T_BIT_AND_ASSIGN */68
+          ];
       case 57 :
           return [
-                  env,
-                  /* T_BIT_OR_ASSIGN */67
-                ];
+            env,
+            /* T_BIT_OR_ASSIGN */67
+          ];
       case 58 :
           return [
-                  env,
-                  /* T_BIT_XOR_ASSIGN */66
-                ];
+            env,
+            /* T_BIT_XOR_ASSIGN */66
+          ];
       case 59 :
           return [
-                  env,
-                  /* T_LESS_THAN */89
-                ];
+            env,
+            /* T_LESS_THAN */89
+          ];
       case 60 :
           return [
-                  env,
-                  /* T_GREATER_THAN */90
-                ];
+            env,
+            /* T_GREATER_THAN */90
+          ];
       case 61 :
           return [
-                  env,
-                  /* T_PLUS */94
-                ];
+            env,
+            /* T_PLUS */94
+          ];
       case 62 :
           return [
-                  env,
-                  /* T_MINUS */95
-                ];
+            env,
+            /* T_MINUS */95
+          ];
       case 63 :
           return [
-                  env,
-                  /* T_MULT */97
-                ];
+            env,
+            /* T_MULT */97
+          ];
       case 64 :
           return [
-                  env,
-                  /* T_EXP */98
-                ];
+            env,
+            /* T_EXP */98
+          ];
       case 65 :
           return [
-                  env,
-                  /* T_MOD */99
-                ];
+            env,
+            /* T_MOD */99
+          ];
       case 66 :
           return [
-                  env,
-                  /* T_BIT_OR */80
-                ];
+            env,
+            /* T_BIT_OR */80
+          ];
       case 67 :
           return [
-                  env,
-                  /* T_BIT_AND */82
-                ];
+            env,
+            /* T_BIT_AND */82
+          ];
       case 68 :
           return [
-                  env,
-                  /* T_BIT_XOR */81
-                ];
+            env,
+            /* T_BIT_XOR */81
+          ];
       case 69 :
           return [
-                  env,
-                  /* T_NOT */100
-                ];
+            env,
+            /* T_NOT */100
+          ];
       case 70 :
           return [
-                  env,
-                  /* T_BIT_NOT */101
-                ];
+            env,
+            /* T_BIT_NOT */101
+          ];
       case 71 :
           return [
-                  env,
-                  /* T_ASSIGN */75
-                ];
+            env,
+            /* T_ASSIGN */75
+          ];
       case 72 :
           return [
-                  env,
-                  /* T_ARROW */10
-                ];
+            env,
+            /* T_ARROW */10
+          ];
       case 73 :
           return [
-                  env,
-                  /* T_DIV_ASSIGN */70
-                ];
+            env,
+            /* T_DIV_ASSIGN */70
+          ];
       case 74 :
           return [
-                  env,
-                  /* T_DIV */96
-                ];
+            env,
+            /* T_DIV */96
+          ];
       case 75 :
           return [
-                  env,
-                  /* T_AT */12
-                ];
+            env,
+            /* T_AT */12
+          ];
       case 76 :
           let env$8;
           if (env.lex_in_comment_syntax) {
@@ -3367,18 +3367,18 @@ function token(env, lexbuf) {
             env$8 = env;
           }
           return [
-                  env$8,
-                  /* T_EOF */105
-                ];
+            env$8,
+            /* T_EOF */105
+          ];
       case 77 :
           const env$9 = lex_error(env, from_lb(env.lex_source, lexbuf), {
                 TAG: /* UnexpectedToken */1,
                 _0: "ILLEGAL"
               });
           return [
-                  env$9,
-                  /* T_ERROR */104
-                ];
+            env$9,
+            /* T_ERROR */104
+          ];
       default:
         Curry._1(lexbuf.refill_buff, lexbuf);
         ___ocaml_lex_state = __ocaml_lex_state$1;
@@ -3386,9 +3386,9 @@ function token(env, lexbuf) {
     }
     const w$3 = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos);
     return illegal_number(env, lexbuf, w$3, {
-                TAG: /* T_NUMBER */0,
-                _0: /* NORMAL */3
-              });
+          TAG: /* T_NUMBER */0,
+          _0: /* NORMAL */3
+        });
   };
 }
 
@@ -3404,17 +3404,17 @@ function jsx_text(env, mode, buf, raw, lexbuf) {
             case /* JSX_SINGLE_QUOTED_TEXT */0 :
                 if (c === 39) {
                   return [
-                          env,
-                          from_lb(env.lex_source, lexbuf)
-                        ];
+                    env,
+                    from_lb(env.lex_source, lexbuf)
+                  ];
                 }
                 break;
             case /* JSX_DOUBLE_QUOTED_TEXT */1 :
                 if (c === 34) {
                   return [
-                          env,
-                          from_lb(env.lex_source, lexbuf)
-                        ];
+                    env,
+                    from_lb(env.lex_source, lexbuf)
+                  ];
                 }
                 break;
             case /* JSX_CHILD_TEXT */2 :
@@ -3425,9 +3425,9 @@ function jsx_text(env, mode, buf, raw, lexbuf) {
                 if (exit === 2) {
                   back(lexbuf);
                   return [
-                          env,
-                          from_lb(env.lex_source, lexbuf)
-                        ];
+                    env,
+                    from_lb(env.lex_source, lexbuf)
+                  ];
                 }
                 break;
             
@@ -3441,9 +3441,9 @@ function jsx_text(env, mode, buf, raw, lexbuf) {
                 _0: "ILLEGAL"
               });
           return [
-                  env$1,
-                  from_lb(env$1.lex_source, lexbuf)
-                ];
+            env$1,
+            from_lb(env$1.lex_source, lexbuf)
+          ];
       case 2 :
           const lt = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos);
           Stdlib__Buffer.add_string(raw, lt);
@@ -4265,9 +4265,9 @@ function __ocaml_lex_jsx_tag_rec(_env, lexbuf, ___ocaml_lex_state) {
     switch (__ocaml_lex_state$1) {
       case 0 :
           return [
-                  env,
-                  /* T_EOF */105
-                ];
+            env,
+            /* T_EOF */105
+          ];
       case 1 :
           Stdlib__Lexing.new_line(lexbuf);
           ___ocaml_lex_state = 333;
@@ -4294,45 +4294,45 @@ function __ocaml_lex_jsx_tag_rec(_env, lexbuf, ___ocaml_lex_state) {
           continue ;
       case 5 :
           return [
-                  env,
-                  /* T_LESS_THAN */89
-                ];
+            env,
+            /* T_LESS_THAN */89
+          ];
       case 6 :
           return [
-                  env,
-                  /* T_DIV */96
-                ];
+            env,
+            /* T_DIV */96
+          ];
       case 7 :
           return [
-                  env,
-                  /* T_GREATER_THAN */90
-                ];
+            env,
+            /* T_GREATER_THAN */90
+          ];
       case 8 :
           return [
-                  env,
-                  /* T_LCURLY */1
-                ];
+            env,
+            /* T_LCURLY */1
+          ];
       case 9 :
           return [
-                  env,
-                  /* T_COLON */77
-                ];
+            env,
+            /* T_COLON */77
+          ];
       case 10 :
           return [
-                  env,
-                  /* T_PERIOD */9
-                ];
+            env,
+            /* T_PERIOD */9
+          ];
       case 11 :
           return [
-                  env,
-                  /* T_ASSIGN */75
-                ];
+            env,
+            /* T_ASSIGN */75
+          ];
       case 12 :
           unicode_fix_cols(lexbuf);
           return [
-                  env,
-                  /* T_JSX_IDENTIFIER */106
-                ];
+            env,
+            /* T_JSX_IDENTIFIER */106
+          ];
       case 13 :
           const quote = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos);
           const start$2 = from_lb(env.lex_source, lexbuf);
@@ -4345,21 +4345,21 @@ function __ocaml_lex_jsx_tag_rec(_env, lexbuf, ___ocaml_lex_state) {
           const value = Stdlib__Buffer.contents(buf$2);
           const raw$1 = Stdlib__Buffer.contents(raw);
           return [
-                  match$2[0],
-                  {
-                    TAG: /* T_JSX_TEXT */4,
-                    _0: [
-                      btwn(start$2, match$2[1]),
-                      value,
-                      raw$1
-                    ]
-                  }
-                ];
+            match$2[0],
+            {
+              TAG: /* T_JSX_TEXT */4,
+              _0: [
+                btwn(start$2, match$2[1]),
+                value,
+                raw$1
+              ]
+            }
+          ];
       case 14 :
           return [
-                  env,
-                  /* T_ERROR */104
-                ];
+            env,
+            /* T_ERROR */104
+          ];
       default:
         Curry._1(lexbuf.refill_buff, lexbuf);
         ___ocaml_lex_state = __ocaml_lex_state$1;
@@ -4380,24 +4380,24 @@ function template_part(env, start, cooked, raw, literal, lexbuf) {
                 _0: "ILLEGAL"
               });
           return [
-                  env$1,
-                  btwn(start, from_lb(env$1.lex_source, lexbuf)),
-                  true
-                ];
+            env$1,
+            btwn(start, from_lb(env$1.lex_source, lexbuf)),
+            true
+          ];
       case 1 :
           Stdlib__Buffer.add_char(literal, /* '`' */96);
           return [
-                  env,
-                  btwn(start, from_lb(env.lex_source, lexbuf)),
-                  true
-                ];
+            env,
+            btwn(start, from_lb(env.lex_source, lexbuf)),
+            true
+          ];
       case 2 :
           Stdlib__Buffer.add_string(literal, "${");
           return [
-                  env,
-                  btwn(start, from_lb(env.lex_source, lexbuf)),
-                  false
-                ];
+            env,
+            btwn(start, from_lb(env.lex_source, lexbuf)),
+            false
+          ];
       case 3 :
           Stdlib__Buffer.add_char(raw, /* '\\' */92);
           Stdlib__Buffer.add_char(literal, /* '\\' */92);
@@ -4446,9 +4446,9 @@ function comment(env, buf, lexbuf) {
                 _0: "ILLEGAL"
               });
           return [
-                  env$1,
-                  from_lb(env$1.lex_source, lexbuf)
-                ];
+            env$1,
+            from_lb(env$1.lex_source, lexbuf)
+          ];
       case 1 :
           Stdlib__Lexing.new_line(lexbuf);
           Stdlib__Buffer.add_char(buf, /* '\n' */10);
@@ -4457,15 +4457,15 @@ function comment(env, buf, lexbuf) {
           const loc = from_lb(env.lex_source, lexbuf);
           const env$2 = env.lex_in_comment_syntax ? unexpected_error_w_suggest(env, loc, "*/", "*-/") : env;
           return [
-                  env$2,
-                  loc
-                ];
+            env$2,
+            loc
+          ];
       case 3 :
           if (env.lex_in_comment_syntax) {
             return [
-                    env,
-                    from_lb(env.lex_source, lexbuf)
-                  ];
+              env,
+              from_lb(env.lex_source, lexbuf)
+            ];
           } else {
             Stdlib__Buffer.add_string(buf, "*-/");
             return comment(env, buf, lexbuf);
@@ -4520,40 +4520,40 @@ function __ocaml_lex_template_tail_rec(_env, lexbuf, ___ocaml_lex_state) {
           Stdlib__Buffer.add_string(literal, "}");
           const match$2 = template_part(env, start$2, cooked, raw, literal, lexbuf);
           return [
-                  match$2[0],
-                  {
-                    TAG: /* T_TEMPLATE_PART */2,
-                    _0: [
-                      match$2[1],
-                      {
-                        cooked: Stdlib__Buffer.contents(cooked),
-                        raw: Stdlib__Buffer.contents(raw),
-                        literal: Stdlib__Buffer.contents(literal)
-                      },
-                      match$2[2]
-                    ]
-                  }
-                ];
+            match$2[0],
+            {
+              TAG: /* T_TEMPLATE_PART */2,
+              _0: [
+                match$2[1],
+                {
+                  cooked: Stdlib__Buffer.contents(cooked),
+                  raw: Stdlib__Buffer.contents(raw),
+                  literal: Stdlib__Buffer.contents(literal)
+                },
+                match$2[2]
+              ]
+            }
+          ];
       case 5 :
           const env$3 = lex_error(env, from_lb(env.lex_source, lexbuf), {
                 TAG: /* UnexpectedToken */1,
                 _0: "ILLEGAL"
               });
           return [
-                  env$3,
-                  {
-                    TAG: /* T_TEMPLATE_PART */2,
-                    _0: [
-                      from_lb(env$3.lex_source, lexbuf),
-                      {
-                        cooked: "",
-                        raw: "",
-                        literal: ""
-                      },
-                      true
-                    ]
-                  }
-                ];
+            env$3,
+            {
+              TAG: /* T_TEMPLATE_PART */2,
+              _0: [
+                from_lb(env$3.lex_source, lexbuf),
+                {
+                  cooked: "",
+                  raw: "",
+                  literal: ""
+                },
+                true
+              ]
+            }
+          ];
       default:
         Curry._1(lexbuf.refill_buff, lexbuf);
         ___ocaml_lex_state = __ocaml_lex_state$1;
@@ -4570,9 +4570,9 @@ function line_comment(env, buf, lexbuf) {
     switch (__ocaml_lex_state$1) {
       case 0 :
           return [
-                  env,
-                  from_lb(env.lex_source, lexbuf)
-                ];
+            env,
+            from_lb(env.lex_source, lexbuf)
+          ];
       case 1 :
           const match = from_lb(env.lex_source, lexbuf);
           const match$1 = match._end;
@@ -4586,13 +4586,13 @@ function line_comment(env, buf, lexbuf) {
             offset: _end_offset
           };
           return [
-                  env,
-                  {
-                    source: match.source,
-                    start: match.start,
-                    _end: _end
-                  }
-                ];
+            env,
+            {
+              source: match.source,
+              start: match.start,
+              _end: _end
+            }
+          ];
       case 2 :
           const c = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos);
           Stdlib__Buffer.add_char(buf, c);
@@ -4646,10 +4646,10 @@ function string_quote(env, q, buf, raw, octal, lexbuf) {
           Stdlib__Buffer.add_char(raw, q$p);
           if (q === q$p) {
             return [
-                    env,
-                    from_lb(env.lex_source, lexbuf),
-                    octal
-                  ];
+              env,
+              from_lb(env.lex_source, lexbuf),
+              octal
+            ];
           } else {
             Stdlib__Buffer.add_char(buf, q$p);
             return string_quote(env, q, buf, raw, octal, lexbuf);
@@ -4670,10 +4670,10 @@ function string_quote(env, q, buf, raw, octal, lexbuf) {
               });
           Stdlib__Buffer.add_string(buf, x);
           return [
-                  env$1,
-                  from_lb(env$1.lex_source, lexbuf),
-                  octal
-                ];
+            env$1,
+            from_lb(env$1.lex_source, lexbuf),
+            octal
+          ];
       case 3 :
           const x$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos);
           Stdlib__Buffer.add_char(raw, x$1);
@@ -4695,15 +4695,15 @@ function string_escape(env, buf, lexbuf) {
     switch (__ocaml_lex_state$1) {
       case 0 :
           return [
-                  env,
-                  false
-                ];
+            env,
+            false
+          ];
       case 1 :
           Stdlib__Buffer.add_string(buf, "\\");
           return [
-                  env,
-                  false
-                ];
+            env,
+            false
+          ];
       case 2 :
           const a = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 1 | 0);
           const b = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 2 | 0);
@@ -4712,9 +4712,9 @@ function string_escape(env, buf, lexbuf) {
                   return Stdlib__Buffer.add_char(buf, param);
                 }), utf16to8(code));
           return [
-                  env,
-                  false
-                ];
+            env,
+            false
+          ];
       case 3 :
           const a$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos);
           const b$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 1 | 0);
@@ -4732,9 +4732,9 @@ function string_escape(env, buf, lexbuf) {
             Stdlib__Buffer.add_char(buf, c);
           }
           return [
-                  env,
-                  true
-                ];
+            env,
+            true
+          ];
       case 4 :
           const a$2 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos);
           const b$2 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 1 | 0);
@@ -4743,51 +4743,51 @@ function string_escape(env, buf, lexbuf) {
                   return Stdlib__Buffer.add_char(buf, param);
                 }), utf16to8(code$3));
           return [
-                  env,
-                  true
-                ];
+            env,
+            true
+          ];
       case 5 :
           Stdlib__Buffer.add_char(buf, Stdlib__Char.chr(0));
           return [
-                  env,
-                  false
-                ];
+            env,
+            false
+          ];
       case 6 :
           Stdlib__Buffer.add_char(buf, Stdlib__Char.chr(8));
           return [
-                  env,
-                  false
-                ];
+            env,
+            false
+          ];
       case 7 :
           Stdlib__Buffer.add_char(buf, Stdlib__Char.chr(12));
           return [
-                  env,
-                  false
-                ];
+            env,
+            false
+          ];
       case 8 :
           Stdlib__Buffer.add_char(buf, Stdlib__Char.chr(10));
           return [
-                  env,
-                  false
-                ];
+            env,
+            false
+          ];
       case 9 :
           Stdlib__Buffer.add_char(buf, Stdlib__Char.chr(13));
           return [
-                  env,
-                  false
-                ];
+            env,
+            false
+          ];
       case 10 :
           Stdlib__Buffer.add_char(buf, Stdlib__Char.chr(9));
           return [
-                  env,
-                  false
-                ];
+            env,
+            false
+          ];
       case 11 :
           Stdlib__Buffer.add_char(buf, Stdlib__Char.chr(11));
           return [
-                  env,
-                  false
-                ];
+            env,
+            false
+          ];
       case 12 :
           const a$3 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos);
           const code$4 = oct_to_int(a$3);
@@ -4795,9 +4795,9 @@ function string_escape(env, buf, lexbuf) {
                   return Stdlib__Buffer.add_char(buf, param);
                 }), utf16to8(code$4));
           return [
-                  env,
-                  true
-                ];
+            env,
+            true
+          ];
       case 13 :
           const a$4 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 1 | 0);
           const b$3 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + 2 | 0);
@@ -4808,9 +4808,9 @@ function string_escape(env, buf, lexbuf) {
                   return Stdlib__Buffer.add_char(buf, param);
                 }), utf16to8(code$5));
           return [
-                  env,
-                  false
-                ];
+            env,
+            false
+          ];
       case 14 :
           const hex_code = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos + 2 | 0, lexbuf.lex_curr_pos - 1 | 0);
           const code$6 = Caml_format.caml_int_of_string("0x" + hex_code);
@@ -4822,9 +4822,9 @@ function string_escape(env, buf, lexbuf) {
                   return Stdlib__Buffer.add_char(buf, param);
                 }), utf16to8(code$6));
           return [
-                  env$1,
-                  false
-                ];
+            env$1,
+            false
+          ];
       case 15 :
           const c$2 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos);
           const env$2 = lex_error(env, from_lb(env.lex_source, lexbuf), {
@@ -4833,22 +4833,22 @@ function string_escape(env, buf, lexbuf) {
               });
           Stdlib__Buffer.add_char(buf, c$2);
           return [
-                  env$2,
-                  false
-                ];
+            env$2,
+            false
+          ];
       case 16 :
           Stdlib__Lexing.new_line(lexbuf);
           return [
-                  env,
-                  false
-                ];
+            env,
+            false
+          ];
       case 17 :
           const c$3 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos);
           Stdlib__Buffer.add_char(buf, c$3);
           return [
-                  env,
-                  false
-                ];
+            env,
+            false
+          ];
       default:
         Curry._1(lexbuf.refill_buff, lexbuf);
         ___ocaml_lex_state = __ocaml_lex_state$1;
@@ -4905,9 +4905,9 @@ function type_token(env, lexbuf) {
             const env$3 = in_comment_syntax(true, env$2);
             if (escape_type === ":") {
               return [
-                      env$3,
-                      /* T_COLON */77
-                    ];
+                env$3,
+                /* T_COLON */77
+              ];
             } else {
               return type_token(env$3, lexbuf);
             }
@@ -4926,9 +4926,9 @@ function type_token(env, lexbuf) {
           }
           yyback(1, lexbuf);
           return [
-                  env,
-                  /* T_MULT */97
-                ];
+            env,
+            /* T_MULT */97
+          ];
       case 5 :
           const start$2 = from_lb(env.lex_source, lexbuf);
           const buf$2 = Stdlib__Buffer.create(127);
@@ -4943,17 +4943,17 @@ function type_token(env, lexbuf) {
           Stdlib__Buffer.add_char(raw, quote);
           const match$3 = string_quote(env, quote, buf$3, raw, false, lexbuf);
           return [
-                  match$3[0],
-                  {
-                    TAG: /* T_STRING */1,
-                    _0: [
-                      btwn(start$3, match$3[1]),
-                      Stdlib__Buffer.contents(buf$3),
-                      Stdlib__Buffer.contents(raw),
-                      match$3[2]
-                    ]
-                  }
-                ];
+            match$3[0],
+            {
+              TAG: /* T_STRING */1,
+              _0: [
+                btwn(start$3, match$3[1]),
+                Stdlib__Buffer.contents(buf$3),
+                Stdlib__Buffer.contents(raw),
+                match$3[2]
+              ]
+            }
+          ];
       case 7 :
           const neg = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0));
           const num = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1));
@@ -4963,9 +4963,9 @@ function type_token(env, lexbuf) {
           const neg$1 = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0));
           const num$1 = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos);
           return [
-                  env,
-                  mk_num_singleton(/* BINARY */0, num$1, neg$1)
-                ];
+            env,
+            mk_num_singleton(/* BINARY */0, num$1, neg$1)
+          ];
       case 9 :
           const neg$2 = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0));
           const num$2 = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1));
@@ -4975,9 +4975,9 @@ function type_token(env, lexbuf) {
           const neg$3 = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0));
           const num$3 = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos);
           return [
-                  env,
-                  mk_num_singleton(/* OCTAL */2, num$3, neg$3)
-                ];
+            env,
+            mk_num_singleton(/* OCTAL */2, num$3, neg$3)
+          ];
       case 11 :
           const neg$4 = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0));
           const num$4 = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1));
@@ -4987,9 +4987,9 @@ function type_token(env, lexbuf) {
           const neg$5 = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0));
           const num$5 = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos);
           return [
-                  env,
-                  mk_num_singleton(/* LEGACY_OCTAL */1, num$5, neg$5)
-                ];
+            env,
+            mk_num_singleton(/* LEGACY_OCTAL */1, num$5, neg$5)
+          ];
       case 13 :
           const neg$6 = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0));
           const num$6 = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1));
@@ -5023,22 +5023,22 @@ function type_token(env, lexbuf) {
           const num$7 = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos);
           try {
             return [
-                    env,
-                    mk_num_singleton(/* NORMAL */3, num$7, neg$7)
-                  ];
+              env,
+              mk_num_singleton(/* NORMAL */3, num$7, neg$7)
+            ];
           }
           catch (exn$1){
             if (Stdlib__Sys.win32) {
               const loc$2 = from_lb(env.lex_source, lexbuf);
               const env$8 = lex_error(env, loc$2, /* WindowsFloatOfString */59);
               return [
-                      env$8,
-                      {
-                        TAG: /* T_NUMBER_SINGLETON_TYPE */5,
-                        _0: /* NORMAL */3,
-                        _1: 789.0
-                      }
-                    ];
+                env$8,
+                {
+                  TAG: /* T_NUMBER_SINGLETON_TYPE */5,
+                  _0: /* NORMAL */3,
+                  _1: 789.0
+                }
+              ];
             }
             throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
           }
@@ -5051,9 +5051,9 @@ function type_token(env, lexbuf) {
           const neg$9 = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0));
           const num$9 = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos);
           return [
-                  env,
-                  mk_num_singleton(/* NORMAL */3, num$9, neg$9)
-                ];
+            env,
+            mk_num_singleton(/* NORMAL */3, num$9, neg$9)
+          ];
       case 17 :
           const neg$10 = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, Caml_array.get(lexbuf.lex_mem, 0));
           const num$10 = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 0), Caml_array.get(lexbuf.lex_mem, 1));
@@ -5063,143 +5063,143 @@ function type_token(env, lexbuf) {
           const neg$11 = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 1), Caml_array.get(lexbuf.lex_mem, 0));
           const num$11 = Stdlib__Lexing.sub_lexeme(lexbuf, Caml_array.get(lexbuf.lex_mem, 3), Caml_array.get(lexbuf.lex_mem, 2));
           return [
-                  env,
-                  mk_num_singleton(/* NORMAL */3, num$11, neg$11)
-                ];
+            env,
+            mk_num_singleton(/* NORMAL */3, num$11, neg$11)
+          ];
       case 19 :
           const word = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos);
           unicode_fix_cols(lexbuf);
           try {
             return [
-                    env,
-                    Stdlib__Hashtbl.find(type_keywords, word)
-                  ];
+              env,
+              Stdlib__Hashtbl.find(type_keywords, word)
+            ];
           }
           catch (raw_exn){
             const exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn$2.MEL_EXN_ID === Stdlib.Not_found) {
               return [
-                      env,
-                      /* T_IDENTIFIER */0
-                    ];
+                env,
+                /* T_IDENTIFIER */0
+              ];
             }
             throw new Caml_js_exceptions.MelangeError(exn$2.MEL_EXN_ID, exn$2);
           }
       case 22 :
           return [
-                  env,
-                  /* T_LCURLY */1
-                ];
+            env,
+            /* T_LCURLY */1
+          ];
       case 23 :
           return [
-                  env,
-                  /* T_RCURLY */2
-                ];
+            env,
+            /* T_RCURLY */2
+          ];
       case 24 :
           return [
-                  env,
-                  /* T_LPAREN */3
-                ];
+            env,
+            /* T_LPAREN */3
+          ];
       case 25 :
           return [
-                  env,
-                  /* T_RPAREN */4
-                ];
+            env,
+            /* T_RPAREN */4
+          ];
       case 26 :
           return [
-                  env,
-                  /* T_ELLIPSIS */11
-                ];
+            env,
+            /* T_ELLIPSIS */11
+          ];
       case 27 :
           return [
-                  env,
-                  /* T_PERIOD */9
-                ];
+            env,
+            /* T_PERIOD */9
+          ];
       case 28 :
           return [
-                  env,
-                  /* T_SEMICOLON */7
-                ];
+            env,
+            /* T_SEMICOLON */7
+          ];
       case 29 :
           return [
-                  env,
-                  /* T_COMMA */8
-                ];
+            env,
+            /* T_COMMA */8
+          ];
       case 20 :
       case 32 :
           return [
-                  env,
-                  /* T_LBRACKET */5
-                ];
+            env,
+            /* T_LBRACKET */5
+          ];
       case 21 :
       case 33 :
           return [
-                  env,
-                  /* T_RBRACKET */6
-                ];
+            env,
+            /* T_RBRACKET */6
+          ];
       case 34 :
           return [
-                  env,
-                  /* T_LESS_THAN */89
-                ];
+            env,
+            /* T_LESS_THAN */89
+          ];
       case 35 :
           return [
-                  env,
-                  /* T_GREATER_THAN */90
-                ];
+            env,
+            /* T_GREATER_THAN */90
+          ];
       case 31 :
       case 37 :
           return [
-                  env,
-                  /* T_PLING */76
-                ];
+            env,
+            /* T_PLING */76
+          ];
       case 38 :
           return [
-                  env,
-                  /* T_MULT */97
-                ];
+            env,
+            /* T_MULT */97
+          ];
       case 30 :
       case 39 :
           return [
-                  env,
-                  /* T_COLON */77
-                ];
+            env,
+            /* T_COLON */77
+          ];
       case 40 :
           return [
-                  env,
-                  /* T_BIT_OR */80
-                ];
+            env,
+            /* T_BIT_OR */80
+          ];
       case 41 :
           return [
-                  env,
-                  /* T_BIT_AND */82
-                ];
+            env,
+            /* T_BIT_AND */82
+          ];
       case 42 :
           return [
-                  env,
-                  /* T_TYPEOF */44
-                ];
+            env,
+            /* T_TYPEOF */44
+          ];
       case 43 :
           return [
-                  env,
-                  /* T_ARROW */10
-                ];
+            env,
+            /* T_ARROW */10
+          ];
       case 36 :
       case 44 :
           return [
-                  env,
-                  /* T_ASSIGN */75
-                ];
+            env,
+            /* T_ASSIGN */75
+          ];
       case 45 :
           return [
-                  env,
-                  /* T_PLUS */94
-                ];
+            env,
+            /* T_PLUS */94
+          ];
       case 46 :
           return [
-                  env,
-                  /* T_MINUS */95
-                ];
+            env,
+            /* T_MINUS */95
+          ];
       case 47 :
           let env$9;
           if (env.lex_in_comment_syntax) {
@@ -5209,14 +5209,14 @@ function type_token(env, lexbuf) {
             env$9 = env;
           }
           return [
-                  env$9,
-                  /* T_EOF */105
-                ];
+            env$9,
+            /* T_EOF */105
+          ];
       case 48 :
           return [
-                  env,
-                  /* T_ERROR */104
-                ];
+            env,
+            /* T_ERROR */104
+          ];
       default:
         Curry._1(lexbuf.refill_buff, lexbuf);
         ___ocaml_lex_state = __ocaml_lex_state$1;
@@ -5233,9 +5233,9 @@ function __ocaml_lex_regexp_rec(_env, lexbuf, ___ocaml_lex_state) {
     switch (__ocaml_lex_state$1) {
       case 0 :
           return [
-                  env,
-                  /* T_EOF */105
-                ];
+            env,
+            /* T_EOF */105
+          ];
       case 1 :
           Stdlib__Lexing.new_line(lexbuf);
           ___ocaml_lex_state = 291;
@@ -5268,25 +5268,25 @@ function __ocaml_lex_regexp_rec(_env, lexbuf, ___ocaml_lex_state) {
           const end_ = from_lb(env$3.lex_source, lexbuf);
           const loc = btwn(start$2, end_);
           return [
-                  env$3,
-                  {
-                    TAG: /* T_REGEXP */3,
-                    _0: [
-                      loc,
-                      Stdlib__Buffer.contents(buf$2),
-                      match$2[1]
-                    ]
-                  }
-                ];
+            env$3,
+            {
+              TAG: /* T_REGEXP */3,
+              _0: [
+                loc,
+                Stdlib__Buffer.contents(buf$2),
+                match$2[1]
+              ]
+            }
+          ];
       case 6 :
           const env$4 = lex_error(env, from_lb(env.lex_source, lexbuf), {
                 TAG: /* UnexpectedToken */1,
                 _0: "ILLEGAL"
               });
           return [
-                  env$4,
-                  /* T_ERROR */104
-                ];
+            env$4,
+            /* T_ERROR */104
+          ];
       default:
         Curry._1(lexbuf.refill_buff, lexbuf);
         ___ocaml_lex_state = __ocaml_lex_state$1;
@@ -5305,16 +5305,16 @@ function regexp_body(env, buf, lexbuf) {
           const loc = from_lb(env.lex_source, lexbuf);
           const env$1 = lex_error(env, loc, /* UnterminatedRegExp */13);
           return [
-                  env$1,
-                  ""
-                ];
+            env$1,
+            ""
+          ];
       case 1 :
           const loc$1 = from_lb(env.lex_source, lexbuf);
           const env$2 = lex_error(env, loc$1, /* UnterminatedRegExp */13);
           return [
-                  env$2,
-                  ""
-                ];
+            env$2,
+            ""
+          ];
       case 2 :
           const s = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_start_pos + 2 | 0);
           Stdlib__Buffer.add_string(buf, s);
@@ -5322,14 +5322,14 @@ function regexp_body(env, buf, lexbuf) {
       case 3 :
           const flags = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos + 1 | 0, lexbuf.lex_curr_pos);
           return [
-                  env,
-                  flags
-                ];
+            env,
+            flags
+          ];
       case 4 :
           return [
-                  env,
-                  ""
-                ];
+            env,
+            ""
+          ];
       case 5 :
           const c = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos);
           Stdlib__Buffer.add_char(buf, c);
@@ -5339,9 +5339,9 @@ function regexp_body(env, buf, lexbuf) {
           const loc$2 = from_lb(env.lex_source, lexbuf);
           const env$4 = lex_error(env, loc$2, /* UnterminatedRegExp */13);
           return [
-                  env$4,
-                  ""
-                ];
+            env$4,
+            ""
+          ];
       case 7 :
           const c$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos);
           Stdlib__Buffer.add_char(buf, c$1);
@@ -5369,31 +5369,31 @@ function jsx_child(env, start, buf, raw, lexbuf) {
           const value = Stdlib__Buffer.contents(buf);
           const raw$1 = Stdlib__Buffer.contents(raw);
           return [
-                  match[0],
-                  {
-                    TAG: /* T_JSX_TEXT */4,
-                    _0: [
-                      btwn(start, match[1]),
-                      value,
-                      raw$1
-                    ]
-                  }
-                ];
+            match[0],
+            {
+              TAG: /* T_JSX_TEXT */4,
+              _0: [
+                btwn(start, match[1]),
+                value,
+                raw$1
+              ]
+            }
+          ];
       case 1 :
           return [
-                  env,
-                  /* T_EOF */105
-                ];
+            env,
+            /* T_EOF */105
+          ];
       case 2 :
           return [
-                  env,
-                  /* T_LESS_THAN */89
-                ];
+            env,
+            /* T_LESS_THAN */89
+          ];
       case 3 :
           return [
-                  env,
-                  /* T_LCURLY */1
-                ];
+            env,
+            /* T_LCURLY */1
+          ];
       case 4 :
           const c = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos);
           Stdlib__Buffer.add_char(raw, c);
@@ -5402,16 +5402,16 @@ function jsx_child(env, start, buf, raw, lexbuf) {
           const value$1 = Stdlib__Buffer.contents(buf);
           const raw$2 = Stdlib__Buffer.contents(raw);
           return [
-                  match$1[0],
-                  {
-                    TAG: /* T_JSX_TEXT */4,
-                    _0: [
-                      btwn(start, match$1[1]),
-                      value$1,
-                      raw$2
-                    ]
-                  }
-                ];
+            match$1[0],
+            {
+              TAG: /* T_JSX_TEXT */4,
+              _0: [
+                btwn(start, match$1[1]),
+                value$1,
+                raw$2
+              ]
+            }
+          ];
       default:
         Curry._1(lexbuf.refill_buff, lexbuf);
         ___ocaml_lex_state = __ocaml_lex_state$1;
@@ -5430,9 +5430,9 @@ function jsx_child$1(env) {
   const raw = Stdlib__Buffer.create(127);
   const match = jsx_child(env, start, buf, raw, env.lex_lb);
   return get_result_and_clear_state([
-              match[0],
-              match[1]
-            ]);
+        match[0],
+        match[1]
+      ]);
 }
 
 function jsx_tag(env) {
@@ -5469,12 +5469,12 @@ function create(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r.h;
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, v, r) {
@@ -5485,9 +5485,9 @@ function bal(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const lr = l.r;
     const lv = l.v;
@@ -5499,24 +5499,24 @@ function bal(l, v, r) {
       return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   const rr = r.r;
   const rv = r.v;
@@ -5528,20 +5528,20 @@ function bal(l, v, r) {
     return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Set.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Set.bal"
+      });
 }
 
 function add(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = t.r;
   const v = t.v;
@@ -5599,11 +5599,11 @@ function create$1(lex_env, mode) {
   };
   const lex_env$1 = with_lexbuf(lexbuf$1, lex_env);
   return {
-          la_results: [],
-          la_num_lexed: 0,
-          la_lex_mode: mode,
-          la_lex_env: lex_env$1
-        };
+    la_results: [],
+    la_num_lexed: 0,
+    la_lex_mode: mode,
+    la_lex_env: lex_env$1
+  };
 }
 
 function next_power_of_two(n) {
@@ -5717,48 +5717,48 @@ function init_env(token_sinkOpt, parse_optionsOpt, source, content) {
   const enable_types_in_comments = parse_options$1.types;
   const lex_env = new_lex_env(source, lb, enable_types_in_comments);
   return {
-          errors: {
-            contents: /* [] */0
-          },
-          comments: {
-            contents: /* [] */0
-          },
-          labels: /* Empty */0,
-          exports: {
-            contents: /* Empty */0
-          },
-          last_loc: {
-            contents: undefined
-          },
-          in_strict_mode: parse_options$1.use_strict,
-          in_export: false,
-          in_loop: false,
-          in_switch: false,
-          in_function: false,
-          no_in: false,
-          no_call: false,
-          no_let: false,
-          allow_yield: true,
-          allow_await: false,
-          error_callback: undefined,
-          lex_mode_stack: {
-            contents: {
-              hd: /* NORMAL */0,
-              tl: /* [] */0
-            }
-          },
-          lex_env: {
-            contents: lex_env
-          },
-          lookahead: {
-            contents: create$1(lex_env, /* NORMAL */0)
-          },
-          token_sink: {
-            contents: token_sink
-          },
-          parse_options: parse_options$1,
-          source: source
-        };
+    errors: {
+      contents: /* [] */0
+    },
+    comments: {
+      contents: /* [] */0
+    },
+    labels: /* Empty */0,
+    exports: {
+      contents: /* Empty */0
+    },
+    last_loc: {
+      contents: undefined
+    },
+    in_strict_mode: parse_options$1.use_strict,
+    in_export: false,
+    in_loop: false,
+    in_switch: false,
+    in_function: false,
+    no_in: false,
+    no_call: false,
+    no_let: false,
+    allow_yield: true,
+    allow_await: false,
+    error_callback: undefined,
+    lex_mode_stack: {
+      contents: {
+        hd: /* NORMAL */0,
+        tl: /* [] */0
+      }
+    },
+    lex_env: {
+      contents: lex_env
+    },
+    lookahead: {
+      contents: create$1(lex_env, /* NORMAL */0)
+    },
+    token_sink: {
+      contents: token_sink
+    },
+    parse_options: parse_options$1,
+    source: source
+  };
 }
 
 function error_at(env, param) {
@@ -5780,11 +5780,11 @@ function error_at(env, param) {
 function comment_list(env) {
   return function (param) {
     return Stdlib__List.iter((function (c) {
-                  env.comments.contents = {
-                    hd: c,
-                    tl: env.comments.contents
-                  };
-                }), param);
+            env.comments.contents = {
+              hd: c,
+              tl: env.comments.contents
+            };
+          }), param);
   };
 }
 
@@ -5793,12 +5793,12 @@ function record_export(env, param) {
   const $$exports = env.exports.contents;
   if (Curry._2(mem, export_name, $$exports)) {
     return error_at(env, [
-                param[0],
-                {
-                  TAG: /* DuplicateExport */7,
-                  _0: export_name
-                }
-              ]);
+          param[0],
+          {
+            TAG: /* DuplicateExport */7,
+            _0: export_name
+          }
+        ]);
   } else {
     env.exports.contents = Curry._2(add, export_name, env.exports.contents);
     return ;
@@ -5809,13 +5809,13 @@ function lookahead(iOpt, env) {
   const i = iOpt !== undefined ? iOpt : 0;
   if (i >= 2) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "parser_env.ml",
-                288,
-                2
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "parser_env.ml",
+            288,
+            2
+          ]
+        });
   }
   let t = env.lookahead.contents;
   lex_until(t, i);
@@ -5824,9 +5824,9 @@ function lookahead(iOpt, env) {
     return match[1];
   }
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: "Lookahead.peek failed"
-          });
+        MEL_EXN_ID: "Failure",
+        _1: "Lookahead.peek failed"
+      });
 }
 
 function with_strict(in_strict_mode, env) {
@@ -5892,8 +5892,8 @@ function with_error_callback(error_callback, env) {
 function error_list(env) {
   return function (param) {
     return Stdlib__List.iter((function (param) {
-                  return error_at(env, param);
-                }), param);
+            return error_at(env, param);
+          }), param);
   };
 }
 
@@ -5988,9 +5988,9 @@ function lex_env(iOpt, env) {
     return match[0];
   }
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: "Lookahead.peek failed"
-          });
+        MEL_EXN_ID: "Failure",
+        _1: "Lookahead.peek failed"
+      });
 }
 
 function is_line_terminator(env) {
@@ -6113,9 +6113,9 @@ function get_unexpected_error(param) {
     return /* StrictReservedWord */39;
   } else {
     return {
-            TAG: /* UnexpectedToken */1,
-            _0: param[1]
-          };
+      TAG: /* UnexpectedToken */1,
+      _0: param[1]
+    };
   }
 }
 
@@ -6130,11 +6130,11 @@ function error_unexpected(env) {
 function error_on_decorators(env) {
   return function (param) {
     return Stdlib__List.iter((function (decorator) {
-                  error_at(env, [
-                        decorator[0],
-                        /* UnsupportedDecorator */57
-                      ]);
-                }), param);
+            error_at(env, [
+                  decorator[0],
+                  /* UnsupportedDecorator */57
+                ]);
+          }), param);
   };
 }
 
@@ -6148,9 +6148,9 @@ function strict_error(env, e) {
 function strict_error_at(env, param) {
   if (env.in_strict_mode) {
     return error_at(env, [
-                param[0],
-                param[1]
-              ]);
+          param[0],
+          param[1]
+        ]);
   }
   
 }
@@ -6196,9 +6196,9 @@ function pop_lex_mode(env) {
     new_stack = match.tl;
   } else {
     throw new Caml_js_exceptions.MelangeError("Failure", {
-              MEL_EXN_ID: "Failure",
-              _1: "Popping lex mode from empty stack"
-            });
+          MEL_EXN_ID: "Failure",
+          _1: "Popping lex mode from empty stack"
+        });
   }
   env.lex_mode_stack.contents = new_stack;
   env.lookahead.contents = create$1(env.lex_env.contents, Stdlib__List.hd(env.lex_mode_stack.contents));
@@ -6213,15 +6213,15 @@ function double_pop_lex_mode(env) {
       new_stack = match$1.tl;
     } else {
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: "Popping lex mode from empty stack"
-              });
+            MEL_EXN_ID: "Failure",
+            _1: "Popping lex mode from empty stack"
+          });
     }
   } else {
     throw new Caml_js_exceptions.MelangeError("Failure", {
-              MEL_EXN_ID: "Failure",
-              _1: "Popping lex mode from empty stack"
-            });
+          MEL_EXN_ID: "Failure",
+          _1: "Popping lex mode from empty stack"
+        });
   }
   env.lex_mode_stack.contents = new_stack;
   env.lookahead.contents = create$1(env.lex_env.contents, Stdlib__List.hd(env.lex_mode_stack.contents));
@@ -6283,13 +6283,13 @@ function save_state(env) {
     token_buffer = undefined;
   }
   return {
-          saved_errors: env.errors.contents,
-          saved_comments: env.comments.contents,
-          saved_last_loc: env.last_loc.contents,
-          saved_lex_mode_stack: env.lex_mode_stack.contents,
-          saved_lex_env: env.lex_env.contents,
-          token_buffer: token_buffer
-        };
+    saved_errors: env.errors.contents,
+    saved_comments: env.comments.contents,
+    saved_last_loc: env.last_loc.contents,
+    saved_lex_mode_stack: env.lex_mode_stack.contents,
+    saved_lex_env: env.lex_env.contents,
+    token_buffer: token_buffer
+  };
 }
 
 function reset_token_sink(flush, env, token_buffer_info) {
@@ -6310,9 +6310,9 @@ function to_parse(env, parse) {
     let result = Curry._1(parse, env);
     reset_token_sink(true, env, saved_state.token_buffer);
     return {
-            TAG: /* ParsedSuccessfully */0,
-            _0: result
-          };
+      TAG: /* ParsedSuccessfully */0,
+      _0: result
+    };
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -6367,12 +6367,12 @@ function create$2(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r.h;
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$1(l, v, r) {
@@ -6383,9 +6383,9 @@ function bal$1(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const lr = l.r;
     const lv = l.v;
@@ -6397,24 +6397,24 @@ function bal$1(l, v, r) {
       return create$2(create$2(ll, lv, lr.l), lr.v, create$2(lr.r, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   const rr = r.r;
   const rv = r.v;
@@ -6426,20 +6426,20 @@ function bal$1(l, v, r) {
     return create$2(create$2(l, v, rl.l), rl.v, create$2(rl.r, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Set.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Set.bal"
+      });
 }
 
 function add$1(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = t.r;
   const v = t.v;
@@ -6495,13 +6495,13 @@ function create$3(l, x, d, r) {
   const hl = height$2(l);
   const hr = height$2(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$2(l, x, d, r) {
@@ -6512,9 +6512,9 @@ function bal$2(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -6527,25 +6527,25 @@ function bal$2(l, x, d, r) {
       return create$3(create$3(ll, lv, ld, lr.l), lr.v, lr.d, create$3(lr.r, x, d, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -6558,21 +6558,21 @@ function bal$2(l, x, d, r) {
     return create$3(create$3(l, x, d, rl.l), rl.v, rl.d, create$3(rl.r, rv, rd, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add$2(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -6584,13 +6584,13 @@ function add$2(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -6614,8 +6614,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg$2.compare, x, param.v);
     if (c === 0) {
@@ -6653,12 +6653,12 @@ function create$4(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r.h;
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$3(l, v, r) {
@@ -6669,9 +6669,9 @@ function bal$3(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const lr = l.r;
     const lv = l.v;
@@ -6683,24 +6683,24 @@ function bal$3(l, v, r) {
       return create$4(create$4(ll, lv, lr.l), lr.v, create$4(lr.r, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   const rr = r.r;
   const rv = r.v;
@@ -6712,20 +6712,20 @@ function bal$3(l, v, r) {
     return create$4(create$4(l, v, rl.l), rl.v, create$4(rl.r, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Set.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Set.bal"
+      });
 }
 
 function add$3(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = t.r;
   const v = t.v;
@@ -6772,17 +6772,17 @@ function filter_duplicate_errors(errs) {
           const set = param[0];
           if (Curry._2(mem$2, err, set)) {
             return [
-                    set,
-                    deduped
-                  ];
+              set,
+              deduped
+            ];
           } else {
             return [
-                    Curry._2(add$3, err, set),
-                    {
-                      hd: err,
-                      tl: deduped
-                    }
-                  ];
+              Curry._2(add$3, err, set),
+              {
+                hd: err,
+                tl: deduped
+              }
+            ];
           }
         }), [
         /* Empty */0,
@@ -6800,9 +6800,9 @@ function with_loc(fn, env) {
             _0: "did not consume any tokens"
           }), Curry._2(Parser_env_Peek.loc, undefined, env));
   return [
-          btwn(start_loc, end_loc),
-          result
-        ];
+    btwn(start_loc, end_loc),
+    result
+  ];
 }
 
 const Parse = Caml_module.init_mod([
@@ -6925,12 +6925,12 @@ function prefix(env) {
   token$4(env, /* T_PLING */76);
   const t = prefix(env);
   return [
-          btwn(loc, t[0]),
-          {
-            TAG: /* Nullable */0,
-            _0: t
-          }
-        ];
+    btwn(loc, t[0]),
+    {
+      TAG: /* Nullable */0,
+      _0: t
+    }
+  ];
 }
 
 function rev_nonempty_acc(acc) {
@@ -6939,13 +6939,13 @@ function rev_nonempty_acc(acc) {
     end_loc = acc.hd[0];
   } else {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "parser_flow.ml",
-                127,
-                13
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "parser_flow.ml",
+            127,
+            13
+          ]
+        });
   }
   const acc$1 = Stdlib__List.rev(acc);
   let start_loc;
@@ -6953,18 +6953,18 @@ function rev_nonempty_acc(acc) {
     start_loc = acc$1.hd[0];
   } else {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "parser_flow.ml",
-                131,
-                13
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "parser_flow.ml",
+            131,
+            13
+          ]
+        });
   }
   return [
-          btwn(start_loc, end_loc),
-          acc$1
-        ];
+    btwn(start_loc, end_loc),
+    acc$1
+  ];
 }
 
 function intersection(env) {
@@ -6981,13 +6981,13 @@ function function_param_with_id(env, name) {
   token$4(env, /* T_COLON */77);
   const typeAnnotation = union(env);
   return [
-          btwn(name[0], typeAnnotation[0]),
-          {
-            name: name,
-            typeAnnotation: typeAnnotation,
-            optional: optional
-          }
-        ];
+    btwn(name[0], typeAnnotation[0]),
+    {
+      name: name,
+      typeAnnotation: typeAnnotation,
+      optional: optional
+    }
+  ];
 }
 
 function postfix_with(env, _t) {
@@ -7015,12 +7015,12 @@ function postfix_with(env, _t) {
 function generic_type_with_identifier(env, id) {
   const match = Curry._2(raw_generic_with_identifier, env, id);
   return [
-          match[0],
-          {
-            TAG: /* Generic */4,
-            _0: match[1]
-          }
-        ];
+    match[0],
+    {
+      TAG: /* Generic */4,
+      _0: match[1]
+    }
+  ];
 }
 
 function param_list_or_type(env) {
@@ -7136,21 +7136,21 @@ function primary(env) {
       case /* T_IDENTIFIER */0 :
           const match = generic(env);
           return [
-                  match[0],
-                  {
-                    TAG: /* Generic */4,
-                    _0: match[1]
-                  }
-                ];
+            match[0],
+            {
+              TAG: /* Generic */4,
+              _0: match[1]
+            }
+          ];
       case /* T_LCURLY */1 :
           const match$1 = Curry._2(_object, undefined, env);
           return [
-                  match$1[0],
-                  {
-                    TAG: /* Object */2,
-                    _0: match$1[1]
-                  }
-                ];
+            match$1[0],
+            {
+              TAG: /* Object */2,
+              _0: match$1[1]
+            }
+          ];
       case /* T_LPAREN */3 :
           const start_loc = Curry._2(Parser_env_Peek.loc, undefined, env);
           const _type = param_list_or_type(env);
@@ -7162,17 +7162,17 @@ function primary(env) {
           const returnType = union(env);
           const end_loc = returnType[0];
           return [
-                  btwn(start_loc, end_loc),
-                  {
-                    TAG: /* Function */1,
-                    _0: {
-                      params: match$2[1],
-                      returnType: returnType,
-                      rest: match$2[0],
-                      typeParameters: undefined
-                    }
-                  }
-                ];
+            btwn(start_loc, end_loc),
+            {
+              TAG: /* Function */1,
+              _0: {
+                params: match$2[1],
+                returnType: returnType,
+                rest: match$2[0],
+                typeParameters: undefined
+              }
+            }
+          ];
       case /* T_LBRACKET */5 :
           const start_loc$1 = Curry._2(Parser_env_Peek.loc, undefined, env);
           token$4(env, /* T_LBRACKET */5);
@@ -7180,12 +7180,12 @@ function primary(env) {
           const end_loc$1 = Curry._2(Parser_env_Peek.loc, undefined, env);
           token$4(env, /* T_RBRACKET */6);
           return [
-                  btwn(start_loc$1, end_loc$1),
-                  {
-                    TAG: /* Tuple */8,
-                    _0: tl
-                  }
-                ];
+            btwn(start_loc$1, end_loc$1),
+            {
+              TAG: /* Tuple */8,
+              _0: tl
+            }
+          ];
       case /* T_FALSE */28 :
       case /* T_TRUE */29 :
           exit = 2;
@@ -7195,12 +7195,12 @@ function primary(env) {
           token$4(env, /* T_TYPEOF */44);
           const t = primary(env);
           return [
-                  btwn(start_loc$2, t[0]),
-                  {
-                    TAG: /* Typeof */7,
-                    _0: t
-                  }
-                ];
+            btwn(start_loc$2, t[0]),
+            {
+              TAG: /* Typeof */7,
+              _0: t
+            }
+          ];
       case /* T_LESS_THAN */89 :
           const start_loc$3 = Curry._2(Parser_env_Peek.loc, undefined, env);
           const typeParameters = Curry._2(type_parameter_declaration, false, env);
@@ -7209,23 +7209,23 @@ function primary(env) {
           const returnType$1 = union(env);
           const end_loc$2 = returnType$1[0];
           return [
-                  btwn(start_loc$3, end_loc$2),
-                  {
-                    TAG: /* Function */1,
-                    _0: {
-                      params: match$3[1],
-                      returnType: returnType$1,
-                      rest: match$3[0],
-                      typeParameters: typeParameters
-                    }
-                  }
-                ];
+            btwn(start_loc$3, end_loc$2),
+            {
+              TAG: /* Function */1,
+              _0: {
+                params: match$3[1],
+                returnType: returnType$1,
+                rest: match$3[0],
+                typeParameters: typeParameters
+              }
+            }
+          ];
       case /* T_MULT */97 :
           token$4(env, /* T_MULT */97);
           return [
-                  loc,
-                  /* Exists */6
-                ];
+            loc,
+            /* Exists */6
+          ];
       default:
         exit = 1;
     }
@@ -7250,15 +7250,15 @@ function primary(env) {
                 ]
               });
           return [
-                  loc$1,
-                  {
-                    TAG: /* StringLiteral */9,
-                    _0: {
-                      value: value,
-                      raw: raw
-                    }
-                  }
-                ];
+            loc$1,
+            {
+              TAG: /* StringLiteral */9,
+              _0: {
+                value: value,
+                raw: raw
+              }
+            }
+          ];
       case /* T_NUMBER_SINGLETON_TYPE */5 :
           const value$1 = token$5._1;
           const number_type = token$5._0;
@@ -7272,15 +7272,15 @@ function primary(env) {
             strict_error(env, /* StrictOctalLiteral */31);
           }
           return [
-                  loc,
-                  {
-                    TAG: /* NumberLiteral */10,
-                    _0: {
-                      value: value$1,
-                      raw: raw$1
-                    }
-                  }
-                ];
+            loc,
+            {
+              TAG: /* NumberLiteral */10,
+              _0: {
+                value: value$1,
+                raw: raw$1
+              }
+            }
+          ];
       default:
         exit = 1;
     }
@@ -7291,30 +7291,30 @@ function primary(env) {
         if (t$1 !== undefined) {
           token$4(env, token$5);
           return [
-                  loc,
-                  t$1
-                ];
+            loc,
+            t$1
+          ];
         } else {
           error_unexpected(env);
           return [
-                  loc,
-                  /* Any */0
-                ];
+            loc,
+            /* Any */0
+          ];
         }
     case 2 :
         const raw$2 = Curry._2(Parser_env_Peek.value, undefined, env);
         token$4(env, token$5);
         const value$2 = Caml_obj.caml_equal(token$5, /* T_TRUE */29);
         return [
-                loc,
-                {
-                  TAG: /* BooleanLiteral */11,
-                  _0: {
-                    value: value$2,
-                    raw: raw$2
-                  }
-                }
-              ];
+          loc,
+          {
+            TAG: /* BooleanLiteral */11,
+            _0: {
+              value: value$2,
+              raw: raw$2
+            }
+          }
+        ];
     
   }
 }
@@ -7360,19 +7360,19 @@ function function_param_or_generic_type(env) {
   switch (exit) {
     case 1 :
         return {
-                TAG: /* Type */1,
-                _0: Curry._2(union_with, env, Curry._2(intersection_with, env, postfix_with(env, generic_type_with_identifier(env, id))))
-              };
+          TAG: /* Type */1,
+          _0: Curry._2(union_with, env, Curry._2(intersection_with, env, postfix_with(env, generic_type_with_identifier(env, id))))
+        };
     case 2 :
         const param = function_param_with_id(env, id);
         maybe(env, /* T_COMMA */8);
         return {
-                TAG: /* ParamList */0,
-                _0: Curry._2(function_param_list_without_parens, env, {
-                      hd: param,
-                      tl: /* [] */0
-                    })
-              };
+          TAG: /* ParamList */0,
+          _0: Curry._2(function_param_list_without_parens, env, {
+                hd: param,
+                tl: /* [] */0
+              })
+        };
     
   }
 }
@@ -7405,12 +7405,12 @@ function union_with(env, left) {
       }
       const match$1 = rev_nonempty_acc(acc);
       return [
-              match$1[0],
-              {
-                TAG: /* Union */5,
-                _0: match$1[1]
-              }
-            ];
+        match$1[0],
+        {
+          TAG: /* Union */5,
+          _0: match$1[1]
+        }
+      ];
     };
   } else {
     return left;
@@ -7436,12 +7436,12 @@ function intersection_with(env, left) {
       }
       const match$1 = rev_nonempty_acc(acc);
       return [
-              match$1[0],
-              {
-                TAG: /* Intersection */6,
-                _0: match$1[1]
-              }
-            ];
+        match$1[0],
+        {
+          TAG: /* Intersection */6,
+          _0: match$1[1]
+        }
+      ];
     };
   } else {
     return left;
@@ -7488,9 +7488,9 @@ function function_param_list_without_parens(env) {
         case 2 :
             const rest = Caml_obj.caml_equal(t, /* T_ELLIPSIS */11) ? (token$4(env, /* T_ELLIPSIS */11), param(env)) : undefined;
             return [
-                    rest,
-                    Stdlib__List.rev(acc)
-                  ];
+              rest,
+              Stdlib__List.rev(acc)
+            ];
         
       }
     };
@@ -7504,9 +7504,9 @@ function identifier(env, _param) {
     const q_loc = param[0];
     if (!Caml_obj.caml_equal(Curry._2(Parser_env_Peek.token, undefined, env), /* T_PERIOD */9)) {
       return [
-              q_loc,
-              qualification
-            ];
+        q_loc,
+        qualification
+      ];
     }
     token$4(env, /* T_PERIOD */9);
     const id = Curry._2(Parse.identifier, undefined, env);
@@ -7544,12 +7544,12 @@ function raw_generic_with_identifier(env, id) {
   const typeParameters = Curry._1(type_parameter_instantiation, env);
   const loc = typeParameters !== undefined ? btwn(id_loc, typeParameters[0]) : id_loc;
   return [
-          loc,
-          {
-            id: match[1],
-            typeParameters: typeParameters
-          }
-        ];
+    loc,
+    {
+      id: match[1],
+      typeParameters: typeParameters
+    }
+  ];
 }
 
 function params(env, _acc) {
@@ -7588,11 +7588,11 @@ function type_parameter_instantiation(env) {
   const loc = btwn(start_loc, Curry._2(Parser_env_Peek.loc, undefined, env));
   token$4(env, /* T_GREATER_THAN */90);
   return [
-          loc,
-          {
-            params: params$1
-          }
-        ];
+    loc,
+    {
+      params: params$1
+    }
+  ];
 }
 
 function params$1(env, allow_default, _require_default, _acc) {
@@ -7699,11 +7699,11 @@ function type_parameter_declaration(allow_default, env) {
   const loc = btwn(start_loc, Curry._2(Parser_env_Peek.loc, undefined, env));
   token$4(env, /* T_GREATER_THAN */90);
   return [
-          loc,
-          {
-            params: params$2
-          }
-        ];
+    loc,
+    {
+      params: params$2
+    }
+  ];
 }
 
 function types(env, _acc) {
@@ -7739,14 +7739,14 @@ function methodish(env, start_loc) {
   const returnType = union(env);
   const loc = btwn(start_loc, returnType[0]);
   return [
-          loc,
-          {
-            params: match[1],
-            returnType: returnType,
-            rest: match[0],
-            typeParameters: typeParameters
-          }
-        ];
+    loc,
+    {
+      params: match[1],
+      returnType: returnType,
+      rest: match[0],
+      typeParameters: typeParameters
+    }
+  ];
 }
 
 function method_property(env, start_loc, $$static, key) {
@@ -7761,26 +7761,26 @@ function method_property(env, start_loc, $$static, key) {
     value_1
   ];
   return [
-          value_0,
-          {
-            key: key,
-            value: value$1,
-            optional: false,
-            static: $$static,
-            _method: true
-          }
-        ];
+    value_0,
+    {
+      key: key,
+      value: value$1,
+      optional: false,
+      static: $$static,
+      _method: true
+    }
+  ];
 }
 
 function call_property(env, start_loc, $$static) {
   const value = methodish(env, Curry._2(Parser_env_Peek.loc, undefined, env));
   return [
-          btwn(start_loc, value[0]),
-          {
-            value: value,
-            static: $$static
-          }
-        ];
+    btwn(start_loc, value[0]),
+    {
+      value: value,
+      static: $$static
+    }
+  ];
 }
 
 function property(env, start_loc, $$static, key) {
@@ -7791,15 +7791,15 @@ function property(env, start_loc, $$static, key) {
   token$4(env, /* T_COLON */77);
   const value = union(env);
   return [
-          btwn(start_loc, value[0]),
-          {
-            key: key,
-            value: value,
-            optional: optional,
-            static: $$static,
-            _method: false
-          }
-        ];
+    btwn(start_loc, value[0]),
+    {
+      key: key,
+      value: value,
+      optional: optional,
+      static: $$static,
+      _method: false
+    }
+  ];
 }
 
 function indexer_property(env, start_loc, $$static) {
@@ -7811,14 +7811,14 @@ function indexer_property(env, start_loc, $$static) {
   token$4(env, /* T_COLON */77);
   const value = union(env);
   return [
-          btwn(start_loc, value[0]),
-          {
-            id: match[0],
-            key: key,
-            value: value,
-            static: $$static
-          }
-        ];
+    btwn(start_loc, value[0]),
+    {
+      id: match[0],
+      key: key,
+      value: value,
+      static: $$static
+    }
+  ];
 }
 
 function semicolon$1(env) {
@@ -7944,10 +7944,10 @@ function properties(allow_static, env, _param) {
           continue ;
       case 2 :
           return [
-                  Stdlib__List.rev(acc),
-                  Stdlib__List.rev(indexers),
-                  Stdlib__List.rev(callProperties)
-                ];
+            Stdlib__List.rev(acc),
+            Stdlib__List.rev(indexers),
+            Stdlib__List.rev(callProperties)
+          ];
       case 3 :
           const call_prop = call_property(env, start_loc, $$static);
           semicolon$1(env);
@@ -7977,13 +7977,13 @@ function _object(allow_staticOpt, env) {
   const end_loc = Curry._2(Parser_env_Peek.loc, undefined, env);
   token$4(env, /* T_RCURLY */2);
   return [
-          btwn(start_loc, end_loc),
-          {
-            properties: match[0],
-            indexers: match[1],
-            callProperties: match[2]
-          }
-        ];
+    btwn(start_loc, end_loc),
+    {
+      properties: match[0],
+      indexers: match[1],
+      callProperties: match[2]
+    }
+  ];
 }
 
 const _type = union;
@@ -8001,18 +8001,18 @@ function annotation(env) {
     end_loc = loc;
   } else {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "parser_flow.ml",
-                121,
-                16
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "parser_flow.ml",
+            121,
+            16
+          ]
+        });
   }
   return [
-          btwn(start_loc, end_loc),
-          typeAnnotation
-        ];
+    btwn(start_loc, end_loc),
+    typeAnnotation
+  ];
 }
 
 function annotation_opt(env) {
@@ -8078,9 +8078,9 @@ function pattern(check_env, _param) {
                 param_names
               ], id);
           return [
-                  match[0],
-                  Curry._2(add$1, name, match[1])
-                ];
+            match[0],
+            Curry._2(add$1, name, match[1])
+          ];
       case /* Expression */4 :
           error_at(check_env[0], [
                 param[0],
@@ -8145,9 +8145,9 @@ function identifier_no_dupe_check(param, param$1) {
         ]);
   }
   return [
-          env,
-          param[1]
-        ];
+    env,
+    param[1]
+  ];
 }
 
 function strict_post_check(env, strict, simple, id, params) {
@@ -8182,16 +8182,16 @@ function param$1(env) {
   const id = Curry._2(Parse.pattern, env, /* StrictParamName */28);
   if (!Caml_obj.caml_equal(Curry._2(Parser_env_Peek.token, undefined, env), /* T_ASSIGN */75)) {
     return [
-            id,
-            undefined
-          ];
+      id,
+      undefined
+    ];
   }
   token$4(env, /* T_ASSIGN */75);
   const $$default = Curry._1(Parse.assignment, env);
   return [
-          id,
-          $$default
-        ];
+    id,
+    $$default
+  ];
 }
 
 function param_list(env, _param) {
@@ -8241,10 +8241,10 @@ function param_list(env, _param) {
             error$1(env, /* ParameterAfterRestParameter */47);
           }
           return [
-                  Stdlib__List.rev(params),
-                  has_default ? Stdlib__List.rev(defaults) : /* [] */0,
-                  rest
-                ];
+            Stdlib__List.rev(params),
+            has_default ? Stdlib__List.rev(defaults) : /* [] */0,
+            rest
+          ];
       
     }
   };
@@ -8259,10 +8259,10 @@ function function_params(env) {
       ]);
   token$4(env, /* T_RPAREN */4);
   return [
-          match[0],
-          match[1],
-          match[2]
-        ];
+    match[0],
+    match[1],
+    match[2]
+  ];
 }
 
 function function_body(env, async, generator) {
@@ -8270,16 +8270,16 @@ function function_body(env, async, generator) {
   const match = Curry._1(Parse.function_block_body, env$1);
   const loc = match[0];
   return [
-          loc,
-          {
-            TAG: /* BodyBlock */0,
-            _0: [
-              loc,
-              match[1]
-            ]
-          },
-          match[2]
-        ];
+    loc,
+    {
+      TAG: /* BodyBlock */0,
+      _0: [
+        loc,
+        match[1]
+      ]
+    },
+    match[2]
+  ];
 }
 
 function generator(env, is_async) {
@@ -8366,24 +8366,24 @@ function _function(env) {
       true
     ];
   return [
-          btwn(start_loc, match$5[0]),
-          {
-            TAG: /* FunctionDeclaration */18,
-            _0: {
-              id: id$2,
-              params: params,
-              defaults: defaults,
-              rest: rest,
-              body: body,
-              async: async,
-              generator: generator$1,
-              predicate: predicate,
-              expression: match$5[1],
-              returnType: returnType,
-              typeParameters: match$2[0]
-            }
-          }
-        ];
+    btwn(start_loc, match$5[0]),
+    {
+      TAG: /* FunctionDeclaration */18,
+      _0: {
+        id: id$2,
+        params: params,
+        defaults: defaults,
+        rest: rest,
+        body: body,
+        async: async,
+        generator: generator$1,
+        predicate: predicate,
+        expression: match$5[1],
+        returnType: returnType,
+        typeParameters: match$2[0]
+      }
+    }
+  ];
 }
 
 function variable_declaration(env) {
@@ -8413,15 +8413,15 @@ function variable_declaration(env) {
   const init = match[0];
   const end_loc = init !== undefined ? init[0] : id[0];
   return [
-          [
-            btwn(id[0], end_loc),
-            {
-              id: id,
-              init: init
-            }
-          ],
-          match[1]
-        ];
+    [
+      btwn(id[0], end_loc),
+      {
+        id: id,
+        init: init
+      }
+    ],
+    match[1]
+  ];
 }
 
 function helper(env, _decls, _errs) {
@@ -8445,10 +8445,10 @@ function helper(env, _decls, _errs) {
     const declarations = Stdlib__List.rev(decls$1);
     const start_loc = decl[0];
     return [
-            btwn(start_loc, end_loc),
-            declarations,
-            Stdlib__List.rev(errs$1)
-          ];
+      btwn(start_loc, end_loc),
+      declarations,
+      Stdlib__List.rev(errs$1)
+    ];
   };
 }
 
@@ -8457,15 +8457,15 @@ function declarations(token$5, kind, env) {
   token$4(env, token$5);
   const match = helper(env, /* [] */0, /* [] */0);
   return [
-          [
-            btwn(start_loc, match[0]),
-            {
-              declarations: match[1],
-              kind: kind
-            }
-          ],
-          match[2]
-        ];
+    [
+      btwn(start_loc, match[0]),
+      {
+        declarations: match[1],
+        kind: kind
+      }
+    ],
+    match[2]
+  ];
 }
 
 function $$const(env) {
@@ -8478,21 +8478,21 @@ function $$const(env) {
             return errs;
           } else {
             return {
-                    hd: [
-                      decl[0],
-                      /* NoUninitializedConst */42
-                    ],
-                    tl: errs
-                  };
+              hd: [
+                decl[0],
+                /* NoUninitializedConst */42
+              ],
+              tl: errs
+            };
           }
         }), match[1], variable.declarations);
   return [
-          [
-            match$1[0],
-            variable
-          ],
-          Stdlib__List.rev(errs)
-        ];
+    [
+      match$1[0],
+      variable
+    ],
+    Stdlib__List.rev(errs)
+  ];
 }
 
 function _let(env) {
@@ -8525,15 +8525,15 @@ function variable(env) {
   }
   const match$2 = match$1[0];
   return [
-          [
-            btwn(start_loc, match$2[0]),
-            {
-              TAG: /* VariableDeclaration */19,
-              _0: match$2[1]
-            }
-          ],
-          match$1[1]
-        ];
+    [
+      btwn(start_loc, match$2[0]),
+      {
+        TAG: /* VariableDeclaration */19,
+        _0: match$2[1]
+      }
+    ],
+    match$1[1]
+  ];
 }
 
 function is_tighter(a, b) {
@@ -8641,16 +8641,16 @@ function conditional(env) {
   const match = with_loc(assignment, env);
   const loc = btwn(start_loc, match[0]);
   return [
-          loc,
-          {
-            TAG: /* Conditional */10,
-            _0: {
-              test: expr,
-              consequent: consequent,
-              alternate: match[1]
-            }
-          }
-        ];
+    loc,
+    {
+      TAG: /* Conditional */10,
+      _0: {
+        test: expr,
+        consequent: consequent,
+        alternate: match[1]
+      }
+    }
+  ];
 }
 
 function peek_unary_op(env) {
@@ -8702,16 +8702,16 @@ function unary(env) {
       
     }
     return [
-            loc,
-            {
-              TAG: /* Unary */5,
-              _0: {
-                operator: op,
-                prefix: true,
-                argument: argument
-              }
-            }
-          ];
+      loc,
+      {
+        TAG: /* Unary */5,
+        _0: {
+          operator: op,
+          prefix: true,
+          argument: argument
+        }
+      }
+    ];
   }
   const match = Curry._2(Parser_env_Peek.token, undefined, env);
   let op$1;
@@ -8769,16 +8769,16 @@ function unary(env) {
     const end_loc = Curry._2(Parser_env_Peek.loc, undefined, env);
     token$3(env);
     return [
-            btwn(argument$1[0], end_loc),
-            {
-              TAG: /* Update */8,
-              _0: {
-                operator: op$2,
-                argument: argument$1,
-                prefix: false
-              }
-            }
-          ];
+      btwn(argument$1[0], end_loc),
+      {
+        TAG: /* Update */8,
+        _0: {
+          operator: op$2,
+          argument: argument$1,
+          prefix: false
+        }
+      }
+    ];
   }
   token$3(env);
   const argument$2 = unary(env);
@@ -8796,16 +8796,16 @@ function unary(env) {
     
   }
   return [
-          btwn(begin_loc, argument$2[0]),
-          {
-            TAG: /* Update */8,
-            _0: {
-              operator: op$1,
-              argument: argument$2,
-              prefix: true
-            }
-          }
-        ];
+    btwn(begin_loc, argument$2[0]),
+    {
+      TAG: /* Update */8,
+      _0: {
+        operator: op$1,
+        argument: argument$2,
+        prefix: true
+      }
+    }
+  ];
 }
 
 function left_hand_side(env) {
@@ -8968,37 +8968,37 @@ function member(env, left) {
         const last_loc = Curry._2(Parser_env_Peek.loc, undefined, env);
         token$4(env, /* T_RBRACKET */6);
         return call(env, [
-                    btwn(left[0], last_loc),
-                    {
-                      TAG: /* Member */13,
-                      _0: {
-                        _object: left,
-                        property: {
-                          TAG: /* PropertyExpression */1,
-                          _0: expr
-                        },
-                        computed: true
-                      }
-                    }
-                  ]);
+              btwn(left[0], last_loc),
+              {
+                TAG: /* Member */13,
+                _0: {
+                  _object: left,
+                  property: {
+                    TAG: /* PropertyExpression */1,
+                    _0: expr
+                  },
+                  computed: true
+                }
+              }
+            ]);
     case /* T_PERIOD */9 :
         token$4(env, /* T_PERIOD */9);
         const match$1 = identifier_or_reserved_keyword(env);
         const id = match$1[0];
         return call(env, [
-                    btwn(left[0], id[0]),
-                    {
-                      TAG: /* Member */13,
-                      _0: {
-                        _object: left,
-                        property: {
-                          TAG: /* PropertyIdentifier */0,
-                          _0: id
-                        },
-                        computed: false
-                      }
-                    }
-                  ]);
+              btwn(left[0], id[0]),
+              {
+                TAG: /* Member */13,
+                _0: {
+                  _object: left,
+                  property: {
+                    TAG: /* PropertyIdentifier */0,
+                    _0: id
+                  },
+                  computed: false
+                }
+              }
+            ]);
     default:
       return left;
   }
@@ -9038,24 +9038,24 @@ function _function$1(env) {
   let expression;
   expression = body.TAG === /* BodyBlock */0 ? false : true;
   return [
-          btwn(start_loc, match$3[0]),
-          {
-            TAG: /* Function */2,
-            _0: {
-              id: id$1,
-              params: params,
-              defaults: defaults,
-              rest: rest,
-              body: body,
-              async: async,
-              generator: generator$1,
-              predicate: predicate,
-              expression: expression,
-              returnType: returnType,
-              typeParameters: match[1]
-            }
-          }
-        ];
+    btwn(start_loc, match$3[0]),
+    {
+      TAG: /* Function */2,
+      _0: {
+        id: id$1,
+        params: params,
+        defaults: defaults,
+        rest: rest,
+        body: body,
+        async: async,
+        generator: generator$1,
+        predicate: predicate,
+        expression: expression,
+        returnType: returnType,
+        typeParameters: match[1]
+      }
+    }
+  ];
 }
 
 function number(env, number_type) {
@@ -9101,12 +9101,12 @@ function primary$1(env) {
       case /* T_LCURLY */1 :
           const match = Curry._1(Parse.object_initializer, env);
           return [
-                  match[0],
-                  {
-                    TAG: /* Object */1,
-                    _0: match[1]
-                  }
-                ];
+            match[0],
+            {
+              TAG: /* Object */1,
+              _0: match[1]
+            }
+          ];
       case /* T_LPAREN */3 :
           token$4(env, /* T_LPAREN */3);
           const expression = Curry._1(assignment, env);
@@ -9144,31 +9144,31 @@ function primary$1(env) {
       case /* T_LBRACKET */5 :
           const match$2 = Curry._1(array_initializer, env);
           return [
-                  match$2[0],
-                  {
-                    TAG: /* Array */0,
-                    _0: match$2[1]
-                  }
-                ];
+            match$2[0],
+            {
+              TAG: /* Array */0,
+              _0: match$2[1]
+            }
+          ];
       case /* T_THIS */19 :
           token$4(env, /* T_THIS */19);
           return [
-                  loc,
-                  /* This */0
-                ];
+            loc,
+            /* This */0
+          ];
       case /* T_NULL */27 :
           const raw = Curry._2(Parser_env_Peek.value, undefined, env);
           token$4(env, /* T_NULL */27);
           return [
-                  loc,
-                  {
-                    TAG: /* Literal */19,
-                    _0: {
-                      value: /* Null */0,
-                      raw: raw
-                    }
-                  }
-                ];
+            loc,
+            {
+              TAG: /* Literal */19,
+              _0: {
+                value: /* Null */0,
+                raw: raw
+              }
+            }
+          ];
       case /* T_FALSE */28 :
       case /* T_TRUE */29 :
           exit = 2;
@@ -9188,21 +9188,21 @@ function primary$1(env) {
             id_1
           ];
           return [
-                  loc$1,
-                  {
-                    TAG: /* Identifier */18,
-                    _0: id
-                  }
-                ];
+            loc$1,
+            {
+              TAG: /* Identifier */18,
+              _0: id
+            }
+          ];
       case /* T_LESS_THAN */89 :
           const match$3 = Curry._1(Parse.jsx_element, env);
           return [
-                  match$3[0],
-                  {
-                    TAG: /* JSXElement */22,
-                    _0: match$3[1]
-                  }
-                ];
+            match$3[0],
+            {
+              TAG: /* JSXElement */22,
+              _0: match$3[1]
+            }
+          ];
       case /* T_DIV_ASSIGN */70 :
       case /* T_DIV */96 :
           push_lex_mode(env, /* REGEXP */5);
@@ -9211,13 +9211,13 @@ function primary$1(env) {
           let match$5;
           if (/* tag */typeof match$4 === "number" || typeof match$4 === "string") {
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "parser_flow.ml",
-                        1699,
-                        15
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "parser_flow.ml",
+                    1699,
+                    15
+                  ]
+                });
           }
           if (match$4.TAG === /* T_REGEXP */3) {
             const match$6 = match$4._0;
@@ -9230,13 +9230,13 @@ function primary$1(env) {
             ];
           } else {
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "parser_flow.ml",
-                        1699,
-                        15
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "parser_flow.ml",
+                    1699,
+                    15
+                  ]
+                });
           }
           const raw_flags = match$5[2];
           pop_lex_mode(env);
@@ -9280,15 +9280,15 @@ function primary$1(env) {
             }
           };
           return [
-                  loc$2,
-                  {
-                    TAG: /* Literal */19,
-                    _0: {
-                      value: value,
-                      raw: match$5[0]
-                    }
-                  }
-                ];
+            loc$2,
+            {
+              TAG: /* Literal */19,
+              _0: {
+                value: value,
+                raw: match$5[0]
+              }
+            }
+          ];
       default:
         exit = 1;
     }
@@ -9301,19 +9301,19 @@ function primary$1(env) {
             _0: number(env, number_type._0)
           };
           return [
-                  loc,
-                  {
-                    TAG: /* Literal */19,
-                    _0: {
-                      value: value$1,
-                      raw: raw$2
-                    }
-                  }
-                ];
-      case /* T_STRING */1 :
-          const match$7 = number_type._0;
-          const octal = match$7[3];
-          const raw$3 = match$7[2];
+            loc,
+            {
+              TAG: /* Literal */19,
+              _0: {
+                value: value$1,
+                raw: raw$2
+              }
+            }
+          ];
+      case /* T_STRING */1 :
+          const match$7 = number_type._0;
+          const octal = match$7[3];
+          const raw$3 = match$7[2];
           const value$2 = match$7[1];
           const loc$3 = match$7[0];
           if (octal) {
@@ -9333,24 +9333,24 @@ function primary$1(env) {
             _0: value$2
           };
           return [
-                  loc$3,
-                  {
-                    TAG: /* Literal */19,
-                    _0: {
-                      value: value$3,
-                      raw: raw$3
-                    }
-                  }
-                ];
+            loc$3,
+            {
+              TAG: /* Literal */19,
+              _0: {
+                value: value$3,
+                raw: raw$3
+              }
+            }
+          ];
       case /* T_TEMPLATE_PART */2 :
           const match$8 = Curry._2(template_literal, env, number_type._0);
           return [
-                  match$8[0],
-                  {
-                    TAG: /* TemplateLiteral */20,
-                    _0: match$8[1]
-                  }
-                ];
+            match$8[0],
+            {
+              TAG: /* TemplateLiteral */20,
+              _0: match$8[1]
+            }
+          ];
       default:
         exit = 1;
     }
@@ -9360,27 +9360,27 @@ function primary$1(env) {
         if (Curry._2(Parser_env_Peek.is_identifier, undefined, env)) {
           const id$1 = Curry._2(Parse.identifier, undefined, env);
           return [
-                  id$1[0],
-                  {
-                    TAG: /* Identifier */18,
-                    _0: id$1
-                  }
-                ];
+            id$1[0],
+            {
+              TAG: /* Identifier */18,
+              _0: id$1
+            }
+          ];
         }
         error_unexpected(env);
         if (Caml_obj.caml_equal(number_type, /* T_ERROR */104)) {
           token$3(env);
         }
         return [
-                loc,
-                {
-                  TAG: /* Literal */19,
-                  _0: {
-                    value: /* Null */0,
-                    raw: "null"
-                  }
-                }
-              ];
+          loc,
+          {
+            TAG: /* Literal */19,
+            _0: {
+              value: /* Null */0,
+              raw: "null"
+            }
+          }
+        ];
     case 2 :
         const raw$4 = Curry._2(Parser_env_Peek.value, undefined, env);
         token$4(env, number_type);
@@ -9389,15 +9389,15 @@ function primary$1(env) {
           _0: Caml_obj.caml_equal(number_type, /* T_TRUE */29)
         };
         return [
-                loc,
-                {
-                  TAG: /* Literal */19,
-                  _0: {
-                    value: value$4,
-                    raw: raw$4
-                  }
-                }
-              ];
+          loc,
+          {
+            TAG: /* Literal */19,
+            _0: {
+              value: value$4,
+              raw: raw$4
+            }
+          }
+        ];
     
   }
 }
@@ -9405,15 +9405,15 @@ function primary$1(env) {
 function tagged_template(env, tag, part) {
   const quasi = Curry._2(template_literal, env, part);
   return [
-          btwn(tag[0], quasi[0]),
-          {
-            TAG: /* TaggedTemplate */21,
-            _0: {
-              tag: tag,
-              quasi: quasi
-            }
-          }
-        ];
+    btwn(tag[0], quasi[0]),
+    {
+      TAG: /* TaggedTemplate */21,
+      _0: {
+        tag: tag,
+        quasi: quasi
+      }
+    }
+  ];
 }
 
 function sequence(env, _acc) {
@@ -9433,14 +9433,14 @@ function sequence(env, _acc) {
     const expressions = Stdlib__List.rev(acc);
     const first_loc = expressions ? expressions.hd[0] : none;
     return [
-            btwn(first_loc, last_loc),
-            {
-              TAG: /* Sequence */4,
-              _0: {
-                expressions: expressions
-              }
-            }
-          ];
+      btwn(first_loc, last_loc),
+      {
+        TAG: /* Sequence */4,
+        _0: {
+          expressions: expressions
+        }
+      }
+    ];
   };
 }
 
@@ -9542,21 +9542,21 @@ function identifier_or_reserved_keyword(env) {
         }
         token$3(env);
         return [
-                [
-                  lex_loc,
-                  {
-                    name: lex_value,
-                    typeAnnotation: undefined,
-                    optional: false
-                  }
-                ],
-                err
-              ];
+          [
+            lex_loc,
+            {
+              name: lex_value,
+              typeAnnotation: undefined,
+              optional: false
+            }
+          ],
+          err
+        ];
     case 2 :
         return [
-                Curry._2(Parse.identifier, undefined, env),
-                undefined
-              ];
+          Curry._2(Parse.identifier, undefined, env),
+          undefined
+        ];
     
   }
 }
@@ -9587,22 +9587,22 @@ function assignment_but_not_arrow_function(env) {
   const right = Curry._1(assignment, env);
   const loc = btwn(left[0], right[0]);
   return [
-          loc,
-          {
-            TAG: /* Assignment */7,
-            _0: {
-              operator: operator,
-              left: left,
-              right: right
-            }
-          }
-        ];
+    loc,
+    {
+      TAG: /* Assignment */7,
+      _0: {
+        operator: operator,
+        left: left,
+        right: right
+      }
+    }
+  ];
 }
 
 function error_callback(param, param$1) {
   throw new Caml_js_exceptions.MelangeError(Parser_env_Try.Rollback, {
-            MEL_EXN_ID: Parser_env_Try.Rollback
-          });
+        MEL_EXN_ID: Parser_env_Try.Rollback
+      });
 }
 
 function try_assignment_but_not_arrow_function(env) {
@@ -9614,8 +9614,8 @@ function try_assignment_but_not_arrow_function(env) {
       case /* T_ARROW */10 :
       case /* T_COLON */77 :
           throw new Caml_js_exceptions.MelangeError(Parser_env_Try.Rollback, {
-                    MEL_EXN_ID: Parser_env_Try.Rollback
-                  });
+                MEL_EXN_ID: Parser_env_Try.Rollback
+              });
       default:
         
     }
@@ -9625,8 +9625,8 @@ function try_assignment_but_not_arrow_function(env) {
   }
   if (Curry._2(Parser_env_Peek.value, undefined, env$1) === "checks") {
     throw new Caml_js_exceptions.MelangeError(Parser_env_Try.Rollback, {
-              MEL_EXN_ID: Parser_env_Try.Rollback
-            });
+          MEL_EXN_ID: Parser_env_Try.Rollback
+        });
   }
   const match$1 = ret[1];
   if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
@@ -9640,8 +9640,8 @@ function try_assignment_but_not_arrow_function(env) {
   }
   if (!Curry._1(Parser_env_Peek.is_line_terminator, env$1)) {
     throw new Caml_js_exceptions.MelangeError(Parser_env_Try.Rollback, {
-              MEL_EXN_ID: Parser_env_Try.Rollback
-            });
+          MEL_EXN_ID: Parser_env_Try.Rollback
+        });
   }
   return ret;
 }
@@ -9672,15 +9672,15 @@ function assignment(env) {
               end_loc = end_loc$1;
             }
             return [
-                    btwn(start_loc, end_loc),
-                    {
-                      TAG: /* Yield */14,
-                      _0: {
-                        argument: argument,
-                        delegate: delegate
-                      }
-                    }
-                  ];
+              btwn(start_loc, end_loc),
+              {
+                TAG: /* Yield */14,
+                _0: {
+                  argument: argument,
+                  delegate: delegate
+                }
+              }
+            ];
           }
           exit = 2;
           break;
@@ -9710,16 +9710,16 @@ function assignment(env) {
 
 function make_logical(left, right, operator, loc) {
   return [
-          loc,
-          {
-            TAG: /* Logical */9,
-            _0: {
-              operator: operator,
-              left: left,
-              right: right
-            }
-          }
-        ];
+    loc,
+    {
+      TAG: /* Logical */9,
+      _0: {
+        operator: operator,
+        left: left,
+        right: right
+      }
+    }
+  ];
 }
 
 function logical_and(env, _left, _lloc) {
@@ -9729,15 +9729,15 @@ function logical_and(env, _left, _lloc) {
     const match = Curry._2(Parser_env_Peek.token, undefined, env);
     if (!/* tag */(typeof match === "number" || typeof match === "string")) {
       return [
-              lloc,
-              left
-            ];
+        lloc,
+        left
+      ];
     }
     if (match !== /* T_AND */79) {
       return [
-              lloc,
-              left
-            ];
+        lloc,
+        left
+      ];
     }
     token$4(env, /* T_AND */79);
     const match$1 = with_loc(binary, env);
@@ -9755,15 +9755,15 @@ function logical_or(env, _left, _lloc) {
     const match = Curry._2(Parser_env_Peek.token, undefined, env);
     if (!/* tag */(typeof match === "number" || typeof match === "string")) {
       return [
-              lloc,
-              left
-            ];
+        lloc,
+        left
+      ];
     }
     if (match !== /* T_OR */78) {
       return [
-              lloc,
-              left
-            ];
+        lloc,
+        left
+      ];
     }
     token$4(env, /* T_OR */78);
     const match$1 = with_loc(binary, env);
@@ -9998,16 +9998,16 @@ function binary_op(env) {
 
 function make_binary(left, right, operator, loc) {
   return [
-          loc,
-          {
-            TAG: /* Binary */6,
-            _0: {
-              operator: operator,
-              left: left,
-              right: right
-            }
-          }
-        ];
+    loc,
+    {
+      TAG: /* Binary */6,
+      _0: {
+        operator: operator,
+        left: left,
+        right: right
+      }
+    }
+  ];
 }
 
 function add_to_stack(_right, _param, _rloc, _stack) {
@@ -10036,16 +10036,16 @@ function add_to_stack(_right, _param, _rloc, _stack) {
       
     }
     return {
-            hd: [
-              right,
-              [
-                rop,
-                rpri
-              ],
-              rloc
-            ],
-            tl: stack
-          };
+      hd: [
+        right,
+        [
+          rop,
+          rpri
+        ],
+        rloc
+      ],
+      tl: stack
+    };
   };
 }
 
@@ -10105,29 +10105,29 @@ function argument(env) {
   const match = Curry._2(Parser_env_Peek.token, undefined, env);
   if (!/* tag */(typeof match === "number" || typeof match === "string")) {
     return {
-            TAG: /* Expression */0,
-            _0: Curry._1(assignment, env)
-          };
+      TAG: /* Expression */0,
+      _0: Curry._1(assignment, env)
+    };
   }
   if (match !== /* T_ELLIPSIS */11) {
     return {
-            TAG: /* Expression */0,
-            _0: Curry._1(assignment, env)
-          };
+      TAG: /* Expression */0,
+      _0: Curry._1(assignment, env)
+    };
   }
   const start_loc = Curry._2(Parser_env_Peek.loc, undefined, env);
   token$4(env, /* T_ELLIPSIS */11);
   const argument$1 = Curry._1(assignment, env);
   const loc = btwn(start_loc, argument$1[0]);
   return {
-          TAG: /* Spread */1,
-          _0: [
-            loc,
-            {
-              argument: argument$1
-            }
-          ]
-        };
+    TAG: /* Spread */1,
+    _0: [
+      loc,
+      {
+        argument: argument$1
+      }
+    ]
+  };
 }
 
 function arguments$p(env, _acc) {
@@ -10163,9 +10163,9 @@ function $$arguments(env) {
   const end_loc = Curry._2(Parser_env_Peek.loc, undefined, env);
   token$4(env, /* T_RPAREN */4);
   return [
-          btwn(start_loc, end_loc),
-          args
-        ];
+    btwn(start_loc, end_loc),
+    args
+  ];
 }
 
 function template_parts(env, _quasis, _expressions) {
@@ -10184,13 +10184,13 @@ function template_parts(env, _quasis, _expressions) {
       let match$2;
       if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "parser_flow.ml",
-                    1602,
-                    19
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "parser_flow.ml",
+                1602,
+                19
+              ]
+            });
       }
       if (match$1.TAG === /* T_TEMPLATE_PART */2) {
         const match$3 = match$1._0;
@@ -10210,13 +10210,13 @@ function template_parts(env, _quasis, _expressions) {
         ];
       } else {
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "parser_flow.ml",
-                    1602,
-                    19
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "parser_flow.ml",
+                1602,
+                19
+              ]
+            });
       }
       const loc = match$2[0];
       pop_lex_mode(env);
@@ -10230,10 +10230,10 @@ function template_parts(env, _quasis, _expressions) {
       };
       if (match$2[2]) {
         return [
-                loc,
-                Stdlib__List.rev(quasis$1),
-                Stdlib__List.rev(expressions$1)
-              ];
+          loc,
+          Stdlib__List.rev(quasis$1),
+          Stdlib__List.rev(expressions$1)
+        ];
       }
       _expressions = expressions$1;
       _quasis = quasis$1;
@@ -10253,13 +10253,13 @@ function template_parts(env, _quasis, _expressions) {
       imaginary_quasi_1
     ];
     return [
-            expr[0],
-            Stdlib__List.rev({
-                  hd: imaginary_quasi,
-                  tl: quasis
-                }),
-            Stdlib__List.rev(expressions$1)
-          ];
+      expr[0],
+      Stdlib__List.rev({
+            hd: imaginary_quasi,
+            tl: quasis
+          }),
+      Stdlib__List.rev(expressions$1)
+    ];
   };
 }
 
@@ -10295,12 +10295,12 @@ function template_literal(env, part) {
         }, /* [] */0);
   const loc = btwn(start_loc, match$1[0]);
   return [
-          loc,
-          {
-            quasis: match$1[1],
-            expressions: match$1[2]
-          }
-        ];
+    loc,
+    {
+      quasis: match$1[1],
+      expressions: match$1[2]
+    }
+  ];
 }
 
 function elements(env, _acc) {
@@ -10364,11 +10364,11 @@ function array_initializer(env) {
   const end_loc = Curry._2(Parser_env_Peek.loc, undefined, env);
   token$4(env, /* T_RBRACKET */6);
   return [
-          btwn(start_loc, end_loc),
-          {
-            elements: elements$1
-          }
-        ];
+    btwn(start_loc, end_loc),
+    {
+      elements: elements$1
+    }
+  ];
 }
 
 function error_callback$1(param) {
@@ -10381,13 +10381,13 @@ function error_callback$1(param) {
             return ;
         default:
           throw new Caml_js_exceptions.MelangeError(Parser_env_Try.Rollback, {
-                    MEL_EXN_ID: Parser_env_Try.Rollback
-                  });
+                MEL_EXN_ID: Parser_env_Try.Rollback
+              });
       }
     } else {
       throw new Caml_js_exceptions.MelangeError(Parser_env_Try.Rollback, {
-                MEL_EXN_ID: Parser_env_Try.Rollback
-              });
+            MEL_EXN_ID: Parser_env_Try.Rollback
+          });
     }
   };
 }
@@ -10444,19 +10444,19 @@ function try_arrow_function(env) {
           if (/* tag */(typeof match === "number" || typeof match === "string") && match === /* T_LCURLY */1) {
             const match$1 = function_body(env, async, generator);
             return [
-                    match$1[1],
-                    match$1[2]
-                  ];
+              match$1[1],
+              match$1[2]
+            ];
           }
           const env$1 = enter_function(env, async, generator);
           const expr = Curry._1(Parse.assignment, env$1);
           return [
-                  {
-                    TAG: /* BodyExpression */1,
-                    _0: expr
-                  },
-                  env$1.in_strict_mode
-                ];
+            {
+              TAG: /* BodyExpression */1,
+              _0: expr
+            },
+            env$1.in_strict_mode
+          ];
         }), env$3);
   const match$3 = match$2[1];
   const body = match$3[0];
@@ -10466,24 +10466,24 @@ function try_arrow_function(env) {
   expression = body.TAG === /* BodyBlock */0 ? false : true;
   const loc = btwn(start_loc, match$2[0]);
   return [
-          loc,
-          {
-            TAG: /* ArrowFunction */3,
-            _0: {
-              id: undefined,
-              params: params,
-              defaults: defaults,
-              rest: rest,
-              body: body,
-              async: async,
-              generator: false,
-              predicate: predicate,
-              expression: expression,
-              returnType: match[3],
-              typeParameters: typeParameters
-            }
-          }
-        ];
+    loc,
+    {
+      TAG: /* ArrowFunction */3,
+      _0: {
+        id: undefined,
+        params: params,
+        defaults: defaults,
+        rest: rest,
+        body: body,
+        async: async,
+        generator: false,
+        predicate: predicate,
+        expression: expression,
+        returnType: match[3],
+        typeParameters: typeParameters
+      }
+    }
+  ];
 }
 
 function decorator_list_helper(env, _decorators) {
@@ -10523,12 +10523,12 @@ function key(env) {
       const end_loc = Curry._2(Parser_env_Peek.loc, undefined, env);
       token$4(env, /* T_RBRACKET */6);
       return [
-              btwn(start_loc, end_loc),
-              {
-                TAG: /* Computed */2,
-                _0: expr
-              }
-            ];
+        btwn(start_loc, end_loc),
+        {
+          TAG: /* Computed */2,
+          _0: expr
+        }
+      ];
     }
     
   } else {
@@ -10542,18 +10542,18 @@ function key(env) {
             _0: value
           };
           return [
-                  loc,
-                  {
-                    TAG: /* Literal */0,
-                    _0: [
-                      loc,
-                      {
-                        value: value$1,
-                        raw: raw
-                      }
-                    ]
-                  }
-                ];
+            loc,
+            {
+              TAG: /* Literal */0,
+              _0: [
+                loc,
+                {
+                  value: value$1,
+                  raw: raw
+                }
+              ]
+            }
+          ];
       case /* T_STRING */1 :
           const match = number_type._0;
           const octal = match[3];
@@ -10577,18 +10577,18 @@ function key(env) {
             _0: value$2
           };
           return [
-                  loc$1,
-                  {
-                    TAG: /* Literal */0,
-                    _0: [
-                      loc$1,
-                      {
-                        value: value$3,
-                        raw: raw$1
-                      }
-                    ]
-                  }
-                ];
+            loc$1,
+            {
+              TAG: /* Literal */0,
+              _0: [
+                loc$1,
+                {
+                  value: value$3,
+                  raw: raw$1
+                }
+              ]
+            }
+          ];
       default:
         
     }
@@ -10596,12 +10596,12 @@ function key(env) {
   const match$1 = identifier_or_reserved_keyword(env);
   const id = match$1[0];
   return [
-          id[0],
-          {
-            TAG: /* Identifier */1,
-            _0: id
-          }
-        ];
+    id[0],
+    {
+      TAG: /* Identifier */1,
+      _0: id
+    }
+  ];
 }
 
 function _method(env, kind) {
@@ -10623,13 +10623,13 @@ function _method(env, kind) {
   switch (kind) {
     case /* Init */0 :
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "parser_flow.ml",
-                    1954,
-                    16
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "parser_flow.ml",
+                1954,
+                16
+              ]
+            });
     case /* Get */1 :
         params = /* [] */0;
         break;
@@ -10681,9 +10681,9 @@ function _method(env, kind) {
     value_1
   ];
   return [
-          match[1],
-          value
-        ];
+    match[1],
+    value
+  ];
 }
 
 function property$1(env) {
@@ -10692,14 +10692,14 @@ function property$1(env) {
     token$4(env, /* T_ELLIPSIS */11);
     const argument = Curry._1(Parse.assignment, env);
     return {
-            TAG: /* SpreadProperty */1,
-            _0: [
-              btwn(start_loc, argument[0]),
-              {
-                argument: argument
-              }
-            ]
-          };
+      TAG: /* SpreadProperty */1,
+      _0: [
+        btwn(start_loc, argument[0]),
+        {
+          argument: argument
+        }
+      ]
+    };
   }
   const async = Curry._2(Parser_env_Peek.is_identifier, 1, env) && maybe(env, /* T_ASYNC */61);
   const match = generator(env, async);
@@ -10768,9 +10768,9 @@ function property$1(env) {
     tmp = init(env, start_loc, match$1[1], async, match);
   }
   return {
-          TAG: /* Property */0,
-          _0: tmp
-        };
+    TAG: /* Property */0,
+    _0: tmp
+  };
 }
 
 function get(env, start_loc) {
@@ -10786,15 +10786,15 @@ function get(env, start_loc) {
     value_1
   ];
   return [
-          btwn(start_loc, end_loc),
-          {
-            key: match[0],
-            value: value,
-            kind: /* Get */1,
-            _method: false,
-            shorthand: false
-          }
-        ];
+    btwn(start_loc, end_loc),
+    {
+      key: match[0],
+      value: value,
+      kind: /* Get */1,
+      _method: false,
+      shorthand: false
+    }
+  ];
 }
 
 function set(env, start_loc) {
@@ -10810,15 +10810,15 @@ function set(env, start_loc) {
     value_1
   ];
   return [
-          btwn(start_loc, end_loc),
-          {
-            key: match[0],
-            value: value,
-            kind: /* Set */2,
-            _method: false,
-            shorthand: false
-          }
-        ];
+    btwn(start_loc, end_loc),
+    {
+      key: match[0],
+      value: value,
+      kind: /* Set */2,
+      _method: false,
+      shorthand: false
+    }
+  ];
 }
 
 function init(env, start_loc, key, async, generator) {
@@ -10934,15 +10934,15 @@ function init(env, start_loc, key, async, generator) {
   }
   const value$1 = match$1[0];
   return [
-          btwn(start_loc, value$1[0]),
-          {
-            key: key,
-            value: value$1,
-            kind: /* Init */0,
-            _method: match$1[2],
-            shorthand: match$1[1]
-          }
-        ];
+    btwn(start_loc, value$1[0]),
+    {
+      key: key,
+      value: value$1,
+      kind: /* Init */0,
+      _method: match$1[2],
+      shorthand: match$1[1]
+    }
+  ];
 }
 
 function check_property(env, prop_map, prop) {
@@ -10984,9 +10984,9 @@ function check_property(env, prop_map, prop) {
                   break;
               case /* RegExp */3 :
                   throw new Caml_js_exceptions.MelangeError("Failure", {
-                            MEL_EXN_ID: "Failure",
-                            _1: "RegExp cannot be property key"
-                          });
+                        MEL_EXN_ID: "Failure",
+                        _1: "RegExp cannot be property key"
+                      });
               
             }
           }
@@ -10996,13 +10996,13 @@ function check_property(env, prop_map, prop) {
           break;
       case /* Computed */2 :
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "parser_flow.ml",
-                      2103,
-                      30
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "parser_flow.ml",
+                  2103,
+                  30
+                ]
+              });
       
     }
     let prev_kinds;
@@ -11113,11 +11113,11 @@ function _initializer(env) {
   const end_loc = Curry._2(Parser_env_Peek.loc, undefined, env);
   token$4(env, /* T_RCURLY */2);
   return [
-          btwn(start_loc, end_loc),
-          {
-            properties: props
-          }
-        ];
+    btwn(start_loc, end_loc),
+    {
+      properties: props
+    }
+  ];
 }
 
 function class_implements(env, _acc) {
@@ -11155,36 +11155,36 @@ function get$1(env, start_loc, decorators, $$static) {
   const match = _method(env, /* Get */1);
   const value = match[1];
   return {
-          TAG: /* Method */0,
-          _0: [
-            btwn(start_loc, value[0]),
-            {
-              kind: /* Get */2,
-              key: match[0],
-              value: value,
-              static: $$static,
-              decorators: decorators
-            }
-          ]
-        };
+    TAG: /* Method */0,
+    _0: [
+      btwn(start_loc, value[0]),
+      {
+        kind: /* Get */2,
+        key: match[0],
+        value: value,
+        static: $$static,
+        decorators: decorators
+      }
+    ]
+  };
 }
 
 function set$1(env, start_loc, decorators, $$static) {
   const match = _method(env, /* Set */2);
   const value = match[1];
   return {
-          TAG: /* Method */0,
-          _0: [
-            btwn(start_loc, value[0]),
-            {
-              kind: /* Set */3,
-              key: match[0],
-              value: value,
-              static: $$static,
-              decorators: decorators
-            }
-          ]
-        };
+    TAG: /* Method */0,
+    _0: [
+      btwn(start_loc, value[0]),
+      {
+        kind: /* Set */3,
+        key: match[0],
+        value: value,
+        static: $$static,
+        decorators: decorators
+      }
+    ]
+  };
 }
 
 function init$1(env, start_loc, decorators, key, async, generator, $$static) {
@@ -11213,17 +11213,17 @@ function init$1(env, start_loc, decorators, key, async, generator, $$static) {
     }
     const loc = btwn(start_loc, end_loc);
     return {
-            TAG: /* Property */1,
-            _0: [
-              loc,
-              {
-                key: key,
-                value: value,
-                typeAnnotation: typeAnnotation,
-                static: $$static
-              }
-            ]
-          };
+      TAG: /* Property */1,
+      _0: [
+        loc,
+        {
+          key: key,
+          value: value,
+          typeAnnotation: typeAnnotation,
+          static: $$static
+        }
+      ]
+    };
   }
   const typeParameters = Curry._1(type_parameter_declaration$1, env);
   const match$1 = function_params(env);
@@ -11276,18 +11276,18 @@ function init$1(env, start_loc, decorators, key, async, generator, $$static) {
     
   }
   return {
-          TAG: /* Method */0,
-          _0: [
-            btwn(start_loc, end_loc$1),
-            {
-              kind: kind,
-              key: key,
-              value: value$1,
-              static: $$static,
-              decorators: decorators
-            }
-          ]
-        };
+    TAG: /* Method */0,
+    _0: [
+      btwn(start_loc, end_loc$1),
+      {
+        kind: kind,
+        key: key,
+        value: value$1,
+        static: $$static,
+        decorators: decorators
+      }
+    ]
+  };
 }
 
 function class_element(env) {
@@ -11393,11 +11393,11 @@ function class_body(env) {
   const end_loc = Curry._2(Parser_env_Peek.loc, undefined, env);
   token$4(env, /* T_RCURLY */2);
   return [
-          btwn(start_loc, end_loc),
-          {
-            body: body
-          }
-        ];
+    btwn(start_loc, end_loc),
+    {
+      body: body
+    }
+  ];
 }
 
 function _class(env) {
@@ -11419,11 +11419,11 @@ function _class(env) {
   const $$implements = Caml_obj.caml_equal(Curry._2(Parser_env_Peek.token, undefined, env), /* T_IMPLEMENTS */50) ? (!env.parse_options.types ? error$1(env, /* UnexpectedTypeInterface */10) : undefined, token$4(env, /* T_IMPLEMENTS */50), class_implements(env, /* [] */0)) : /* [] */0;
   const body = Curry._1(class_body, env);
   return [
-          body,
-          match[0],
-          match[1],
-          $$implements
-        ];
+    body,
+    match[0],
+    match[1],
+    $$implements
+  ];
 }
 
 function class_declaration(env, decorators) {
@@ -11440,20 +11440,20 @@ function class_declaration(env, decorators) {
   const body = match$2[0];
   const loc = btwn(start_loc, body[0]);
   return [
-          loc,
-          {
-            TAG: /* ClassDeclaration */20,
-            _0: {
-              id: id,
-              body: body,
-              superClass: match$2[1],
-              typeParameters: typeParameters,
-              superTypeParameters: match$2[2],
-              implements: match$2[3],
-              classDecorators: decorators$1
-            }
-          }
-        ];
+    loc,
+    {
+      TAG: /* ClassDeclaration */20,
+      _0: {
+        id: id,
+        body: body,
+        superClass: match$2[1],
+        typeParameters: typeParameters,
+        superTypeParameters: match$2[2],
+        implements: match$2[3],
+        classDecorators: decorators$1
+      }
+    }
+  ];
 }
 
 function class_expression(env) {
@@ -11491,20 +11491,20 @@ function class_expression(env) {
   const body = match$2[0];
   const loc = btwn(start_loc, body[0]);
   return [
-          loc,
-          {
-            TAG: /* Class */23,
-            _0: {
-              id: match$1[0],
-              body: body,
-              superClass: match$2[1],
-              typeParameters: match$1[1],
-              superTypeParameters: match$2[2],
-              implements: match$2[3],
-              classDecorators: decorators
-            }
-          }
-        ];
+    loc,
+    {
+      TAG: /* Class */23,
+      _0: {
+        id: match$1[0],
+        body: body,
+        superClass: match$2[1],
+        typeParameters: match$1[1],
+        superTypeParameters: match$2[2],
+        implements: match$2[3],
+        classDecorators: decorators
+      }
+    }
+  ];
 }
 
 function declare_function(env, start_loc) {
@@ -11551,12 +11551,12 @@ function declare_function(env, start_loc) {
   semicolon(env);
   const loc$1 = btwn(start_loc, end_loc$2);
   return [
-          loc$1,
-          {
-            id: id$1,
-            predicate: predicate
-          }
-        ];
+    loc$1,
+    {
+      id: id$1,
+      predicate: predicate
+    }
+  ];
 }
 
 function expression(env) {
@@ -11565,14 +11565,14 @@ function expression(env) {
   const end_loc = loc !== undefined ? loc : expression$1[0];
   semicolon(env);
   return [
-          btwn(expression$1[0], end_loc),
-          {
-            TAG: /* Expression */1,
-            _0: {
-              expression: expression$1
-            }
-          }
-        ];
+    btwn(expression$1[0], end_loc),
+    {
+      TAG: /* Expression */1,
+      _0: {
+        expression: expression$1
+      }
+    }
+  ];
 }
 
 function type_alias_helper(env) {
@@ -11591,13 +11591,13 @@ function type_alias_helper(env) {
   semicolon(env);
   pop_lex_mode(env);
   return [
-          btwn(start_loc, end_loc$1),
-          {
-            id: id,
-            typeParameters: typeParameters,
-            right: right
-          }
-        ];
+    btwn(start_loc, end_loc$1),
+    {
+      id: id,
+      typeParameters: typeParameters,
+      right: right
+    }
+  ];
 }
 
 function declare(in_moduleOpt, env) {
@@ -11622,12 +11622,12 @@ function declare(in_moduleOpt, env) {
               semicolon(env);
               const loc$1 = btwn(start_loc, end_loc);
               return [
-                      loc$1,
-                      {
-                        TAG: /* DeclareModuleExports */26,
-                        _0: type_annot
-                      }
-                    ];
+                loc$1,
+                {
+                  TAG: /* DeclareModuleExports */26,
+                  _0: type_annot
+                }
+              ];
             } else {
               const match$1 = Curry._2(Parser_env_Peek.token, undefined, env);
               let id;
@@ -11685,20 +11685,20 @@ function declare(in_moduleOpt, env) {
               ];
               const loc$3 = btwn(start_loc, body_loc);
               const kind = module_kind !== undefined ? module_kind : ({
-                    TAG: /* CommonJS */0,
-                    _0: loc$3
-                  });
+                  TAG: /* CommonJS */0,
+                  _0: loc$3
+                });
               return [
-                      loc$3,
-                      {
-                        TAG: /* DeclareModule */25,
-                        _0: {
-                          id: id,
-                          body: body,
-                          kind: kind
-                        }
-                      }
-                    ];
+                loc$3,
+                {
+                  TAG: /* DeclareModule */25,
+                  _0: {
+                    id: id,
+                    body: body,
+                    kind: kind
+                  }
+                }
+              ];
             }
           }
           break;
@@ -11712,12 +11712,12 @@ function declare(in_moduleOpt, env) {
           token$4(env, /* T_DECLARE */58);
           const match$4 = Curry._2(declare_class, env, start_loc);
           return [
-                  match$4[0],
-                  {
-                    TAG: /* DeclareClass */24,
-                    _0: match$4[1]
-                  }
-                ];
+            match$4[0],
+            {
+              TAG: /* DeclareClass */24,
+              _0: match$4[1]
+            }
+          ];
       case /* T_EXPORT */47 :
           if (in_module) {
             return declare_export_declaration(in_module, env);
@@ -11760,9 +11760,9 @@ function export_specifiers_and_errs(env, _specifiers, _errs) {
         case /* T_RCURLY */2 :
         case /* T_EOF */105 :
             return [
-                    Stdlib__List.rev(specifiers),
-                    Stdlib__List.rev(errs)
-                  ];
+              Stdlib__List.rev(specifiers),
+              Stdlib__List.rev(errs)
+            ];
         default:
           
       }
@@ -11809,9 +11809,9 @@ function export_specifiers_and_errs(env, _specifiers, _errs) {
       token$4(env, /* T_COMMA */8);
     }
     const errs$1 = err !== undefined ? ({
-          hd: err,
-          tl: errs
-        }) : errs;
+        hd: err,
+        tl: errs
+      }) : errs;
     _errs = errs$1;
     _specifiers = {
       hd: specifier,
@@ -11824,12 +11824,12 @@ function export_specifiers_and_errs(env, _specifiers, _errs) {
 function declare_var_statement(env, start_loc) {
   const match = declare_var(env, start_loc);
   return [
-          match[0],
-          {
-            TAG: /* DeclareVariable */22,
-            _0: match[1]
-          }
-        ];
+    match[0],
+    {
+      TAG: /* DeclareVariable */22,
+      _0: match[1]
+    }
+  ];
 }
 
 function declare_export_declaration(allow_export_typeOpt, env) {
@@ -11892,17 +11892,17 @@ function declare_export_declaration(allow_export_typeOpt, env) {
             ];
           }
           return [
-                  btwn(start_loc, match$2[0]),
-                  {
-                    TAG: /* DeclareExportDeclaration */27,
-                    _0: {
-                      default: true,
-                      declaration: match$2[1],
-                      specifiers: undefined,
-                      source: undefined
-                    }
-                  }
-                ];
+            btwn(start_loc, match$2[0]),
+            {
+              TAG: /* DeclareExportDeclaration */27,
+              _0: {
+                default: true,
+                declaration: match$2[1],
+                specifiers: undefined,
+                source: undefined
+              }
+            }
+          ];
       case /* T_FUNCTION */13 :
       case /* T_VAR */22 :
       case /* T_CONST */25 :
@@ -11916,23 +11916,23 @@ function declare_export_declaration(allow_export_typeOpt, env) {
             const iface_loc = match$3[0];
             const loc$1 = btwn(start_loc, iface_loc);
             return [
-                    loc$1,
-                    {
-                      TAG: /* DeclareExportDeclaration */27,
-                      _0: {
-                        default: false,
-                        declaration: {
-                          TAG: /* Interface */5,
-                          _0: [
-                            iface_loc,
-                            match$3[1]
-                          ]
-                        },
-                        specifiers: undefined,
-                        source: undefined
-                      }
-                    }
-                  ];
+              loc$1,
+              {
+                TAG: /* DeclareExportDeclaration */27,
+                _0: {
+                  default: false,
+                  declaration: {
+                    TAG: /* Interface */5,
+                    _0: [
+                      iface_loc,
+                      match$3[1]
+                    ]
+                  },
+                  specifiers: undefined,
+                  source: undefined
+                }
+              }
+            ];
           }
           exit = 1;
           break;
@@ -11942,24 +11942,24 @@ function declare_export_declaration(allow_export_typeOpt, env) {
             const alias_loc = match$4[0];
             const loc$2 = btwn(start_loc, alias_loc);
             return [
-                    loc$2,
-                    {
-                      TAG: /* DeclareExportDeclaration */27,
-                      _0: {
-                        default: false,
-                        declaration: {
-                          TAG: /* NamedType */4,
-                          _0: [
-                            alias_loc,
-                            match$4[1]
-                          ]
-                        },
-                        specifiers: undefined,
-                        source: undefined
-                      }
-                    }
-                  ];
-          }
+              loc$2,
+              {
+                TAG: /* DeclareExportDeclaration */27,
+                _0: {
+                  default: false,
+                  declaration: {
+                    TAG: /* NamedType */4,
+                    _0: [
+                      alias_loc,
+                      match$4[1]
+                    ]
+                  },
+                  specifiers: undefined,
+                  source: undefined
+                }
+              }
+            ];
+          }
           exit = 1;
           break;
       case /* T_MULT */97 :
@@ -11978,17 +11978,17 @@ function declare_export_declaration(allow_export_typeOpt, env) {
           const source$1 = source;
           semicolon(env$1);
           return [
-                  btwn(start_loc, end_loc$1),
-                  {
-                    TAG: /* DeclareExportDeclaration */27,
-                    _0: {
-                      default: false,
-                      declaration: undefined,
-                      specifiers: specifiers,
-                      source: source$1
-                    }
-                  }
-                ];
+            btwn(start_loc, end_loc$1),
+            {
+              TAG: /* DeclareExportDeclaration */27,
+              _0: {
+                default: false,
+                declaration: undefined,
+                specifiers: specifiers,
+                source: source$1
+              }
+            }
+          ];
       default:
         exit = 1;
     }
@@ -12027,17 +12027,17 @@ function declare_export_declaration(allow_export_typeOpt, env) {
           );
         semicolon(env$1);
         return [
-                btwn(start_loc, end_loc$3),
-                {
-                  TAG: /* DeclareExportDeclaration */27,
-                  _0: {
-                    default: false,
-                    declaration: undefined,
-                    specifiers: specifiers$1,
-                    source: source$2
-                  }
-                }
-              ];
+          btwn(start_loc, end_loc$3),
+          {
+            TAG: /* DeclareExportDeclaration */27,
+            _0: {
+              default: false,
+              declaration: undefined,
+              specifiers: specifiers$1,
+              source: source$2
+            }
+          }
+        ];
     case 2 :
         const token$5 = Curry._2(Parser_env_Peek.token, undefined, env$1);
         let match$7;
@@ -12071,16 +12071,6 @@ function declare_export_declaration(allow_export_typeOpt, env) {
                 break;
             default:
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "parser_flow.ml",
-                          3480,
-                          17
-                        ]
-                      });
-          }
-        } else {
-          throw new Caml_js_exceptions.MelangeError("Assert_failure", {
                     MEL_EXN_ID: "Assert_failure",
                     _1: [
                       "parser_flow.ml",
@@ -12088,6 +12078,16 @@ function declare_export_declaration(allow_export_typeOpt, env) {
                       17
                     ]
                   });
+          }
+        } else {
+          throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "parser_flow.ml",
+                  3480,
+                  17
+                ]
+              });
         }
         if (exit$2 === 3) {
           if (/* tag */typeof token$5 === "number" || typeof token$5 === "string") {
@@ -12112,17 +12112,17 @@ function declare_export_declaration(allow_export_typeOpt, env) {
           ];
         }
         return [
-                btwn(start_loc, match$7[0]),
-                {
-                  TAG: /* DeclareExportDeclaration */27,
-                  _0: {
-                    default: false,
-                    declaration: match$7[1],
-                    specifiers: undefined,
-                    source: undefined
-                  }
-                }
-              ];
+          btwn(start_loc, match$7[0]),
+          {
+            TAG: /* DeclareExportDeclaration */27,
+            _0: {
+              default: false,
+              declaration: match$7[1],
+              specifiers: undefined,
+              source: undefined
+            }
+          }
+        ];
     
   }
 }
@@ -12133,23 +12133,23 @@ function type_alias(env) {
   }
   const match = type_alias_helper(env);
   return [
-          match[0],
-          {
-            TAG: /* TypeAlias */7,
-            _0: match[1]
-          }
-        ];
+    match[0],
+    {
+      TAG: /* TypeAlias */7,
+      _0: match[1]
+    }
+  ];
 }
 
 function declare_function_statement(env, start_loc) {
   const match = declare_function(env, start_loc);
   return [
-          match[0],
-          {
-            TAG: /* DeclareFunction */23,
-            _0: match[1]
-          }
-        ];
+    match[0],
+    {
+      TAG: /* DeclareFunction */23,
+      _0: match[1]
+    }
+  ];
 }
 
 function $$interface(env) {
@@ -12158,12 +12158,12 @@ function $$interface(env) {
   }
   const match = Curry._1(interface_helper, env);
   return [
-          match[0],
-          {
-            TAG: /* InterfaceDeclaration */21,
-            _0: match[1]
-          }
-        ];
+    match[0],
+    {
+      TAG: /* InterfaceDeclaration */21,
+      _0: match[1]
+    }
+  ];
 }
 
 function declare_var(env, start_loc) {
@@ -12174,11 +12174,11 @@ function declare_var(env, start_loc) {
   const loc$1 = btwn(start_loc, end_loc);
   semicolon(env);
   return [
-          loc$1,
-          {
-            id: id
-          }
-        ];
+    loc$1,
+    {
+      id: id
+    }
+  ];
 }
 
 function export_source(env) {
@@ -12207,12 +12207,12 @@ function export_source(env) {
       _0: value
     };
     return [
-            loc,
-            {
-              value: value$1,
-              raw: raw
-            }
-          ];
+      loc,
+      {
+        value: value$1,
+        raw: raw
+      }
+    ];
   }
   const raw$1 = Curry._2(Parser_env_Peek.value, undefined, env);
   const value$2 = {
@@ -12265,15 +12265,15 @@ function interface_helper(env) {
   const body = _object$1(true, env);
   const loc = btwn(start_loc, body[0]);
   return [
-          loc,
-          {
-            id: id,
-            typeParameters: typeParameters,
-            body: body,
-            extends: $$extends,
-            mixins: /* [] */0
-          }
-        ];
+    loc,
+    {
+      id: id,
+      typeParameters: typeParameters,
+      body: body,
+      extends: $$extends,
+      mixins: /* [] */0
+    }
+  ];
 }
 
 function supers$1(env, _acc) {
@@ -12307,15 +12307,15 @@ function declare_class(env, start_loc) {
   const body = _object$1(true, env$1);
   const loc = btwn(start_loc, body[0]);
   return [
-          loc,
-          {
-            id: id,
-            typeParameters: typeParameters,
-            body: body,
-            extends: $$extends,
-            mixins: mixins
-          }
-        ];
+    loc,
+    {
+      id: id,
+      typeParameters: typeParameters,
+      body: body,
+      extends: $$extends,
+      mixins: mixins
+    }
+  ];
 }
 
 function module_items(env, _module_kind, _acc) {
@@ -12328,9 +12328,9 @@ function module_items(env, _module_kind, _acc) {
         case /* T_RCURLY */2 :
         case /* T_EOF */105 :
             return [
-                    module_kind,
-                    Stdlib__List.rev(acc)
-                  ];
+              module_kind,
+              Stdlib__List.rev(acc)
+            ];
         default:
           
       }
@@ -12424,40 +12424,40 @@ function fold(acc) {
     switch (match.TAG) {
       case /* Object */0 :
           return Stdlib__List.fold_left((function (acc, prop) {
-                        if (prop.TAG === /* Property */0) {
-                          return fold(acc)(prop._0[1].pattern);
-                        } else {
-                          return fold(acc)(prop._0[1].argument);
-                        }
-                      }), acc, match._0.properties);
+                  if (prop.TAG === /* Property */0) {
+                    return fold(acc)(prop._0[1].pattern);
+                  } else {
+                    return fold(acc)(prop._0[1].argument);
+                  }
+                }), acc, match._0.properties);
       case /* Array */1 :
           return Stdlib__List.fold_left((function (acc, elem) {
-                        if (elem !== undefined) {
-                          if (elem.TAG === /* Element */0) {
-                            return fold(acc)(elem._0);
-                          } else {
-                            return fold(acc)(elem._0[1].argument);
-                          }
-                        } else {
-                          return acc;
-                        }
-                      }), acc, match._0.elements);
+                  if (elem !== undefined) {
+                    if (elem.TAG === /* Element */0) {
+                      return fold(acc)(elem._0);
+                    } else {
+                      return fold(acc)(elem._0[1].argument);
+                    }
+                  } else {
+                    return acc;
+                  }
+                }), acc, match._0.elements);
       case /* Assignment */2 :
           return fold(acc)(match._0.left);
       case /* Identifier */3 :
           const match$1 = match._0;
           return {
-                  hd: [
-                    match$1[0],
-                    match$1[1].name
-                  ],
-                  tl: acc
-                };
+            hd: [
+              match$1[0],
+              match$1[1].name
+            ],
+            tl: acc
+          };
       case /* Expression */4 :
           throw new Caml_js_exceptions.MelangeError("Failure", {
-                    MEL_EXN_ID: "Failure",
-                    _1: "Parser error: No such thing as an expression pattern!"
-                  });
+                MEL_EXN_ID: "Failure",
+                _1: "Parser error: No such thing as an expression pattern!"
+              });
       
     }
   };
@@ -12475,9 +12475,9 @@ function assert_can_be_forin_or_forof(env, err) {
         return ;
       }
       return error_at(env, [
-                  match[0],
-                  err
-                ]);
+            match[0],
+            err
+          ]);
     }
     const match$1 = param._0;
     const loc = match$1[0];
@@ -12486,9 +12486,9 @@ function assert_can_be_forin_or_forof(env, err) {
             match$1[1]
           ])) {
       return error_at(env, [
-                  loc,
-                  err
-                ]);
+            loc,
+            err
+          ]);
     }
     
   };
@@ -12505,16 +12505,16 @@ function _if(env) {
   const alternate = Caml_obj.caml_equal(Curry._2(Parser_env_Peek.token, undefined, env), /* T_ELSE */41) ? (token$4(env, /* T_ELSE */41), Curry._1(Parse.statement, env)) : undefined;
   const end_loc = alternate !== undefined ? alternate[0] : consequent[0];
   return [
-          btwn(start_loc, end_loc),
-          {
-            TAG: /* If */2,
-            _0: {
-              test: test,
-              consequent: consequent,
-              alternate: alternate
-            }
-          }
-        ];
+    btwn(start_loc, end_loc),
+    {
+      TAG: /* If */2,
+      _0: {
+        test: test,
+        consequent: consequent,
+        alternate: alternate
+      }
+    }
+  ];
 }
 
 function case_list(env, _param) {
@@ -12594,9 +12594,9 @@ function var_or_const(env) {
           return error_at(env, param);
         }), match[1]);
   return [
-          btwn(start_loc, end_loc$1),
-          match$1[1]
-        ];
+    btwn(start_loc, end_loc$1),
+    match$1[1]
+  ];
 }
 
 function source(env) {
@@ -12625,12 +12625,12 @@ function source(env) {
       _0: value
     };
     return [
-            loc,
-            {
-              value: value$1,
-              raw: raw
-            }
-          ];
+      loc,
+      {
+        value: value$1,
+        raw: raw
+      }
+    ];
   }
   const raw$1 = Curry._2(Parser_env_Peek.value, undefined, env);
   const value$2 = {
@@ -12708,15 +12708,15 @@ function named_or_namespace_specifier(env) {
     contextual(env, "as");
     const id = Curry._2(Parse.identifier, undefined, env);
     return {
-            hd: {
-              TAG: /* ImportNamespaceSpecifier */2,
-              _0: [
-                btwn(start_loc, id[0]),
-                id
-              ]
-            },
-            tl: /* [] */0
-          };
+      hd: {
+        TAG: /* ImportNamespaceSpecifier */2,
+        _0: [
+          btwn(start_loc, id[0]),
+          id
+        ]
+      },
+      tl: /* [] */0
+    };
   }
   token$4(env, /* T_LCURLY */1);
   const specifiers = specifier_list(env, /* [] */0);
@@ -12732,24 +12732,24 @@ function element(env) {
     if (param.TAG === /* Expression */0) {
       const match = param._0;
       return {
-              TAG: /* Element */0,
-              _0: Curry._2(Parse.pattern_from_expr, env, [
-                    match[0],
-                    match[1]
-                  ])
-            };
+        TAG: /* Element */0,
+        _0: Curry._2(Parse.pattern_from_expr, env, [
+              match[0],
+              match[1]
+            ])
+      };
     }
     const match$1 = param._0;
     const argument = Curry._2(Parse.pattern_from_expr, env, match$1[1].argument);
     return {
-            TAG: /* Spread */1,
-            _0: [
-              match$1[0],
-              {
-                argument: argument
-              }
-            ]
-          };
+      TAG: /* Spread */1,
+      _0: [
+        match$1[0],
+        {
+          argument: argument
+        }
+      ]
+    };
   };
 }
 
@@ -12765,15 +12765,15 @@ function from_expr(env, param) {
           ];
           const elements = Stdlib__List.map(element(env), param$1[1].elements);
           return [
-                  param$1[0],
-                  {
-                    TAG: /* Array */1,
-                    _0: {
-                      elements: elements,
-                      typeAnnotation: undefined
-                    }
-                  }
-                ];
+            param$1[0],
+            {
+              TAG: /* Array */1,
+              _0: {
+                elements: elements,
+                typeAnnotation: undefined
+              }
+            }
+          ];
       case /* Object */1 :
           let param$2 = [
             loc,
@@ -12808,76 +12808,76 @@ function from_expr(env, param) {
                     }
                     const pattern = Curry._2(Parse.pattern_from_expr, env, match$1.value);
                     return {
-                            TAG: /* Property */0,
-                            _0: [
-                              match[0],
-                              {
-                                key: key$1,
-                                pattern: pattern,
-                                shorthand: match$1.shorthand
-                              }
-                            ]
-                          };
+                      TAG: /* Property */0,
+                      _0: [
+                        match[0],
+                        {
+                          key: key$1,
+                          pattern: pattern,
+                          shorthand: match$1.shorthand
+                        }
+                      ]
+                    };
                   }
                   const match$2 = param._0;
                   const argument = Curry._2(Parse.pattern_from_expr, env, match$2[1].argument);
                   return {
-                          TAG: /* SpreadProperty */1,
-                          _0: [
-                            match$2[0],
-                            {
-                              argument: argument
-                            }
-                          ]
-                        };
+                    TAG: /* SpreadProperty */1,
+                    _0: [
+                      match$2[0],
+                      {
+                        argument: argument
+                      }
+                    ]
+                  };
                 }), param$2[1].properties);
           return [
-                  param$2[0],
-                  {
-                    TAG: /* Object */0,
-                    _0: {
-                      properties: properties,
-                      typeAnnotation: undefined
-                    }
-                  }
-                ];
+            param$2[0],
+            {
+              TAG: /* Object */0,
+              _0: {
+                properties: properties,
+                typeAnnotation: undefined
+              }
+            }
+          ];
       case /* Assignment */7 :
           const match = expr._0;
           if (match.operator === /* Assign */0) {
             return [
-                    loc,
-                    {
-                      TAG: /* Assignment */2,
-                      _0: {
-                        left: match.left,
-                        right: match.right
-                      }
-                    }
-                  ];
+              loc,
+              {
+                TAG: /* Assignment */2,
+                _0: {
+                  left: match.left,
+                  right: match.right
+                }
+              }
+            ];
           }
           break;
       case /* Identifier */18 :
           return [
-                  loc,
-                  {
-                    TAG: /* Identifier */3,
-                    _0: expr._0
-                  }
-                ];
+            loc,
+            {
+              TAG: /* Identifier */3,
+              _0: expr._0
+            }
+          ];
       default:
         
     }
   }
   return [
-          loc,
-          {
-            TAG: /* Expression */4,
-            _0: [
-              loc,
-              expr
-            ]
-          }
-        ];
+    loc,
+    {
+      TAG: /* Expression */4,
+      _0: [
+        loc,
+        expr
+      ]
+    }
+  ];
 }
 
 function _object$2(restricted_error) {
@@ -12887,14 +12887,14 @@ function _object$2(restricted_error) {
       const argument = pattern$1(env, restricted_error);
       const loc = btwn(start_loc, argument[0]);
       return {
-              TAG: /* SpreadProperty */1,
-              _0: [
-                loc,
-                {
-                  argument: argument
-                }
-              ]
-            };
+        TAG: /* SpreadProperty */1,
+        _0: [
+          loc,
+          {
+            argument: argument
+          }
+        ]
+      };
     }
     const match = Curry._1(Parse.object_key, env);
     const lit = match[1];
@@ -12983,16 +12983,16 @@ function _object$2(restricted_error) {
     }
     const loc$2 = btwn(start_loc, pattern$4[0]);
     return {
-            TAG: /* Property */0,
-            _0: [
-              loc$2,
-              {
-                key: key,
-                pattern: pattern$4,
-                shorthand: prop[1]
-              }
-            ]
-          };
+      TAG: /* Property */0,
+      _0: [
+        loc$2,
+        {
+          key: key,
+          pattern: pattern$4,
+          shorthand: prop[1]
+        }
+      ]
+    };
   };
   const properties = function (env, _acc) {
     while(true) {
@@ -13041,15 +13041,15 @@ function _object$2(restricted_error) {
       ];
     }
     return [
-            btwn(start_loc, match[0]),
-            {
-              TAG: /* Object */0,
-              _0: {
-                properties: properties$1,
-                typeAnnotation: match[1]
-              }
-            }
-          ];
+      btwn(start_loc, match[0]),
+      {
+        TAG: /* Object */0,
+        _0: {
+          properties: properties$1,
+          typeAnnotation: match[1]
+        }
+      }
+    ];
   };
 }
 
@@ -13147,15 +13147,15 @@ function _array(restricted_error) {
       ];
     }
     return [
-            btwn(start_loc, match[0]),
-            {
-              TAG: /* Array */1,
-              _0: {
-                elements: elements$1,
-                typeAnnotation: match[1]
-              }
-            }
-          ];
+      btwn(start_loc, match[0]),
+      {
+        TAG: /* Array */1,
+        _0: {
+          elements: elements$1,
+          typeAnnotation: match[1]
+        }
+      }
+    ];
   };
 }
 
@@ -13173,12 +13173,12 @@ function pattern$1(env, restricted_error) {
   }
   const id = Curry._2(Parse.identifier_with_type, env, restricted_error);
   return [
-          id[0],
-          {
-            TAG: /* Identifier */3,
-            _0: id
-          }
-        ];
+    id[0],
+    {
+      TAG: /* Identifier */3,
+      _0: id
+    }
+  ];
 }
 
 function spread_attribute(env) {
@@ -13191,11 +13191,11 @@ function spread_attribute(env) {
   token$4(env, /* T_RCURLY */2);
   pop_lex_mode(env);
   return [
-          btwn(start_loc, end_loc),
-          {
-            argument: argument
-          }
-        ];
+    btwn(start_loc, end_loc),
+    {
+      argument: argument
+    }
+  ];
 }
 
 function expression_container(env) {
@@ -13219,11 +13219,11 @@ function expression_container(env) {
   token$4(env, /* T_RCURLY */2);
   pop_lex_mode(env);
   return [
-          btwn(start_loc, end_loc),
-          {
-            expression: expression
-          }
-        ];
+    btwn(start_loc, end_loc),
+    {
+      expression: expression
+    }
+  ];
 }
 
 function identifier$1(env) {
@@ -13231,11 +13231,11 @@ function identifier$1(env) {
   const name = Curry._2(Parser_env_Peek.value, undefined, env);
   token$4(env, /* T_JSX_IDENTIFIER */106);
   return [
-          loc,
-          {
-            name: name
-          }
-        ];
+    loc,
+    {
+      name: name
+    }
+  ];
 }
 
 function member_expression(env, _member) {
@@ -13273,9 +13273,9 @@ function name(env) {
   const match = Curry._2(Parser_env_Peek.token, undefined, env);
   if (!/* tag */(typeof match === "number" || typeof match === "string")) {
     return {
-            TAG: /* Identifier */0,
-            _0: name$1
-          };
+      TAG: /* Identifier */0,
+      _0: name$1
+    };
   }
   switch (match) {
     case /* T_PERIOD */9 :
@@ -13295,28 +13295,28 @@ function name(env) {
           member_1
         ];
         return {
-                TAG: /* MemberExpression */2,
-                _0: member_expression(env, member)
-              };
+          TAG: /* MemberExpression */2,
+          _0: member_expression(env, member)
+        };
     case /* T_COLON */77 :
         token$4(env, /* T_COLON */77);
         const name$2 = identifier$1(env);
         const loc$1 = btwn(name$1[0], name$2[0]);
         return {
-                TAG: /* NamespacedName */1,
-                _0: [
-                  loc$1,
-                  {
-                    namespace: name$1,
-                    name: name$2
-                  }
-                ]
-              };
+          TAG: /* NamespacedName */1,
+          _0: [
+            loc$1,
+            {
+              namespace: name$1,
+              name: name$2
+            }
+          ]
+        };
     default:
       return {
-              TAG: /* Identifier */0,
-              _0: name$1
-            };
+        TAG: /* Identifier */0,
+        _0: name$1
+      };
   }
 }
 
@@ -13423,12 +13423,12 @@ function attribute(env) {
     ];
   }
   return [
-          btwn(start_loc, match$1[0]),
-          {
-            name: match[1],
-            value: match$1[1]
-          }
-        ];
+    btwn(start_loc, match$1[0]),
+    {
+      name: match[1],
+      value: match$1[1]
+    }
+  ];
 }
 
 function attributes(env, _acc) {
@@ -13478,13 +13478,13 @@ function opening_element_without_lt(env, start_loc) {
   token$4(env, /* T_GREATER_THAN */90);
   pop_lex_mode(env);
   return [
-          btwn(start_loc, end_loc),
-          {
-            name: name$1,
-            selfClosing: selfClosing,
-            attributes: attributes$1
-          }
-        ];
+    btwn(start_loc, end_loc),
+    {
+      name: name$1,
+      selfClosing: selfClosing,
+      attributes: attributes$1
+    }
+  ];
 }
 
 function closing_element_without_lt(env, start_loc) {
@@ -13494,11 +13494,11 @@ function closing_element_without_lt(env, start_loc) {
   token$4(env, /* T_GREATER_THAN */90);
   double_pop_lex_mode(env);
   return [
-          btwn(start_loc, end_loc),
-          {
-            name: name$1
-          }
-        ];
+    btwn(start_loc, end_loc),
+    {
+      name: name$1
+    }
+  ];
 }
 
 function child(env) {
@@ -13507,36 +13507,36 @@ function child(env) {
     if (token$5 === /* T_LCURLY */1) {
       const expression_container$1 = expression_container(env);
       return [
-              expression_container$1[0],
-              {
-                TAG: /* ExpressionContainer */1,
-                _0: expression_container$1[1]
-              }
-            ];
+        expression_container$1[0],
+        {
+          TAG: /* ExpressionContainer */1,
+          _0: expression_container$1[1]
+        }
+      ];
     }
     
   } else if (token$5.TAG === /* T_JSX_TEXT */4) {
     const match = token$5._0;
     token$4(env, token$5);
     return [
-            match[0],
-            {
-              TAG: /* Text */2,
-              _0: {
-                value: match[1],
-                raw: match[2]
-              }
-            }
-          ];
+      match[0],
+      {
+        TAG: /* Text */2,
+        _0: {
+          value: match[1],
+          raw: match[2]
+        }
+      }
+    ];
   }
   const element$2 = element$1(env);
   return [
-          element$2[0],
-          {
-            TAG: /* Element */0,
-            _0: element$2[1]
-          }
-        ];
+    element$2[0],
+    {
+      TAG: /* Element */0,
+      _0: element$2[1]
+    }
+  ];
 }
 
 function element$1(env) {
@@ -13553,22 +13553,22 @@ function element_or_closing(env) {
   const match = Curry._2(Parser_env_Peek.token, undefined, env);
   if (!/* tag */(typeof match === "number" || typeof match === "string")) {
     return {
-            TAG: /* ChildElement */1,
-            _0: Curry._2(element_without_lt, env, start_loc)
-          };
+      TAG: /* ChildElement */1,
+      _0: Curry._2(element_without_lt, env, start_loc)
+    };
   }
   switch (match) {
     case /* T_DIV */96 :
     case /* T_EOF */105 :
         return {
-                TAG: /* Closing */0,
-                _0: closing_element_without_lt(env, start_loc)
-              };
+          TAG: /* Closing */0,
+          _0: closing_element_without_lt(env, start_loc)
+        };
     default:
       return {
-              TAG: /* ChildElement */1,
-              _0: Curry._2(element_without_lt, env, start_loc)
-            };
+        TAG: /* ChildElement */1,
+        _0: Curry._2(element_without_lt, env, start_loc)
+      };
   }
 }
 
@@ -13582,9 +13582,9 @@ function children_and_closing(env, _acc) {
             const closingElement = element_or_closing(env);
             if (closingElement.TAG === /* Closing */0) {
               return [
-                      Stdlib__List.rev(acc),
-                      closingElement._0
-                    ];
+                Stdlib__List.rev(acc),
+                closingElement._0
+              ];
             }
             const element = closingElement._0;
             const element_0 = element[0];
@@ -13604,9 +13604,9 @@ function children_and_closing(env, _acc) {
         case /* T_EOF */105 :
             error_unexpected(env);
             return [
-                    Stdlib__List.rev(acc),
-                    undefined
-                  ];
+              Stdlib__List.rev(acc),
+              undefined
+            ];
         default:
           _acc = {
             hd: child(env),
@@ -13665,13 +13665,13 @@ function element_without_lt(env, start_loc) {
     end_loc = openingElement[0];
   }
   return [
-          btwn(openingElement[0], end_loc),
-          {
-            openingElement: openingElement,
-            closingElement: closingElement,
-            children: match[0]
-          }
-        ];
+    btwn(openingElement[0], end_loc),
+    {
+      openingElement: openingElement,
+      closingElement: closingElement,
+      children: match[0]
+    }
+  ];
 }
 
 function module_item(env) {
@@ -13735,18 +13735,18 @@ function module_item(env) {
                   }
                 }
                 return [
-                        btwn(start_loc, match$3[0]),
-                        {
-                          TAG: /* ExportDeclaration */28,
-                          _0: {
-                            default: true,
-                            declaration: match$3[1],
-                            specifiers: undefined,
-                            source: undefined,
-                            exportKind: /* ExportValue */1
-                          }
-                        }
-                      ];
+                  btwn(start_loc, match$3[0]),
+                  {
+                    TAG: /* ExportDeclaration */28,
+                    _0: {
+                      default: true,
+                      declaration: match$3[1],
+                      specifiers: undefined,
+                      source: undefined,
+                      exportKind: /* ExportValue */1
+                    }
+                  }
+                ];
             case /* T_INTERFACE */51 :
                 if (!env$1.parse_options.types) {
                   error$1(env$1, /* UnexpectedTypeExport */9);
@@ -13755,9 +13755,9 @@ function module_item(env) {
                 const match$4 = $$interface$1[1];
                 if (/* tag */typeof match$4 === "number" || typeof match$4 === "string") {
                   throw new Caml_js_exceptions.MelangeError("Failure", {
-                            MEL_EXN_ID: "Failure",
-                            _1: "Internal Flow Error! Parsed `export interface` into something other than an interface declaration!"
-                          });
+                        MEL_EXN_ID: "Failure",
+                        _1: "Internal Flow Error! Parsed `export interface` into something other than an interface declaration!"
+                      });
                 }
                 if (match$4.TAG === /* InterfaceDeclaration */21) {
                   record_export(env$1, [
@@ -13766,27 +13766,27 @@ function module_item(env) {
                       ]);
                 } else {
                   throw new Caml_js_exceptions.MelangeError("Failure", {
-                            MEL_EXN_ID: "Failure",
-                            _1: "Internal Flow Error! Parsed `export interface` into something other than an interface declaration!"
-                          });
+                        MEL_EXN_ID: "Failure",
+                        _1: "Internal Flow Error! Parsed `export interface` into something other than an interface declaration!"
+                      });
                 }
                 const end_loc$1 = $$interface$1[0];
                 return [
-                        btwn(start_loc, end_loc$1),
-                        {
-                          TAG: /* ExportDeclaration */28,
-                          _0: {
-                            default: false,
-                            declaration: {
-                              TAG: /* Declaration */0,
-                              _0: $$interface$1
-                            },
-                            specifiers: undefined,
-                            source: undefined,
-                            exportKind: /* ExportType */0
-                          }
-                        }
-                      ];
+                  btwn(start_loc, end_loc$1),
+                  {
+                    TAG: /* ExportDeclaration */28,
+                    _0: {
+                      default: false,
+                      declaration: {
+                        TAG: /* Declaration */0,
+                        _0: $$interface$1
+                      },
+                      specifiers: undefined,
+                      source: undefined,
+                      exportKind: /* ExportType */0
+                    }
+                  }
+                ];
             case /* T_TYPE */59 :
                 if (Caml_obj.caml_notequal(Curry._2(Parser_env_Peek.token, 1, env$1), /* T_LCURLY */1)) {
                   if (!env$1.parse_options.types) {
@@ -13796,9 +13796,9 @@ function module_item(env) {
                   const match$5 = type_alias$1[1];
                   if (/* tag */typeof match$5 === "number" || typeof match$5 === "string") {
                     throw new Caml_js_exceptions.MelangeError("Failure", {
-                              MEL_EXN_ID: "Failure",
-                              _1: "Internal Flow Error! Parsed `export type` into something other than a type alias!"
-                            });
+                          MEL_EXN_ID: "Failure",
+                          _1: "Internal Flow Error! Parsed `export type` into something other than a type alias!"
+                        });
                   }
                   if (match$5.TAG === /* TypeAlias */7) {
                     record_export(env$1, [
@@ -13807,27 +13807,27 @@ function module_item(env) {
                         ]);
                   } else {
                     throw new Caml_js_exceptions.MelangeError("Failure", {
-                              MEL_EXN_ID: "Failure",
-                              _1: "Internal Flow Error! Parsed `export type` into something other than a type alias!"
-                            });
+                          MEL_EXN_ID: "Failure",
+                          _1: "Internal Flow Error! Parsed `export type` into something other than a type alias!"
+                        });
                   }
                   const end_loc$2 = type_alias$1[0];
                   return [
-                          btwn(start_loc, end_loc$2),
-                          {
-                            TAG: /* ExportDeclaration */28,
-                            _0: {
-                              default: false,
-                              declaration: {
-                                TAG: /* Declaration */0,
-                                _0: type_alias$1
-                              },
-                              specifiers: undefined,
-                              source: undefined,
-                              exportKind: /* ExportType */0
-                            }
-                          }
-                        ];
+                    btwn(start_loc, end_loc$2),
+                    {
+                      TAG: /* ExportDeclaration */28,
+                      _0: {
+                        default: false,
+                        declaration: {
+                          TAG: /* Declaration */0,
+                          _0: type_alias$1
+                        },
+                        specifiers: undefined,
+                        source: undefined,
+                        exportKind: /* ExportType */0
+                      }
+                    }
+                  ];
                 }
                 exit = 1;
                 break;
@@ -13856,18 +13856,18 @@ function module_item(env) {
                 const source$2 = source$1;
                 semicolon(env$1);
                 return [
-                        btwn(start_loc, end_loc$3),
-                        {
-                          TAG: /* ExportDeclaration */28,
-                          _0: {
-                            default: false,
-                            declaration: undefined,
-                            specifiers: specifiers,
-                            source: source$2,
-                            exportKind: /* ExportValue */1
-                          }
-                        }
-                      ];
+                  btwn(start_loc, end_loc$3),
+                  {
+                    TAG: /* ExportDeclaration */28,
+                    _0: {
+                      default: false,
+                      declaration: undefined,
+                      specifiers: specifiers,
+                      source: source$2,
+                      exportKind: /* ExportValue */1
+                    }
+                  }
+                ];
             default:
               exit = 1;
           }
@@ -13901,18 +13901,18 @@ function module_item(env) {
                 );
               semicolon(env$1);
               return [
-                      btwn(start_loc, end_loc$5),
-                      {
-                        TAG: /* ExportDeclaration */28,
-                        _0: {
-                          default: false,
-                          declaration: undefined,
-                          specifiers: specifiers$1,
-                          source: source$3,
-                          exportKind: exportKind
-                        }
-                      }
-                    ];
+                btwn(start_loc, end_loc$5),
+                {
+                  TAG: /* ExportDeclaration */28,
+                  _0: {
+                    default: false,
+                    declaration: undefined,
+                    specifiers: specifiers$1,
+                    source: source$3,
+                    exportKind: exportKind
+                  }
+                }
+              ];
           case 2 :
               const stmt = Curry._2(Parse.statement_list_item, decorators, env$1);
               const match$8 = stmt[1];
@@ -13920,9 +13920,9 @@ function module_item(env) {
               let names;
               if (/* tag */typeof match$8 === "number" || typeof match$8 === "string") {
                 throw new Caml_js_exceptions.MelangeError("Failure", {
-                          MEL_EXN_ID: "Failure",
-                          _1: "Internal Flow Error! Unexpected export statement declaration!"
-                        });
+                      MEL_EXN_ID: "Failure",
+                      _1: "Internal Flow Error! Unexpected export statement declaration!"
+                    });
               }
               switch (match$8.TAG) {
                 case /* FunctionDeclaration */18 :
@@ -13973,9 +13973,9 @@ function module_item(env) {
                     break;
                 default:
                   throw new Caml_js_exceptions.MelangeError("Failure", {
-                            MEL_EXN_ID: "Failure",
-                            _1: "Internal Flow Error! Unexpected export statement declaration!"
-                          });
+                        MEL_EXN_ID: "Failure",
+                        _1: "Internal Flow Error! Unexpected export statement declaration!"
+                      });
               }
               Stdlib__List.iter((function (param) {
                       return record_export(env$1, param);
@@ -13985,18 +13985,18 @@ function module_item(env) {
                 _0: stmt
               };
               return [
-                      btwn(start_loc, stmt[0]),
-                      {
-                        TAG: /* ExportDeclaration */28,
-                        _0: {
-                          default: false,
-                          declaration: declaration,
-                          specifiers: undefined,
-                          source: undefined,
-                          exportKind: /* ExportValue */1
-                        }
-                      }
-                    ];
+                btwn(start_loc, stmt[0]),
+                {
+                  TAG: /* ExportDeclaration */28,
+                  _0: {
+                    default: false,
+                    declaration: declaration,
+                    specifiers: undefined,
+                    source: undefined,
+                    exportKind: /* ExportValue */1
+                  }
+                }
+              ];
           
         }
     case /* T_IMPORT */48 :
@@ -14086,16 +14086,16 @@ function module_item(env) {
             const end_loc$6 = loc$5 !== undefined ? loc$5 : str_loc;
             semicolon(env$2);
             return [
-                    btwn(start_loc$1, end_loc$6),
-                    {
-                      TAG: /* ImportDeclaration */29,
-                      _0: {
-                        importKind: importKind,
-                        source: source$4,
-                        specifiers: /* [] */0
-                      }
-                    }
-                  ];
+              btwn(start_loc$1, end_loc$6),
+              {
+                TAG: /* ImportDeclaration */29,
+                _0: {
+                  importKind: importKind,
+                  source: source$4,
+                  specifiers: /* [] */0
+                }
+              }
+            ];
           }
           exit$3 = 2;
         } else {
@@ -14111,16 +14111,16 @@ function module_item(env) {
             const end_loc$7 = loc$6 !== undefined ? loc$6 : source$5[0];
             semicolon(env$2);
             return [
-                    btwn(start_loc$1, end_loc$7),
-                    {
-                      TAG: /* ImportDeclaration */29,
-                      _0: {
-                        importKind: importKind,
-                        source: source$5,
-                        specifiers: specifiers$2
-                      }
-                    }
-                  ];
+              btwn(start_loc$1, end_loc$7),
+              {
+                TAG: /* ImportDeclaration */29,
+                _0: {
+                  importKind: importKind,
+                  source: source$5,
+                  specifiers: specifiers$2
+                }
+              }
+            ];
           }
         }
         if (exit$2 === 1) {
@@ -14180,21 +14180,21 @@ function module_item(env) {
           const end_loc$8 = loc$7 !== undefined ? loc$7 : source$6[0];
           semicolon(env$2);
           return [
-                  btwn(start_loc$1, end_loc$8),
-                  {
-                    TAG: /* ImportDeclaration */29,
-                    _0: {
-                      importKind: match$16[0],
-                      source: source$6,
-                      specifiers: {
-                        hd: match$16[1],
-                        tl: additional_specifiers
-                      }
-                    }
-                  }
-                ];
-        }
-        case /* T_DECLARE */58 :
+            btwn(start_loc$1, end_loc$8),
+            {
+              TAG: /* ImportDeclaration */29,
+              _0: {
+                importKind: match$16[0],
+                source: source$6,
+                specifiers: {
+                  hd: match$16[1],
+                  tl: additional_specifiers
+                }
+              }
+            }
+          ];
+        }
+        case /* T_DECLARE */58 :
         if (Caml_obj.caml_equal(Curry._2(Parser_env_Peek.token, 1, env), /* T_EXPORT */47)) {
           error_on_decorators(env)(decorators);
           return declare_export_declaration(undefined, env);
@@ -14225,9 +14225,9 @@ function statement_list_item(decoratorsOpt, env) {
             const head = Stdlib__List.map((function (param) {
                     const match = param[1];
                     return {
-                            id: match.id,
-                            init: match.init
-                          };
+                      id: match.id,
+                      init: match.init
+                    };
                   }), match$1[1]);
             token$4(env, /* T_RPAREN */4);
             const body = Curry._1(Parse.statement, env);
@@ -14238,15 +14238,15 @@ function statement_list_item(decoratorsOpt, env) {
                     return error_at(env, param);
                   }), match$1[2]);
             return [
-                    btwn(start_loc, end_loc$1),
-                    {
-                      TAG: /* Let */17,
-                      _0: {
-                        head: head,
-                        body: body
-                      }
-                    }
-                  ];
+              btwn(start_loc, end_loc$1),
+              {
+                TAG: /* Let */17,
+                _0: {
+                  head: head,
+                  body: body
+                }
+              }
+            ];
           }
           const match$2 = helper(with_no_let(true, env), /* [] */0, /* [] */0);
           const declaration = {
@@ -14263,9 +14263,9 @@ function statement_list_item(decoratorsOpt, env) {
                   return error_at(env, param);
                 }), match$2[2]);
           return [
-                  btwn(start_loc, end_loc$3),
-                  declaration
-                ];
+            btwn(start_loc, end_loc$3),
+            declaration
+          ];
       default:
         
     }
@@ -14300,19 +14300,19 @@ function statement(env) {
         case /* T_LCURLY */1 :
             const match$1 = Curry._1(Parse.block_body, env);
             return [
-                    match$1[0],
-                    {
-                      TAG: /* Block */0,
-                      _0: match$1[1]
-                    }
-                  ];
+              match$1[0],
+              {
+                TAG: /* Block */0,
+                _0: match$1[1]
+              }
+            ];
         case /* T_SEMICOLON */7 :
             const loc = Curry._2(Parser_env_Peek.loc, undefined, env);
             token$4(env, /* T_SEMICOLON */7);
             return [
-                    loc,
-                    /* Empty */0
-                  ];
+              loc,
+              /* Empty */0
+            ];
         case /* T_IF */14 :
             return _if(env);
         case /* T_RETURN */17 :
@@ -14328,14 +14328,14 @@ function statement(env) {
               );
             semicolon(env);
             return [
-                    btwn(start_loc, end_loc),
-                    {
-                      TAG: /* Return */9,
-                      _0: {
-                        argument: argument
-                      }
-                    }
-                  ];
+              btwn(start_loc, end_loc),
+              {
+                TAG: /* Return */9,
+                _0: {
+                  argument: argument
+                }
+              }
+            ];
         case /* T_SWITCH */18 :
             const start_loc$1 = Curry._2(Parser_env_Peek.loc, undefined, env);
             token$4(env, /* T_SWITCH */18);
@@ -14350,16 +14350,16 @@ function statement(env) {
             const end_loc$1 = Curry._2(Parser_env_Peek.loc, undefined, env);
             token$4(env, /* T_RCURLY */2);
             return [
-                    btwn(start_loc$1, end_loc$1),
-                    {
-                      TAG: /* Switch */8,
-                      _0: {
-                        discriminant: discriminant,
-                        cases: cases,
-                        lexical: false
-                      }
-                    }
-                  ];
+              btwn(start_loc$1, end_loc$1),
+              {
+                TAG: /* Switch */8,
+                _0: {
+                  discriminant: discriminant,
+                  cases: cases,
+                  lexical: false
+                }
+              }
+            ];
         case /* T_THROW */20 :
             const start_loc$2 = Curry._2(Parser_env_Peek.loc, undefined, env);
             token$4(env, /* T_THROW */20);
@@ -14374,14 +14374,14 @@ function statement(env) {
             const end_loc$2 = loc$2 !== undefined ? loc$2 : argument$1[0];
             semicolon(env);
             return [
-                    btwn(start_loc$2, end_loc$2),
-                    {
-                      TAG: /* Throw */10,
-                      _0: {
-                        argument: argument$1
-                      }
-                    }
-                  ];
+              btwn(start_loc$2, end_loc$2),
+              {
+                TAG: /* Throw */10,
+                _0: {
+                  argument: argument$1
+                }
+              }
+            ];
         case /* T_TRY */21 :
             const start_loc$3 = Curry._2(Parser_env_Peek.loc, undefined, env);
             token$4(env, /* T_TRY */21);
@@ -14431,17 +14431,17 @@ function statement(env) {
                         ]), block[0])
               );
             return [
-                    btwn(start_loc$3, end_loc$3),
-                    {
-                      TAG: /* Try */11,
-                      _0: {
-                        block: block,
-                        handler: handler,
-                        guardedHandlers: /* [] */0,
-                        finalizer: finalizer
-                      }
-                    }
-                  ];
+              btwn(start_loc$3, end_loc$3),
+              {
+                TAG: /* Try */11,
+                _0: {
+                  block: block,
+                  handler: handler,
+                  guardedHandlers: /* [] */0,
+                  finalizer: finalizer
+                }
+              }
+            ];
         case /* T_VAR */22 :
             return var_or_const(env);
         case /* T_WHILE */23 :
@@ -14452,15 +14452,15 @@ function statement(env) {
             token$4(env, /* T_RPAREN */4);
             const body$1 = Curry._1(Parse.statement, with_in_loop(true, env));
             return [
-                    btwn(start_loc$5, body$1[0]),
-                    {
-                      TAG: /* While */12,
-                      _0: {
-                        test: test,
-                        body: body$1
-                      }
-                    }
-                  ];
+              btwn(start_loc$5, body$1[0]),
+              {
+                TAG: /* While */12,
+                _0: {
+                  test: test,
+                  body: body$1
+                }
+              }
+            ];
         case /* T_WITH */24 :
             const start_loc$6 = Curry._2(Parser_env_Peek.loc, undefined, env);
             token$4(env, /* T_WITH */24);
@@ -14474,15 +14474,15 @@ function statement(env) {
                   /* StrictModeWith */25
                 ]);
             return [
-                    loc$4,
-                    {
-                      TAG: /* With */6,
-                      _0: {
-                        _object: _object,
-                        body: body$2
-                      }
-                    }
-                  ];
+              loc$4,
+              {
+                TAG: /* With */6,
+                _0: {
+                  _object: _object,
+                  body: body$2
+                }
+              }
+            ];
         case /* T_BREAK */30 :
             const start_loc$7 = Curry._2(Parser_env_Peek.loc, undefined, env);
             token$4(env, /* T_BREAK */30);
@@ -14513,14 +14513,14 @@ function statement(env) {
             }
             semicolon(env);
             return [
-                    loc$6,
-                    {
-                      TAG: /* Break */4,
-                      _0: {
-                        label: label
-                      }
-                    }
-                  ];
+              loc$6,
+              {
+                TAG: /* Break */4,
+                _0: {
+                  label: label
+                }
+              }
+            ];
         case /* T_CONTINUE */33 :
             const start_loc$8 = Curry._2(Parser_env_Peek.loc, undefined, env);
             token$4(env, /* T_CONTINUE */33);
@@ -14551,14 +14551,14 @@ function statement(env) {
             }
             semicolon(env);
             return [
-                    loc$8,
-                    {
-                      TAG: /* Continue */5,
-                      _0: {
-                        label: label$2
-                      }
-                    }
-                  ];
+              loc$8,
+              {
+                TAG: /* Continue */5,
+                _0: {
+                  label: label$2
+                }
+              }
+            ];
         case /* T_DO */35 :
             const start_loc$9 = Curry._2(Parser_env_Peek.loc, undefined, env);
             token$4(env, /* T_DO */35);
@@ -14574,15 +14574,15 @@ function statement(env) {
               semicolon(env);
             }
             return [
-                    btwn(start_loc$9, end_loc$7),
-                    {
-                      TAG: /* DoWhile */13,
-                      _0: {
-                        body: body$3,
-                        test: test$1
-                      }
-                    }
-                  ];
+              btwn(start_loc$9, end_loc$7),
+              {
+                TAG: /* DoWhile */13,
+                _0: {
+                  body: body$3,
+                  test: test$1
+                }
+              }
+            ];
         case /* T_FOR */37 :
             const start_loc$10 = Curry._2(Parser_env_Peek.loc, undefined, env);
             token$4(env, /* T_FOR */37);
@@ -14653,74 +14653,74 @@ function statement(env) {
                     let left;
                     if (init !== undefined) {
                       left = init.TAG === /* InitDeclaration */0 ? ({
-                            TAG: /* LeftDeclaration */0,
-                            _0: init._0
-                          }) : ({
-                            TAG: /* LeftExpression */1,
-                            _0: init._0
-                          });
+                          TAG: /* LeftDeclaration */0,
+                          _0: init._0
+                        }) : ({
+                          TAG: /* LeftExpression */1,
+                          _0: init._0
+                        });
                     } else {
                       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                MEL_EXN_ID: "Assert_failure",
-                                _1: [
-                                  "parser_flow.ml",
-                                  2556,
-                                  22
-                                ]
-                              });
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "parser_flow.ml",
+                              2556,
+                              22
+                            ]
+                          });
                     }
                     token$4(env, /* T_IN */15);
                     const right = Curry._1(Parse.expression, env);
                     token$4(env, /* T_RPAREN */4);
                     const body$4 = Curry._1(Parse.statement, with_in_loop(true, env));
                     return [
-                            btwn(start_loc$10, body$4[0]),
-                            {
-                              TAG: /* ForIn */15,
-                              _0: {
-                                left: left,
-                                right: right,
-                                body: body$4,
-                                each: false
-                              }
-                            }
-                          ];
+                      btwn(start_loc$10, body$4[0]),
+                      {
+                        TAG: /* ForIn */15,
+                        _0: {
+                          left: left,
+                          right: right,
+                          body: body$4,
+                          each: false
+                        }
+                      }
+                    ];
                 case /* T_OF */60 :
                     assert_can_be_forin_or_forof(env, /* InvalidLHSInForOf */17)(init);
                     let left$1;
                     if (init !== undefined) {
                       left$1 = init.TAG === /* InitDeclaration */0 ? ({
-                            TAG: /* LeftDeclaration */0,
-                            _0: init._0
-                          }) : ({
-                            TAG: /* LeftExpression */1,
-                            _0: init._0
-                          });
+                          TAG: /* LeftDeclaration */0,
+                          _0: init._0
+                        }) : ({
+                          TAG: /* LeftExpression */1,
+                          _0: init._0
+                        });
                     } else {
                       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                MEL_EXN_ID: "Assert_failure",
-                                _1: [
-                                  "parser_flow.ml",
-                                  2573,
-                                  22
-                                ]
-                              });
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "parser_flow.ml",
+                              2573,
+                              22
+                            ]
+                          });
                     }
                     token$4(env, /* T_OF */60);
                     const right$1 = Curry._1(Parse.assignment, env);
                     token$4(env, /* T_RPAREN */4);
                     const body$5 = Curry._1(Parse.statement, with_in_loop(true, env));
                     return [
-                            btwn(start_loc$10, body$5[0]),
-                            {
-                              TAG: /* ForOf */16,
-                              _0: {
-                                left: left$1,
-                                right: right$1,
-                                body: body$5
-                              }
-                            }
-                          ];
+                      btwn(start_loc$10, body$5[0]),
+                      {
+                        TAG: /* ForOf */16,
+                        _0: {
+                          left: left$1,
+                          right: right$1,
+                          body: body$5
+                        }
+                      }
+                    ];
                 default:
                   
               }
@@ -14739,17 +14739,17 @@ function statement(env) {
             token$4(env, /* T_RPAREN */4);
             const body$6 = Curry._1(Parse.statement, with_in_loop(true, env));
             return [
-                    btwn(start_loc$10, body$6[0]),
-                    {
-                      TAG: /* For */14,
-                      _0: {
-                        init: init,
-                        test: test$2,
-                        update: update,
-                        body: body$6
-                      }
-                    }
-                  ];
+              btwn(start_loc$10, body$6[0]),
+              {
+                TAG: /* For */14,
+                _0: {
+                  init: init,
+                  test: test$2,
+                  update: update,
+                  body: body$6
+                }
+              }
+            ];
         case /* T_DEBUGGER */57 :
             const start_loc$11 = Curry._2(Parser_env_Peek.loc, undefined, env);
             token$4(env, /* T_DEBUGGER */57);
@@ -14757,15 +14757,15 @@ function statement(env) {
             const end_loc$8 = loc$10 !== undefined ? loc$10 : start_loc$11;
             semicolon(env);
             return [
-                    btwn(start_loc$11, end_loc$8),
-                    /* Debugger */1
-                  ];
+              btwn(start_loc$11, end_loc$8),
+              /* Debugger */1
+            ];
         case /* T_EOF */105 :
             error_unexpected(env);
             return [
-                    Curry._2(Parser_env_Peek.loc, undefined, env),
-                    /* Empty */0
-                  ];
+              Curry._2(Parser_env_Peek.loc, undefined, env),
+              /* Empty */0
+            ];
         default:
           exit = 2;
       }
@@ -14796,28 +14796,28 @@ function statement(env) {
           const env$1 = add_label(env, name$2);
           const labeled_stmt = Curry._1(Parse.statement, env$1);
           return [
-                  btwn(loc$11, labeled_stmt[0]),
-                  {
-                    TAG: /* Labeled */3,
-                    _0: {
-                      label: label$5,
-                      body: labeled_stmt
-                    }
-                  }
-                ];
+            btwn(loc$11, labeled_stmt[0]),
+            {
+              TAG: /* Labeled */3,
+              _0: {
+                label: label$5,
+                body: labeled_stmt
+              }
+            }
+          ];
         }
         const loc$12 = Curry._2(Parser_env_Peek.semicolon_loc, undefined, env);
         const end_loc$9 = loc$12 !== undefined ? loc$12 : expr$1[0];
         semicolon(env);
         return [
-                btwn(expr$1[0], end_loc$9),
-                {
-                  TAG: /* Expression */1,
-                  _0: {
-                    expression: expr$1
-                  }
-                }
-              ];
+          btwn(expr$1[0], end_loc$9),
+          {
+            TAG: /* Expression */1,
+            _0: {
+              expression: expr$1
+            }
+          }
+        ];
       }
       if (!/* tag */(typeof match === "number" || typeof match === "string")) {
         return expression(env);
@@ -14882,17 +14882,17 @@ function statement_list(_env, term_fn, item_fn, _param) {
     const t = Curry._2(Parser_env_Peek.token, undefined, env);
     if (/* tag */(typeof t === "number" || typeof t === "string") && t === /* T_EOF */105) {
       return [
-              env,
-              string_tokens,
-              stmts
-            ];
+        env,
+        string_tokens,
+        stmts
+      ];
     }
     if (Curry._1(term_fn, t)) {
       return [
-              env,
-              string_tokens,
-              stmts
-            ];
+        env,
+        string_tokens,
+        stmts
+      ];
     }
     const string_token_0 = Curry._2(Parser_env_Peek.loc, undefined, env);
     const string_token_1 = Curry._2(Parser_env_Peek.token, undefined, env);
@@ -14908,48 +14908,48 @@ function statement_list(_env, term_fn, item_fn, _param) {
     const match = possible_directive[1];
     if (/* tag */typeof match === "number" || typeof match === "string") {
       return [
-              env,
-              string_tokens,
-              stmts$1
-            ];
+        env,
+        string_tokens,
+        stmts$1
+      ];
     }
     if (match.TAG !== /* Expression */1) {
       return [
-              env,
-              string_tokens,
-              stmts$1
-            ];
+        env,
+        string_tokens,
+        stmts$1
+      ];
     }
     const match$1 = match._0.expression;
     const match$2 = match$1[1];
     if (/* tag */typeof match$2 === "number" || typeof match$2 === "string") {
       return [
-              env,
-              string_tokens,
-              stmts$1
-            ];
+        env,
+        string_tokens,
+        stmts$1
+      ];
     }
     if (match$2.TAG !== /* Literal */19) {
       return [
-              env,
-              string_tokens,
-              stmts$1
-            ];
+        env,
+        string_tokens,
+        stmts$1
+      ];
     }
     const str = match$2._0.value;
     if (/* tag */typeof str === "number" || typeof str === "string") {
       return [
-              env,
-              string_tokens,
-              stmts$1
-            ];
+        env,
+        string_tokens,
+        stmts$1
+      ];
     }
     if (str.TAG !== /* String */0) {
       return [
-              env,
-              string_tokens,
-              stmts$1
-            ];
+        env,
+        string_tokens,
+        stmts$1
+      ];
     }
     const loc = match$1[0];
     const len = loc._end.column - loc.start.column | 0;
@@ -14978,23 +14978,23 @@ function directives(env, term_fn, item_fn) {
           if (!/* tag */(typeof token === "number" || typeof token === "string") && token.TAG === /* T_STRING */1) {
             if (token._0[3]) {
               return strict_error_at(env$1, [
-                          param[0],
-                          /* StrictOctalLiteral */31
-                        ]);
+                    param[0],
+                    /* StrictOctalLiteral */31
+                  ]);
             } else {
               return ;
             }
           }
           const s = "Nooo: " + (token_to_string(token) + "\n");
           throw new Caml_js_exceptions.MelangeError("Failure", {
-                    MEL_EXN_ID: "Failure",
-                    _1: s
-                  });
+                MEL_EXN_ID: "Failure",
+                _1: s
+              });
         }), Stdlib__List.rev(match[1]));
   return [
-          env$1,
-          match[2]
-        ];
+    env$1,
+    match[2]
+  ];
 }
 
 function statement_list$1(term_fn, env) {
@@ -15026,14 +15026,14 @@ function statement_list_with_directives(term_fn, env) {
   const stmts = Curry._2(statement_list$1, term_fn, env$1);
   const stmts$1 = Stdlib__List.fold_left((function (acc, stmt) {
           return {
-                  hd: stmt,
-                  tl: acc
-                };
+            hd: stmt,
+            tl: acc
+          };
         }), stmts, match[1]);
   return [
-          stmts$1,
-          env$1.in_strict_mode
-        ];
+    stmts$1,
+    env$1.in_strict_mode
+  ];
 }
 
 function identifier$2(restricted_error, env) {
@@ -15081,24 +15081,24 @@ function identifier$2(restricted_error, env) {
         ]);
   }
   return [
-          loc,
-          {
-            name: name,
-            typeAnnotation: undefined,
-            optional: false
-          }
-        ];
+    loc,
+    {
+      name: name,
+      typeAnnotation: undefined,
+      optional: false
+    }
+  ];
 }
 
 function module_body_with_directives(env, term_fn) {
   const match = Curry._3(directives, env, term_fn, module_item);
   const stmts = Curry._2(module_body, term_fn, match[0]);
   return Stdlib__List.fold_left((function (acc, stmt) {
-                return {
-                        hd: stmt,
-                        tl: acc
-                      };
-              }), stmts, match[1]);
+          return {
+            hd: stmt,
+            tl: acc
+          };
+        }), stmts, match[1]);
 }
 
 function program(env) {
@@ -15110,10 +15110,10 @@ function program(env) {
   const loc = stmts ? btwn(Stdlib__List.hd(stmts)[0], Stdlib__List.hd(Stdlib__List.rev(stmts))[0]) : end_loc;
   const comments = Stdlib__List.rev(env.comments.contents);
   return [
-          loc,
-          stmts,
-          comments
-        ];
+    loc,
+    stmts,
+    comments
+  ];
 }
 
 function expression$1(env) {
@@ -15121,9 +15121,9 @@ function expression$1(env) {
   const match = Curry._2(Parser_env_Peek.token, undefined, env);
   if (/* tag */(typeof match === "number" || typeof match === "string") && match === /* T_COMMA */8) {
     return sequence(env, {
-                hd: expr,
-                tl: /* [] */0
-              });
+          hd: expr,
+          tl: /* [] */0
+        });
   } else {
     return expr;
   }
@@ -15158,21 +15158,21 @@ function identifier_with_type(env, restricted_error) {
   const loc$2 = match$1[0];
   if (!Caml_obj.caml_equal(Curry._2(Parser_env_Peek.token, undefined, env), /* T_COLON */77)) {
     return [
-            loc$2,
-            id$1
-          ];
+      loc$2,
+      id$1
+    ];
   }
   const typeAnnotation = wrap(annotation, env);
   const loc$3 = btwn(loc$2, typeAnnotation[0]);
   const typeAnnotation$1 = typeAnnotation;
   return [
-          loc$3,
-          {
-            name: id$1.name,
-            typeAnnotation: typeAnnotation$1,
-            optional: id$1.optional
-          }
-        ];
+    loc$3,
+    {
+      name: id$1.name,
+      typeAnnotation: typeAnnotation$1,
+      optional: id$1.optional
+    }
+  ];
 }
 
 function block_body(env) {
@@ -15185,11 +15185,11 @@ function block_body(env) {
   const end_loc = Curry._2(Parser_env_Peek.loc, undefined, env);
   token$4(env, /* T_RCURLY */2);
   return [
-          btwn(start_loc, end_loc),
-          {
-            body: body
-          }
-        ];
+    btwn(start_loc, end_loc),
+    {
+      body: body
+    }
+  ];
 }
 
 function function_block_body(env) {
@@ -15202,12 +15202,12 @@ function function_block_body(env) {
   const end_loc = Curry._2(Parser_env_Peek.loc, undefined, env);
   token$4(env, /* T_RCURLY */2);
   return [
-          btwn(start_loc, end_loc),
-          {
-            body: match[0]
-          },
-          match[1]
-        ];
+    btwn(start_loc, end_loc),
+    {
+      body: match[0]
+    },
+    match[1]
+  ];
 }
 
 function predicate(env) {
@@ -15218,21 +15218,21 @@ function predicate(env) {
   token$4(env, /* T_IDENTIFIER */0);
   if (!maybe(env, /* T_LPAREN */3)) {
     return [
-            checks_loc,
-            /* Inferred */0
-          ];
+      checks_loc,
+      /* Inferred */0
+    ];
   }
   const exp = Curry._1(Parse.expression, env);
   const rparen_loc = Curry._2(Parser_env_Peek.loc, undefined, env);
   token$4(env, /* T_RPAREN */4);
   const loc = btwn(checks_loc, rparen_loc);
   return [
-          loc,
-          {
-            TAG: /* Declared */0,
-            _0: exp
-          }
-        ];
+    loc,
+    {
+      TAG: /* Declared */0,
+      _0: exp
+    }
+  ];
 }
 
 Caml_module.update_mod({
@@ -15372,14 +15372,14 @@ function program$1(failOpt, token_sinkOpt, parse_optionsOpt, content) {
   const error_list = filter_duplicate_errors(env.errors.contents);
   if (fail && Caml_obj.caml_notequal(error_list, /* [] */0)) {
     throw new Caml_js_exceptions.MelangeError($$Error, {
-              MEL_EXN_ID: $$Error,
-              _1: error_list
-            });
+          MEL_EXN_ID: $$Error,
+          _1: error_list
+        });
   }
   return [
-          ast,
-          error_list
-        ];
+    ast,
+    error_list
+  ];
 }
 
 const translation_errors = {
@@ -15435,15 +15435,15 @@ function parse(content, options) {
     };
     const position = function (p) {
       return obj([
-                  [
-                    "line",
-                    number$1(p.line)
-                  ],
-                  [
-                    "column",
-                    number$1(p.column)
-                  ]
-                ]);
+            [
+              "line",
+              number$1(p.line)
+            ],
+            [
+              "column",
+              number$1(p.column)
+            ]
+          ]);
     };
     const loc = function ($$location) {
       const match = $$location.source;
@@ -15451,54 +15451,54 @@ function parse(content, options) {
           /* tag */typeof match === "number" || typeof match === "string" ? string("(global)") : string(match._0)
         ) : $$null;
       return obj([
-                  [
-                    "source",
-                    source
-                  ],
-                  [
-                    "start",
-                    position($$location.start)
-                  ],
-                  [
-                    "end",
-                    position($$location._end)
-                  ]
-                ]);
+            [
+              "source",
+              source
+            ],
+            [
+              "start",
+              position($$location.start)
+            ],
+            [
+              "end",
+              position($$location._end)
+            ]
+          ]);
     };
     const range = function ($$location) {
       return array([
-                  number$1($$location.start.offset),
-                  number$1($$location._end.offset)
-                ]);
+            number$1($$location.start.offset),
+            number$1($$location._end.offset)
+          ]);
     };
     const node = function (_type, $$location, props) {
       return obj(Stdlib__Array.append([
-                      [
-                        "type",
-                        string(_type)
-                      ],
-                      [
-                        "loc",
-                        loc($$location)
-                      ],
-                      [
-                        "range",
-                        range($$location)
-                      ]
-                    ], props));
+                [
+                  "type",
+                  string(_type)
+                ],
+                [
+                  "loc",
+                  loc($$location)
+                ],
+                [
+                  "range",
+                  range($$location)
+                ]
+              ], props));
     };
     const errors = function (l) {
       const error$2 = function (param) {
         return obj([
-                    [
-                      "loc",
-                      loc(param[0])
-                    ],
-                    [
-                      "message",
-                      string(error(param[1]))
-                    ]
-                  ]);
+              [
+                "loc",
+                loc(param[0])
+              ],
+              [
+                "message",
+                string(error(param[1]))
+              ]
+            ]);
       };
       return array_of_list(error$2, l);
     };
@@ -15528,25 +15528,25 @@ function parse(content, options) {
           case /* Nullable */0 :
               let t$1 = t._0;
               return node("NullableTypeAnnotation", loc, [[
-                            "typeAnnotation",
-                            _type(t$1)
-                          ]]);
+                      "typeAnnotation",
+                      _type(t$1)
+                    ]]);
           case /* Function */1 :
               return function_type([
-                          loc,
-                          t._0
-                        ]);
+                    loc,
+                    t._0
+                  ]);
           case /* Object */2 :
               return object_type([
-                          loc,
-                          t._0
-                        ]);
+                    loc,
+                    t._0
+                  ]);
           case /* Array */3 :
               let t$2 = t._0;
               return node("ArrayTypeAnnotation", loc, [[
-                            "elementType",
-                            _type(t$2)
-                          ]]);
+                      "elementType",
+                      _type(t$2)
+                    ]]);
           case /* Generic */4 :
               let param$1 = [
                 loc,
@@ -15557,51 +15557,51 @@ function parse(content, options) {
               let id$1;
               id$1 = id.TAG === /* Unqualified */0 ? identifier(id._0) : generic_type_qualified_identifier(id._0);
               return node("GenericTypeAnnotation", param$1[0], [
-                          [
-                            "id",
-                            id$1
-                          ],
-                          [
-                            "typeParameters",
-                            option(type_parameter_instantiation, g.typeParameters)
-                          ]
-                        ]);
+                    [
+                      "id",
+                      id$1
+                    ],
+                    [
+                      "typeParameters",
+                      option(type_parameter_instantiation, g.typeParameters)
+                    ]
+                  ]);
           case /* Union */5 :
               let param$2 = [
                 loc,
                 t._0
               ];
               return node("UnionTypeAnnotation", param$2[0], [[
-                            "types",
-                            array_of_list(_type, param$2[1])
-                          ]]);
+                      "types",
+                      array_of_list(_type, param$2[1])
+                    ]]);
           case /* Intersection */6 :
               let param$3 = [
                 loc,
                 t._0
               ];
               return node("IntersectionTypeAnnotation", param$3[0], [[
-                            "types",
-                            array_of_list(_type, param$3[1])
-                          ]]);
+                      "types",
+                      array_of_list(_type, param$3[1])
+                    ]]);
           case /* Typeof */7 :
               let param$4 = [
                 loc,
                 t._0
               ];
               return node("TypeofTypeAnnotation", param$4[0], [[
-                            "argument",
-                            _type(param$4[1])
-                          ]]);
+                      "argument",
+                      _type(param$4[1])
+                    ]]);
           case /* Tuple */8 :
               let param$5 = [
                 loc,
                 t._0
               ];
               return node("TupleTypeAnnotation", param$5[0], [[
-                            "types",
-                            array_of_list(_type, param$5[1])
-                          ]]);
+                      "types",
+                      array_of_list(_type, param$5[1])
+                    ]]);
           case /* StringLiteral */9 :
               let param$6 = [
                 loc,
@@ -15609,15 +15609,15 @@ function parse(content, options) {
               ];
               const s = param$6[1];
               return node("StringLiteralTypeAnnotation", param$6[0], [
-                          [
-                            "value",
-                            string(s.value)
-                          ],
-                          [
-                            "raw",
-                            string(s.raw)
-                          ]
-                        ]);
+                    [
+                      "value",
+                      string(s.value)
+                    ],
+                    [
+                      "raw",
+                      string(s.raw)
+                    ]
+                  ]);
           case /* NumberLiteral */10 :
               let param$7 = [
                 loc,
@@ -15625,15 +15625,15 @@ function parse(content, options) {
               ];
               const s$1 = param$7[1];
               return node("NumberLiteralTypeAnnotation", param$7[0], [
-                          [
-                            "value",
-                            number$1(s$1.value)
-                          ],
-                          [
-                            "raw",
-                            string(s$1.raw)
-                          ]
-                        ]);
+                    [
+                      "value",
+                      number$1(s$1.value)
+                    ],
+                    [
+                      "raw",
+                      string(s$1.raw)
+                    ]
+                  ]);
           case /* BooleanLiteral */11 :
               let param$8 = [
                 loc,
@@ -15641,15 +15641,15 @@ function parse(content, options) {
               ];
               const s$2 = param$8[1];
               return node("BooleanLiteralTypeAnnotation", param$8[0], [
-                          [
-                            "value",
-                            bool(s$2.value)
-                          ],
-                          [
-                            "raw",
-                            string(s$2.raw)
-                          ]
-                        ]);
+                    [
+                      "value",
+                      bool(s$2.value)
+                    ],
+                    [
+                      "raw",
+                      string(s$2.raw)
+                    ]
+                  ]);
           
         }
       }
@@ -15657,25 +15657,25 @@ function parse(content, options) {
     const identifier = function (param) {
       const id = param[1];
       return node("Identifier", param[0], [
-                  [
-                    "name",
-                    string(id.name)
-                  ],
-                  [
-                    "typeAnnotation",
-                    option(type_annotation, id.typeAnnotation)
-                  ],
-                  [
-                    "optional",
-                    bool(id.optional)
-                  ]
-                ]);
+            [
+              "name",
+              string(id.name)
+            ],
+            [
+              "typeAnnotation",
+              option(type_annotation, id.typeAnnotation)
+            ],
+            [
+              "optional",
+              bool(id.optional)
+            ]
+          ]);
     };
     const type_annotation = function (param) {
       return node("TypeAnnotation", param[0], [[
-                    "typeAnnotation",
-                    _type(param[1])
-                  ]]);
+              "typeAnnotation",
+              _type(param[1])
+            ]]);
     };
     const expression = function (param) {
       const arr = param[1];
@@ -15686,83 +15686,83 @@ function parse(content, options) {
       switch (arr.TAG) {
         case /* Array */0 :
             return node("ArrayExpression", loc, [[
-                          "elements",
-                          array_of_list((function (param) {
-                                  return option(expression_or_spread, param);
-                                }), arr._0.elements)
-                        ]]);
+                    "elements",
+                    array_of_list((function (param) {
+                            return option(expression_or_spread, param);
+                          }), arr._0.elements)
+                  ]]);
         case /* Object */1 :
             return node("ObjectExpression", loc, [[
-                          "properties",
-                          array_of_list(object_property, arr._0.properties)
-                        ]]);
+                    "properties",
+                    array_of_list(object_property, arr._0.properties)
+                  ]]);
         case /* Function */2 :
             return function_expression([
-                        loc,
-                        arr._0
-                      ]);
+                  loc,
+                  arr._0
+                ]);
         case /* ArrowFunction */3 :
             const arrow = arr._0;
             const b = arrow.body;
             let body;
             body = b.TAG === /* BodyBlock */0 ? block(b._0) : expression(b._0);
             return node("ArrowFunctionExpression", loc, [
-                        [
-                          "id",
-                          option(identifier, arrow.id)
-                        ],
-                        [
-                          "params",
-                          array_of_list(pattern, arrow.params)
-                        ],
-                        [
-                          "defaults",
-                          array_of_list((function (param) {
-                                  return option(expression, param);
-                                }), arrow.defaults)
-                        ],
-                        [
-                          "rest",
-                          option(identifier, arrow.rest)
-                        ],
-                        [
-                          "body",
-                          body
-                        ],
-                        [
-                          "async",
-                          bool(arrow.async)
-                        ],
-                        [
-                          "generator",
-                          bool(arrow.generator)
-                        ],
-                        [
-                          "expression",
-                          bool(arrow.expression)
-                        ],
-                        [
-                          "returnType",
-                          option(type_annotation, arrow.returnType)
-                        ],
-                        [
-                          "typeParameters",
-                          option(type_parameter_declaration, arrow.typeParameters)
-                        ]
-                      ]);
+                  [
+                    "id",
+                    option(identifier, arrow.id)
+                  ],
+                  [
+                    "params",
+                    array_of_list(pattern, arrow.params)
+                  ],
+                  [
+                    "defaults",
+                    array_of_list((function (param) {
+                            return option(expression, param);
+                          }), arrow.defaults)
+                  ],
+                  [
+                    "rest",
+                    option(identifier, arrow.rest)
+                  ],
+                  [
+                    "body",
+                    body
+                  ],
+                  [
+                    "async",
+                    bool(arrow.async)
+                  ],
+                  [
+                    "generator",
+                    bool(arrow.generator)
+                  ],
+                  [
+                    "expression",
+                    bool(arrow.expression)
+                  ],
+                  [
+                    "returnType",
+                    option(type_annotation, arrow.returnType)
+                  ],
+                  [
+                    "typeParameters",
+                    option(type_parameter_declaration, arrow.typeParameters)
+                  ]
+                ]);
         case /* Sequence */4 :
             return node("SequenceExpression", loc, [[
-                          "expressions",
-                          array_of_list(expression, arr._0.expressions)
-                        ]]);
+                    "expressions",
+                    array_of_list(expression, arr._0.expressions)
+                  ]]);
         case /* Unary */5 :
             const unary = arr._0;
             const match = unary.operator;
             if (match === /* Await */7) {
               return node("AwaitExpression", loc, [[
-                            "argument",
-                            expression(unary.argument)
-                          ]]);
+                      "argument",
+                      expression(unary.argument)
+                    ]]);
             }
             const match$1 = unary.operator;
             let operator;
@@ -15790,25 +15790,25 @@ function parse(content, options) {
                   break;
               case /* Await */7 :
                   throw new Caml_js_exceptions.MelangeError("Failure", {
-                            MEL_EXN_ID: "Failure",
-                            _1: "matched above"
-                          });
+                        MEL_EXN_ID: "Failure",
+                        _1: "matched above"
+                      });
               
             }
             return node("UnaryExpression", loc, [
-                        [
-                          "operator",
-                          string(operator)
-                        ],
-                        [
-                          "prefix",
-                          bool(unary.prefix)
-                        ],
-                        [
-                          "argument",
-                          expression(unary.argument)
-                        ]
-                      ]);
+                  [
+                    "operator",
+                    string(operator)
+                  ],
+                  [
+                    "prefix",
+                    bool(unary.prefix)
+                  ],
+                  [
+                    "argument",
+                    expression(unary.argument)
+                  ]
+                ]);
         case /* Binary */6 :
             const binary = arr._0;
             const match$2 = binary.operator;
@@ -15883,19 +15883,19 @@ function parse(content, options) {
               
             }
             return node("BinaryExpression", loc, [
-                        [
-                          "operator",
-                          string(operator$1)
-                        ],
-                        [
-                          "left",
-                          expression(binary.left)
-                        ],
-                        [
-                          "right",
-                          expression(binary.right)
-                        ]
-                      ]);
+                  [
+                    "operator",
+                    string(operator$1)
+                  ],
+                  [
+                    "left",
+                    expression(binary.left)
+                  ],
+                  [
+                    "right",
+                    expression(binary.right)
+                  ]
+                ]);
         case /* Assignment */7 :
             const assignment = arr._0;
             const match$3 = assignment.operator;
@@ -15943,176 +15943,176 @@ function parse(content, options) {
               
             }
             return node("AssignmentExpression", loc, [
-                        [
-                          "operator",
-                          string(operator$2)
-                        ],
-                        [
-                          "left",
-                          pattern(assignment.left)
-                        ],
-                        [
-                          "right",
-                          expression(assignment.right)
-                        ]
-                      ]);
+                  [
+                    "operator",
+                    string(operator$2)
+                  ],
+                  [
+                    "left",
+                    pattern(assignment.left)
+                  ],
+                  [
+                    "right",
+                    expression(assignment.right)
+                  ]
+                ]);
         case /* Update */8 :
             const update = arr._0;
             const match$4 = update.operator;
             let operator$3;
             operator$3 = match$4 === /* Increment */0 ? "++" : "--";
             return node("UpdateExpression", loc, [
-                        [
-                          "operator",
-                          string(operator$3)
-                        ],
-                        [
-                          "argument",
-                          expression(update.argument)
-                        ],
-                        [
-                          "prefix",
-                          bool(update.prefix)
-                        ]
-                      ]);
+                  [
+                    "operator",
+                    string(operator$3)
+                  ],
+                  [
+                    "argument",
+                    expression(update.argument)
+                  ],
+                  [
+                    "prefix",
+                    bool(update.prefix)
+                  ]
+                ]);
         case /* Logical */9 :
             const logical = arr._0;
             const match$5 = logical.operator;
             let operator$4;
             operator$4 = match$5 === /* Or */0 ? "||" : "&&";
             return node("LogicalExpression", loc, [
-                        [
-                          "operator",
-                          string(operator$4)
-                        ],
-                        [
-                          "left",
-                          expression(logical.left)
-                        ],
-                        [
-                          "right",
-                          expression(logical.right)
-                        ]
-                      ]);
+                  [
+                    "operator",
+                    string(operator$4)
+                  ],
+                  [
+                    "left",
+                    expression(logical.left)
+                  ],
+                  [
+                    "right",
+                    expression(logical.right)
+                  ]
+                ]);
         case /* Conditional */10 :
             const conditional = arr._0;
             return node("ConditionalExpression", loc, [
-                        [
-                          "test",
-                          expression(conditional.test)
-                        ],
-                        [
-                          "consequent",
-                          expression(conditional.consequent)
-                        ],
-                        [
-                          "alternate",
-                          expression(conditional.alternate)
-                        ]
-                      ]);
+                  [
+                    "test",
+                    expression(conditional.test)
+                  ],
+                  [
+                    "consequent",
+                    expression(conditional.consequent)
+                  ],
+                  [
+                    "alternate",
+                    expression(conditional.alternate)
+                  ]
+                ]);
         case /* New */11 :
             const _new = arr._0;
             return node("NewExpression", loc, [
-                        [
-                          "callee",
-                          expression(_new.callee)
-                        ],
-                        [
-                          "arguments",
-                          array_of_list(expression_or_spread, _new.arguments)
-                        ]
-                      ]);
+                  [
+                    "callee",
+                    expression(_new.callee)
+                  ],
+                  [
+                    "arguments",
+                    array_of_list(expression_or_spread, _new.arguments)
+                  ]
+                ]);
         case /* Call */12 :
             const call = arr._0;
             return node("CallExpression", loc, [
-                        [
-                          "callee",
-                          expression(call.callee)
-                        ],
-                        [
-                          "arguments",
-                          array_of_list(expression_or_spread, call.arguments)
-                        ]
-                      ]);
+                  [
+                    "callee",
+                    expression(call.callee)
+                  ],
+                  [
+                    "arguments",
+                    array_of_list(expression_or_spread, call.arguments)
+                  ]
+                ]);
         case /* Member */13 :
             const member = arr._0;
             const id = member.property;
             let property;
             property = id.TAG === /* PropertyIdentifier */0 ? identifier(id._0) : expression(id._0);
             return node("MemberExpression", loc, [
-                        [
-                          "object",
-                          expression(member._object)
-                        ],
-                        [
-                          "property",
-                          property
-                        ],
-                        [
-                          "computed",
-                          bool(member.computed)
-                        ]
-                      ]);
+                  [
+                    "object",
+                    expression(member._object)
+                  ],
+                  [
+                    "property",
+                    property
+                  ],
+                  [
+                    "computed",
+                    bool(member.computed)
+                  ]
+                ]);
         case /* Yield */14 :
             const $$yield = arr._0;
             return node("YieldExpression", loc, [
-                        [
-                          "argument",
-                          option(expression, $$yield.argument)
-                        ],
-                        [
-                          "delegate",
-                          bool($$yield.delegate)
-                        ]
-                      ]);
+                  [
+                    "argument",
+                    option(expression, $$yield.argument)
+                  ],
+                  [
+                    "delegate",
+                    bool($$yield.delegate)
+                  ]
+                ]);
         case /* Comprehension */15 :
             const comp = arr._0;
             return node("ComprehensionExpression", loc, [
-                        [
-                          "blocks",
-                          array_of_list(comprehension_block, comp.blocks)
-                        ],
-                        [
-                          "filter",
-                          option(expression, comp.filter)
-                        ]
-                      ]);
+                  [
+                    "blocks",
+                    array_of_list(comprehension_block, comp.blocks)
+                  ],
+                  [
+                    "filter",
+                    option(expression, comp.filter)
+                  ]
+                ]);
         case /* Generator */16 :
             const gen = arr._0;
             return node("GeneratorExpression", loc, [
-                        [
-                          "blocks",
-                          array_of_list(comprehension_block, gen.blocks)
-                        ],
-                        [
-                          "filter",
-                          option(expression, gen.filter)
-                        ]
-                      ]);
+                  [
+                    "blocks",
+                    array_of_list(comprehension_block, gen.blocks)
+                  ],
+                  [
+                    "filter",
+                    option(expression, gen.filter)
+                  ]
+                ]);
         case /* Let */17 :
             const _let = arr._0;
             return node("LetExpression", loc, [
-                        [
-                          "head",
-                          array_of_list(let_assignment, _let.head)
-                        ],
-                        [
-                          "body",
-                          expression(_let.body)
-                        ]
-                      ]);
+                  [
+                    "head",
+                    array_of_list(let_assignment, _let.head)
+                  ],
+                  [
+                    "body",
+                    expression(_let.body)
+                  ]
+                ]);
         case /* Identifier */18 :
             return identifier(arr._0);
         case /* Literal */19 :
             return literal([
-                        loc,
-                        arr._0
-                      ]);
+                  loc,
+                  arr._0
+                ]);
         case /* TemplateLiteral */20 :
             return template_literal([
-                        loc,
-                        arr._0
-                      ]);
+                  loc,
+                  arr._0
+                ]);
         case /* TaggedTemplate */21 :
             let param$1 = [
               loc,
@@ -16120,20 +16120,20 @@ function parse(content, options) {
             ];
             const tagged = param$1[1];
             return node("TaggedTemplateExpression", param$1[0], [
-                        [
-                          "tag",
-                          expression(tagged.tag)
-                        ],
-                        [
-                          "quasi",
-                          template_literal(tagged.quasi)
-                        ]
-                      ]);
+                  [
+                    "tag",
+                    expression(tagged.tag)
+                  ],
+                  [
+                    "quasi",
+                    template_literal(tagged.quasi)
+                  ]
+                ]);
         case /* JSXElement */22 :
             return jsx_element([
-                        loc,
-                        arr._0
-                      ]);
+                  loc,
+                  arr._0
+                ]);
         case /* Class */23 :
             let param$2 = [
               loc,
@@ -16141,47 +16141,47 @@ function parse(content, options) {
             ];
             const c = param$2[1];
             return node("ClassExpression", param$2[0], [
-                        [
-                          "id",
-                          option(identifier, c.id)
-                        ],
-                        [
-                          "body",
-                          class_body(c.body)
-                        ],
-                        [
-                          "superClass",
-                          option(expression, c.superClass)
-                        ],
-                        [
-                          "typeParameters",
-                          option(type_parameter_declaration, c.typeParameters)
-                        ],
-                        [
-                          "superTypeParameters",
-                          option(type_parameter_instantiation, c.superTypeParameters)
-                        ],
-                        [
-                          "implements",
-                          array_of_list(class_implements, c.implements)
-                        ],
-                        [
-                          "decorators",
-                          array_of_list(expression, c.classDecorators)
-                        ]
-                      ]);
+                  [
+                    "id",
+                    option(identifier, c.id)
+                  ],
+                  [
+                    "body",
+                    class_body(c.body)
+                  ],
+                  [
+                    "superClass",
+                    option(expression, c.superClass)
+                  ],
+                  [
+                    "typeParameters",
+                    option(type_parameter_declaration, c.typeParameters)
+                  ],
+                  [
+                    "superTypeParameters",
+                    option(type_parameter_instantiation, c.superTypeParameters)
+                  ],
+                  [
+                    "implements",
+                    array_of_list(class_implements, c.implements)
+                  ],
+                  [
+                    "decorators",
+                    array_of_list(expression, c.classDecorators)
+                  ]
+                ]);
         case /* TypeCast */24 :
             const typecast = arr._0;
             return node("TypeCastExpression", loc, [
-                        [
-                          "expression",
-                          expression(typecast.expression)
-                        ],
-                        [
-                          "typeAnnotation",
-                          type_annotation(typecast.typeAnnotation)
-                        ]
-                      ]);
+                  [
+                    "expression",
+                    expression(typecast.expression)
+                  ],
+                  [
+                    "typeAnnotation",
+                    type_annotation(typecast.typeAnnotation)
+                  ]
+                ]);
         
       }
     };
@@ -16263,41 +16263,41 @@ function parse(content, options) {
         case /* Object */0 :
             const obj$1 = obj._0;
             return node("ObjectPattern", loc, [
-                        [
-                          "properties",
-                          array_of_list(object_pattern_property, obj$1.properties)
-                        ],
-                        [
-                          "typeAnnotation",
-                          option(type_annotation, obj$1.typeAnnotation)
-                        ]
-                      ]);
+                  [
+                    "properties",
+                    array_of_list(object_pattern_property, obj$1.properties)
+                  ],
+                  [
+                    "typeAnnotation",
+                    option(type_annotation, obj$1.typeAnnotation)
+                  ]
+                ]);
         case /* Array */1 :
             const arr = obj._0;
             return node("ArrayPattern", loc, [
-                        [
-                          "elements",
-                          array_of_list((function (param) {
-                                  return option(array_pattern_element, param);
-                                }), arr.elements)
-                        ],
-                        [
-                          "typeAnnotation",
-                          option(type_annotation, arr.typeAnnotation)
-                        ]
-                      ]);
+                  [
+                    "elements",
+                    array_of_list((function (param) {
+                            return option(array_pattern_element, param);
+                          }), arr.elements)
+                  ],
+                  [
+                    "typeAnnotation",
+                    option(type_annotation, arr.typeAnnotation)
+                  ]
+                ]);
         case /* Assignment */2 :
             const match = obj._0;
             return node("AssignmentPattern", loc, [
-                        [
-                          "left",
-                          pattern(match.left)
-                        ],
-                        [
-                          "right",
-                          expression(match.right)
-                        ]
-                      ]);
+                  [
+                    "left",
+                    pattern(match.left)
+                  ],
+                  [
+                    "right",
+                    expression(match.right)
+                  ]
+                ]);
         case /* Identifier */3 :
             return identifier(obj._0);
         case /* Expression */4 :
@@ -16329,32 +16329,32 @@ function parse(content, options) {
             ]
           ]);
       return node("TemplateElement", param[0], [
-                  [
-                    "value",
-                    value
-                  ],
-                  [
-                    "tail",
-                    bool(element.tail)
-                  ]
-                ]);
+            [
+              "value",
+              value
+            ],
+            [
+              "tail",
+              bool(element.tail)
+            ]
+          ]);
     };
     const object_type = function (param) {
       const o = param[1];
       return node("ObjectTypeAnnotation", param[0], [
-                  [
-                    "properties",
-                    array_of_list(object_type_property, o.properties)
-                  ],
-                  [
-                    "indexers",
-                    array_of_list(object_type_indexer, o.indexers)
-                  ],
-                  [
-                    "callProperties",
-                    array_of_list(object_type_call_property, o.callProperties)
-                  ]
-                ]);
+            [
+              "properties",
+              array_of_list(object_type_property, o.properties)
+            ],
+            [
+              "indexers",
+              array_of_list(object_type_indexer, o.indexers)
+            ],
+            [
+              "callProperties",
+              array_of_list(object_type_call_property, o.callProperties)
+            ]
+          ]);
     };
     const interface_extends = function (param) {
       const g = param[1];
@@ -16362,34 +16362,34 @@ function parse(content, options) {
       let id$1;
       id$1 = id.TAG === /* Unqualified */0 ? identifier(id._0) : generic_type_qualified_identifier(id._0);
       return node("InterfaceExtends", param[0], [
-                  [
-                    "id",
-                    id$1
-                  ],
-                  [
-                    "typeParameters",
-                    option(type_parameter_instantiation, g.typeParameters)
-                  ]
-                ]);
+            [
+              "id",
+              id$1
+            ],
+            [
+              "typeParameters",
+              option(type_parameter_instantiation, g.typeParameters)
+            ]
+          ]);
     };
     const type_parameter_declaration = function (param) {
       return node("TypeParameterDeclaration", param[0], [[
-                    "params",
-                    array_of_list(type_param, param[1].params)
-                  ]]);
+              "params",
+              array_of_list(type_param, param[1].params)
+            ]]);
     };
     const jsx_namespaced_name = function (param) {
       const namespaced_name = param[1];
       return node("JSXNamespacedName", param[0], [
-                  [
-                    "namespace",
-                    jsx_identifier(namespaced_name.namespace)
-                  ],
-                  [
-                    "name",
-                    jsx_identifier(namespaced_name.name)
-                  ]
-                ]);
+            [
+              "namespace",
+              jsx_identifier(namespaced_name.namespace)
+            ],
+            [
+              "name",
+              jsx_identifier(namespaced_name.name)
+            ]
+          ]);
     };
     const jsx_member_expression = function (param) {
       const member_expression = param[1];
@@ -16397,65 +16397,65 @@ function parse(content, options) {
       let _object;
       _object = id.TAG === /* Identifier */0 ? jsx_identifier(id._0) : jsx_member_expression(id._0);
       return node("JSXMemberExpression", param[0], [
-                  [
-                    "object",
-                    _object
-                  ],
-                  [
-                    "property",
-                    jsx_identifier(member_expression.property)
-                  ]
-                ]);
+            [
+              "object",
+              _object
+            ],
+            [
+              "property",
+              jsx_identifier(member_expression.property)
+            ]
+          ]);
     };
     const jsx_identifier = function (param) {
       return node("JSXIdentifier", param[0], [[
-                    "name",
-                    string(param[1].name)
-                  ]]);
+              "name",
+              string(param[1].name)
+            ]]);
     };
     const function_type = function (param) {
       const fn = param[1];
       return node("FunctionTypeAnnotation", param[0], [
-                  [
-                    "params",
-                    array_of_list(function_type_param, fn.params)
-                  ],
-                  [
-                    "returnType",
-                    _type(fn.returnType)
-                  ],
-                  [
-                    "rest",
-                    option(function_type_param, fn.rest)
-                  ],
-                  [
-                    "typeParameters",
-                    option(type_parameter_declaration, fn.typeParameters)
-                  ]
-                ]);
+            [
+              "params",
+              array_of_list(function_type_param, fn.params)
+            ],
+            [
+              "returnType",
+              _type(fn.returnType)
+            ],
+            [
+              "rest",
+              option(function_type_param, fn.rest)
+            ],
+            [
+              "typeParameters",
+              option(type_parameter_declaration, fn.typeParameters)
+            ]
+          ]);
     };
     const jsx_closing = function (param) {
       return node("JSXClosingElement", param[0], [[
-                    "name",
-                    jsx_name(param[1].name)
-                  ]]);
+              "name",
+              jsx_name(param[1].name)
+            ]]);
     };
     const jsx_opening = function (param) {
       const opening = param[1];
       return node("JSXOpeningElement", param[0], [
-                  [
-                    "name",
-                    jsx_name(opening.name)
-                  ],
-                  [
-                    "attributes",
-                    array_of_list(jsx_opening_attribute, opening.attributes)
-                  ],
-                  [
-                    "selfClosing",
-                    bool(opening.selfClosing)
-                  ]
-                ]);
+            [
+              "name",
+              jsx_name(opening.name)
+            ],
+            [
+              "attributes",
+              array_of_list(jsx_opening_attribute, opening.attributes)
+            ],
+            [
+              "selfClosing",
+              bool(opening.selfClosing)
+            ]
+          ]);
     };
     const jsx_child = function (param) {
       const element = param[1];
@@ -16463,14 +16463,14 @@ function parse(content, options) {
       switch (element.TAG) {
         case /* Element */0 :
             return jsx_element([
-                        loc,
-                        element._0
-                      ]);
+                  loc,
+                  element._0
+                ]);
         case /* ExpressionContainer */1 :
             return jsx_expression_container([
-                        loc,
-                        element._0
-                      ]);
+                  loc,
+                  element._0
+                ]);
         case /* Text */2 :
             let param$1 = [
               loc,
@@ -16478,15 +16478,15 @@ function parse(content, options) {
             ];
             const text = param$1[1];
             return node("JSXText", param$1[0], [
-                        [
-                          "value",
-                          string(text.value)
-                        ],
-                        [
-                          "raw",
-                          string(text.raw)
-                        ]
-                      ]);
+                  [
+                    "value",
+                    string(text.value)
+                  ],
+                  [
+                    "raw",
+                    string(text.raw)
+                  ]
+                ]);
         
       }
     };
@@ -16495,26 +16495,26 @@ function parse(content, options) {
       let expression$1;
       expression$1 = expr.TAG === /* Expression */0 ? expression(expr._0) : node("JSXEmptyExpression", expr._0, []);
       return node("JSXExpressionContainer", param[0], [[
-                    "expression",
-                    expression$1
-                  ]]);
+              "expression",
+              expression$1
+            ]]);
     };
     const jsx_element = function (param) {
       const element = param[1];
       return node("JSXElement", param[0], [
-                  [
-                    "openingElement",
-                    jsx_opening(element.openingElement)
-                  ],
-                  [
-                    "closingElement",
-                    option(jsx_closing, element.closingElement)
-                  ],
-                  [
-                    "children",
-                    array_of_list(jsx_child, element.children)
-                  ]
-                ]);
+            [
+              "openingElement",
+              jsx_opening(element.openingElement)
+            ],
+            [
+              "closingElement",
+              option(jsx_closing, element.closingElement)
+            ],
+            [
+              "children",
+              array_of_list(jsx_child, element.children)
+            ]
+          ]);
     };
     const jsx_opening_attribute = function (attribute) {
       if (attribute.TAG === /* Attribute */0) {
@@ -16524,77 +16524,77 @@ function parse(content, options) {
         let name;
         name = id.TAG === /* Identifier */0 ? jsx_identifier(id._0) : jsx_namespaced_name(id._0);
         return node("JSXAttribute", param[0], [
-                    [
-                      "name",
-                      name
-                    ],
-                    [
-                      "value",
-                      option(jsx_attribute_value, attribute$1.value)
-                    ]
-                  ]);
+              [
+                "name",
+                name
+              ],
+              [
+                "value",
+                option(jsx_attribute_value, attribute$1.value)
+              ]
+            ]);
       } else {
         let param$1 = attribute._0;
         return node("JSXSpreadAttribute", param$1[0], [[
-                      "argument",
-                      expression(param$1[1].argument)
-                    ]]);
+                "argument",
+                expression(param$1[1].argument)
+              ]]);
       }
     };
     const function_type_param = function (param) {
       const param$1 = param[1];
       return node("FunctionTypeParam", param[0], [
-                  [
-                    "name",
-                    identifier(param$1.name)
-                  ],
-                  [
-                    "typeAnnotation",
-                    _type(param$1.typeAnnotation)
-                  ],
-                  [
-                    "optional",
-                    bool(param$1.optional)
-                  ]
-                ]);
+            [
+              "name",
+              identifier(param$1.name)
+            ],
+            [
+              "typeAnnotation",
+              _type(param$1.typeAnnotation)
+            ],
+            [
+              "optional",
+              bool(param$1.optional)
+            ]
+          ]);
     };
     const variable_declarator = function (param) {
       const declarator = param[1];
       return node("VariableDeclarator", param[0], [
-                  [
-                    "id",
-                    pattern(declarator.id)
-                  ],
-                  [
-                    "init",
-                    option(expression, declarator.init)
-                  ]
-                ]);
+            [
+              "id",
+              pattern(declarator.id)
+            ],
+            [
+              "init",
+              option(expression, declarator.init)
+            ]
+          ]);
     };
     const export_specifier = function (param) {
       const specifier = param[1];
       return node("ExportSpecifier", param[0], [
-                  [
-                    "id",
-                    identifier(specifier.id)
-                  ],
-                  [
-                    "name",
-                    option(identifier, specifier.name)
-                  ]
-                ]);
+            [
+              "id",
+              identifier(specifier.id)
+            ],
+            [
+              "name",
+              option(identifier, specifier.name)
+            ]
+          ]);
     };
     const jsx_attribute_value = function (param) {
       if (param.TAG === /* Literal */0) {
         return literal([
-                    param._0,
-                    param._1
-                  ]);
+              param._0,
+              param._1
+            ]);
       } else {
         return jsx_expression_container([
-                    param._0,
-                    param._1
-                  ]);
+              param._0,
+              param._1
+            ]);
       }
     };
     const generic_type_qualified_identifier = function (param) {
@@ -16603,61 +16603,61 @@ function parse(content, options) {
       let qualification;
       qualification = id.TAG === /* Unqualified */0 ? identifier(id._0) : generic_type_qualified_identifier(id._0);
       return node("QualifiedTypeIdentifier", param[0], [
-                  [
-                    "qualification",
-                    qualification
-                  ],
-                  [
-                    "id",
-                    identifier(q.id)
-                  ]
-                ]);
+            [
+              "qualification",
+              qualification
+            ],
+            [
+              "id",
+              identifier(q.id)
+            ]
+          ]);
     };
     const type_parameter_instantiation = function (param) {
       return node("TypeParameterInstantiation", param[0], [[
-                    "params",
-                    array_of_list(_type, param[1].params)
-                  ]]);
+              "params",
+              array_of_list(_type, param[1].params)
+            ]]);
     };
     const block = function (param) {
       return node("BlockStatement", param[0], [[
-                    "body",
-                    array_of_list(statement, param[1].body)
-                  ]]);
+              "body",
+              array_of_list(statement, param[1].body)
+            ]]);
     };
     const object_type_indexer = function (param) {
       const indexer = param[1];
       return node("ObjectTypeIndexer", param[0], [
-                  [
-                    "id",
-                    identifier(indexer.id)
-                  ],
-                  [
-                    "key",
-                    _type(indexer.key)
-                  ],
-                  [
-                    "value",
-                    _type(indexer.value)
-                  ],
-                  [
-                    "static",
-                    bool(indexer.static)
-                  ]
-                ]);
+            [
+              "id",
+              identifier(indexer.id)
+            ],
+            [
+              "key",
+              _type(indexer.key)
+            ],
+            [
+              "value",
+              _type(indexer.value)
+            ],
+            [
+              "static",
+              bool(indexer.static)
+            ]
+          ]);
     };
     const object_type_call_property = function (param) {
       const callProperty = param[1];
       return node("ObjectTypeCallProperty", param[0], [
-                  [
-                    "value",
-                    function_type(callProperty.value)
-                  ],
-                  [
-                    "static",
-                    bool(callProperty.static)
-                  ]
-                ]);
+            [
+              "value",
+              function_type(callProperty.value)
+            ],
+            [
+              "static",
+              bool(callProperty.static)
+            ]
+          ]);
     };
     const object_type_property = function (param) {
       const prop = param[1];
@@ -16672,29 +16672,29 @@ function parse(content, options) {
             break;
         case /* Computed */2 :
             throw new Caml_js_exceptions.MelangeError("Failure", {
-                      MEL_EXN_ID: "Failure",
-                      _1: "There should not be computed object type property keys"
-                    });
+                  MEL_EXN_ID: "Failure",
+                  _1: "There should not be computed object type property keys"
+                });
         
       }
       return node("ObjectTypeProperty", param[0], [
-                  [
-                    "key",
-                    key
-                  ],
-                  [
-                    "value",
-                    _type(prop.value)
-                  ],
-                  [
-                    "optional",
-                    bool(prop.optional)
-                  ],
-                  [
-                    "static",
-                    bool(prop.static)
-                  ]
-                ]);
+            [
+              "key",
+              key
+            ],
+            [
+              "value",
+              _type(prop.value)
+            ],
+            [
+              "optional",
+              bool(prop.optional)
+            ],
+            [
+              "static",
+              bool(prop.static)
+            ]
+          ]);
     };
     const function_expression = function (param) {
       const _function = param[1];
@@ -16702,49 +16702,49 @@ function parse(content, options) {
       let body;
       body = b.TAG === /* BodyBlock */0 ? block(b._0) : expression(b._0);
       return node("FunctionExpression", param[0], [
-                  [
-                    "id",
-                    option(identifier, _function.id)
-                  ],
-                  [
-                    "params",
-                    array_of_list(pattern, _function.params)
-                  ],
-                  [
-                    "defaults",
-                    array_of_list((function (param) {
-                            return option(expression, param);
-                          }), _function.defaults)
-                  ],
-                  [
-                    "rest",
-                    option(identifier, _function.rest)
-                  ],
-                  [
-                    "body",
-                    body
-                  ],
-                  [
-                    "async",
-                    bool(_function.async)
-                  ],
-                  [
-                    "generator",
-                    bool(_function.generator)
-                  ],
-                  [
-                    "expression",
-                    bool(_function.expression)
-                  ],
-                  [
-                    "returnType",
-                    option(type_annotation, _function.returnType)
-                  ],
-                  [
-                    "typeParameters",
-                    option(type_parameter_declaration, _function.typeParameters)
-                  ]
-                ]);
+            [
+              "id",
+              option(identifier, _function.id)
+            ],
+            [
+              "params",
+              array_of_list(pattern, _function.params)
+            ],
+            [
+              "defaults",
+              array_of_list((function (param) {
+                      return option(expression, param);
+                    }), _function.defaults)
+            ],
+            [
+              "rest",
+              option(identifier, _function.rest)
+            ],
+            [
+              "body",
+              body
+            ],
+            [
+              "async",
+              bool(_function.async)
+            ],
+            [
+              "generator",
+              bool(_function.generator)
+            ],
+            [
+              "expression",
+              bool(_function.expression)
+            ],
+            [
+              "returnType",
+              option(type_annotation, _function.returnType)
+            ],
+            [
+              "typeParameters",
+              option(type_parameter_declaration, _function.typeParameters)
+            ]
+          ]);
     };
     const class_element = function (m) {
       if (m.TAG === /* Method */0) {
@@ -16790,31 +16790,31 @@ function parse(content, options) {
           
         }
         return node("MethodDefinition", param[0], [
-                    [
-                      "key",
-                      match[0]
-                    ],
-                    [
-                      "value",
-                      function_expression(method_.value)
-                    ],
-                    [
-                      "kind",
-                      string(kind)
-                    ],
-                    [
-                      "static",
-                      bool(method_.static)
-                    ],
-                    [
-                      "computed",
-                      bool(match[1])
-                    ],
-                    [
-                      "decorators",
-                      array_of_list(expression, method_.decorators)
-                    ]
-                  ]);
+              [
+                "key",
+                match[0]
+              ],
+              [
+                "value",
+                function_expression(method_.value)
+              ],
+              [
+                "kind",
+                string(kind)
+              ],
+              [
+                "static",
+                bool(method_.static)
+              ],
+              [
+                "computed",
+                bool(match[1])
+              ],
+              [
+                "decorators",
+                array_of_list(expression, method_.decorators)
+              ]
+            ]);
       } else {
         let param$1 = m._0;
         const prop = param$1[1];
@@ -16842,27 +16842,27 @@ function parse(content, options) {
           
         }
         return node("ClassProperty", param$1[0], [
-                    [
-                      "key",
-                      match$1[0]
-                    ],
-                    [
-                      "value",
-                      option(expression, prop.value)
-                    ],
-                    [
-                      "typeAnnotation",
-                      option(type_annotation, prop.typeAnnotation)
-                    ],
-                    [
-                      "computed",
-                      bool(match$1[1])
-                    ],
-                    [
-                      "static",
-                      bool(prop.static)
-                    ]
-                  ]);
+              [
+                "key",
+                match$1[0]
+              ],
+              [
+                "value",
+                option(expression, prop.value)
+              ],
+              [
+                "typeAnnotation",
+                option(type_annotation, prop.typeAnnotation)
+              ],
+              [
+                "computed",
+                bool(match$1[1])
+              ],
+              [
+                "static",
+                bool(prop.static)
+              ]
+            ]);
       }
     };
     const comment = function (param) {
@@ -16876,9 +16876,9 @@ function parse(content, options) {
           c._0
         ];
       return node(match[0], param[0], [[
-                    "value",
-                    string(match[1])
-                  ]]);
+              "value",
+              string(match[1])
+            ]]);
     };
     const statement = function (param) {
       const b = param[1];
@@ -16893,139 +16893,139 @@ function parse(content, options) {
       switch (b.TAG) {
         case /* Block */0 :
             return block([
-                        loc,
-                        b._0
-                      ]);
+                  loc,
+                  b._0
+                ]);
         case /* Expression */1 :
             return node("ExpressionStatement", loc, [[
-                          "expression",
-                          expression(b._0.expression)
-                        ]]);
+                    "expression",
+                    expression(b._0.expression)
+                  ]]);
         case /* If */2 :
             const _if = b._0;
             return node("IfStatement", loc, [
-                        [
-                          "test",
-                          expression(_if.test)
-                        ],
-                        [
-                          "consequent",
-                          statement(_if.consequent)
-                        ],
-                        [
-                          "alternate",
-                          option(statement, _if.alternate)
-                        ]
-                      ]);
+                  [
+                    "test",
+                    expression(_if.test)
+                  ],
+                  [
+                    "consequent",
+                    statement(_if.consequent)
+                  ],
+                  [
+                    "alternate",
+                    option(statement, _if.alternate)
+                  ]
+                ]);
         case /* Labeled */3 :
             const labeled = b._0;
             return node("LabeledStatement", loc, [
-                        [
-                          "label",
-                          identifier(labeled.label)
-                        ],
-                        [
-                          "body",
-                          statement(labeled.body)
-                        ]
-                      ]);
+                  [
+                    "label",
+                    identifier(labeled.label)
+                  ],
+                  [
+                    "body",
+                    statement(labeled.body)
+                  ]
+                ]);
         case /* Break */4 :
             return node("BreakStatement", loc, [[
-                          "label",
-                          option(identifier, b._0.label)
-                        ]]);
+                    "label",
+                    option(identifier, b._0.label)
+                  ]]);
         case /* Continue */5 :
             return node("ContinueStatement", loc, [[
-                          "label",
-                          option(identifier, b._0.label)
-                        ]]);
+                    "label",
+                    option(identifier, b._0.label)
+                  ]]);
         case /* With */6 :
             const _with = b._0;
             return node("WithStatement", loc, [
-                        [
-                          "object",
-                          expression(_with._object)
-                        ],
-                        [
-                          "body",
-                          statement(_with.body)
-                        ]
-                      ]);
+                  [
+                    "object",
+                    expression(_with._object)
+                  ],
+                  [
+                    "body",
+                    statement(_with.body)
+                  ]
+                ]);
         case /* TypeAlias */7 :
             return type_alias([
-                        loc,
-                        b._0
-                      ]);
+                  loc,
+                  b._0
+                ]);
         case /* Switch */8 :
             const $$switch = b._0;
             return node("SwitchStatement", loc, [
-                        [
-                          "discriminant",
-                          expression($$switch.discriminant)
-                        ],
-                        [
-                          "cases",
-                          array_of_list($$case, $$switch.cases)
-                        ],
-                        [
-                          "lexical",
-                          bool($$switch.lexical)
-                        ]
-                      ]);
+                  [
+                    "discriminant",
+                    expression($$switch.discriminant)
+                  ],
+                  [
+                    "cases",
+                    array_of_list($$case, $$switch.cases)
+                  ],
+                  [
+                    "lexical",
+                    bool($$switch.lexical)
+                  ]
+                ]);
         case /* Return */9 :
             return node("ReturnStatement", loc, [[
-                          "argument",
-                          option(expression, b._0.argument)
-                        ]]);
+                    "argument",
+                    option(expression, b._0.argument)
+                  ]]);
         case /* Throw */10 :
             return node("ThrowStatement", loc, [[
-                          "argument",
-                          expression(b._0.argument)
-                        ]]);
+                    "argument",
+                    expression(b._0.argument)
+                  ]]);
         case /* Try */11 :
             const _try = b._0;
             return node("TryStatement", loc, [
-                        [
-                          "block",
-                          block(_try.block)
-                        ],
-                        [
-                          "handler",
-                          option($$catch, _try.handler)
-                        ],
-                        [
-                          "guardedHandlers",
-                          array_of_list($$catch, _try.guardedHandlers)
-                        ],
-                        [
-                          "finalizer",
-                          option(block, _try.finalizer)
-                        ]
-                      ]);
+                  [
+                    "block",
+                    block(_try.block)
+                  ],
+                  [
+                    "handler",
+                    option($$catch, _try.handler)
+                  ],
+                  [
+                    "guardedHandlers",
+                    array_of_list($$catch, _try.guardedHandlers)
+                  ],
+                  [
+                    "finalizer",
+                    option(block, _try.finalizer)
+                  ]
+                ]);
         case /* While */12 :
             const _while = b._0;
             return node("WhileStatement", loc, [
-                        [
-                          "test",
-                          expression(_while.test)
-                        ],
-                        [
-                          "body",
-                          statement(_while.body)
-                        ]
-                      ]);
+                  [
+                    "test",
+                    expression(_while.test)
+                  ],
+                  [
+                    "body",
+                    statement(_while.body)
+                  ]
+                ]);
         case /* DoWhile */13 :
             const dowhile = b._0;
             return node("DoWhileStatement", loc, [
-                        [
-                          "body",
-                          statement(dowhile.body)
-                        ],
-                        [
-                          "test",
-                          expression(dowhile.test)
-                        ]
-                      ]);
+                  [
+                    "body",
+                    statement(dowhile.body)
+                  ],
+                  [
+                    "test",
+                    expression(dowhile.test)
+                  ]
+                ]);
         case /* For */14 :
             const _for = b._0;
             const init = function (init$1) {
@@ -17036,77 +17036,77 @@ function parse(content, options) {
               }
             };
             return node("ForStatement", loc, [
-                        [
-                          "init",
-                          option(init, _for.init)
-                        ],
-                        [
-                          "test",
-                          option(expression, _for.test)
-                        ],
-                        [
-                          "update",
-                          option(expression, _for.update)
-                        ],
-                        [
-                          "body",
-                          statement(_for.body)
-                        ]
-                      ]);
+                  [
+                    "init",
+                    option(init, _for.init)
+                  ],
+                  [
+                    "test",
+                    option(expression, _for.test)
+                  ],
+                  [
+                    "update",
+                    option(expression, _for.update)
+                  ],
+                  [
+                    "body",
+                    statement(_for.body)
+                  ]
+                ]);
         case /* ForIn */15 :
             const forin = b._0;
             const left = forin.left;
             let left$1;
             left$1 = left.TAG === /* LeftDeclaration */0 ? variable_declaration(left._0) : expression(left._0);
             return node("ForInStatement", loc, [
-                        [
-                          "left",
-                          left$1
-                        ],
-                        [
-                          "right",
-                          expression(forin.right)
-                        ],
-                        [
-                          "body",
-                          statement(forin.body)
-                        ],
-                        [
-                          "each",
-                          bool(forin.each)
-                        ]
-                      ]);
+                  [
+                    "left",
+                    left$1
+                  ],
+                  [
+                    "right",
+                    expression(forin.right)
+                  ],
+                  [
+                    "body",
+                    statement(forin.body)
+                  ],
+                  [
+                    "each",
+                    bool(forin.each)
+                  ]
+                ]);
         case /* ForOf */16 :
             const forof = b._0;
             const left$2 = forof.left;
             let left$3;
             left$3 = left$2.TAG === /* LeftDeclaration */0 ? variable_declaration(left$2._0) : expression(left$2._0);
             return node("ForOfStatement", loc, [
-                        [
-                          "left",
-                          left$3
-                        ],
-                        [
-                          "right",
-                          expression(forof.right)
-                        ],
-                        [
-                          "body",
-                          statement(forof.body)
-                        ]
-                      ]);
+                  [
+                    "left",
+                    left$3
+                  ],
+                  [
+                    "right",
+                    expression(forof.right)
+                  ],
+                  [
+                    "body",
+                    statement(forof.body)
+                  ]
+                ]);
         case /* Let */17 :
             const _let = b._0;
             return node("LetStatement", loc, [
-                        [
-                          "head",
-                          array_of_list(let_assignment, _let.head)
-                        ],
-                        [
-                          "body",
-                          statement(_let.body)
-                        ]
-                      ]);
+                  [
+                    "head",
+                    array_of_list(let_assignment, _let.head)
+                  ],
+                  [
+                    "body",
+                    statement(_let.body)
+                  ]
+                ]);
         case /* FunctionDeclaration */18 :
             const fn = b._0;
             const id = fn.id;
@@ -17121,54 +17121,54 @@ function parse(content, options) {
             let body;
             body = b$1.TAG === /* BodyBlock */0 ? block(b$1._0) : expression(b$1._0);
             return node(match[0], loc, [
-                        [
-                          "id",
-                          match[1]
-                        ],
-                        [
-                          "params",
-                          array_of_list(pattern, fn.params)
-                        ],
-                        [
-                          "defaults",
-                          array_of_list((function (param) {
-                                  return option(expression, param);
-                                }), fn.defaults)
-                        ],
-                        [
-                          "rest",
-                          option(identifier, fn.rest)
-                        ],
-                        [
-                          "body",
-                          body
-                        ],
-                        [
-                          "async",
-                          bool(fn.async)
-                        ],
-                        [
-                          "generator",
-                          bool(fn.generator)
-                        ],
-                        [
-                          "expression",
-                          bool(fn.expression)
-                        ],
-                        [
-                          "returnType",
-                          option(type_annotation, fn.returnType)
-                        ],
-                        [
-                          "typeParameters",
-                          option(type_parameter_declaration, fn.typeParameters)
-                        ]
-                      ]);
+                  [
+                    "id",
+                    match[1]
+                  ],
+                  [
+                    "params",
+                    array_of_list(pattern, fn.params)
+                  ],
+                  [
+                    "defaults",
+                    array_of_list((function (param) {
+                            return option(expression, param);
+                          }), fn.defaults)
+                  ],
+                  [
+                    "rest",
+                    option(identifier, fn.rest)
+                  ],
+                  [
+                    "body",
+                    body
+                  ],
+                  [
+                    "async",
+                    bool(fn.async)
+                  ],
+                  [
+                    "generator",
+                    bool(fn.generator)
+                  ],
+                  [
+                    "expression",
+                    bool(fn.expression)
+                  ],
+                  [
+                    "returnType",
+                    option(type_annotation, fn.returnType)
+                  ],
+                  [
+                    "typeParameters",
+                    option(type_parameter_declaration, fn.typeParameters)
+                  ]
+                ]);
         case /* VariableDeclaration */19 :
             return variable_declaration([
-                        loc,
-                        b._0
-                      ]);
+                  loc,
+                  b._0
+                ]);
         case /* ClassDeclaration */20 :
             let param$1 = [
               loc,
@@ -17184,55 +17184,55 @@ function parse(content, options) {
                 $$null
               ];
             return node(match$1[0], param$1[0], [
-                        [
-                          "id",
-                          match$1[1]
-                        ],
-                        [
-                          "body",
-                          class_body(c.body)
-                        ],
-                        [
-                          "superClass",
-                          option(expression, c.superClass)
-                        ],
-                        [
-                          "typeParameters",
-                          option(type_parameter_declaration, c.typeParameters)
-                        ],
-                        [
-                          "superTypeParameters",
-                          option(type_parameter_instantiation, c.superTypeParameters)
-                        ],
-                        [
-                          "implements",
-                          array_of_list(class_implements, c.implements)
-                        ],
-                        [
-                          "decorators",
-                          array_of_list(expression, c.classDecorators)
-                        ]
-                      ]);
+                  [
+                    "id",
+                    match$1[1]
+                  ],
+                  [
+                    "body",
+                    class_body(c.body)
+                  ],
+                  [
+                    "superClass",
+                    option(expression, c.superClass)
+                  ],
+                  [
+                    "typeParameters",
+                    option(type_parameter_declaration, c.typeParameters)
+                  ],
+                  [
+                    "superTypeParameters",
+                    option(type_parameter_instantiation, c.superTypeParameters)
+                  ],
+                  [
+                    "implements",
+                    array_of_list(class_implements, c.implements)
+                  ],
+                  [
+                    "decorators",
+                    array_of_list(expression, c.classDecorators)
+                  ]
+                ]);
         case /* InterfaceDeclaration */21 :
             return interface_declaration([
-                        loc,
-                        b._0
-                      ]);
+                  loc,
+                  b._0
+                ]);
         case /* DeclareVariable */22 :
             return declare_variable([
-                        loc,
-                        b._0
-                      ]);
+                  loc,
+                  b._0
+                ]);
         case /* DeclareFunction */23 :
             return declare_function([
-                        loc,
-                        b._0
-                      ]);
+                  loc,
+                  b._0
+                ]);
         case /* DeclareClass */24 :
             return declare_class([
-                        loc,
-                        b._0
-                      ]);
+                  loc,
+                  b._0
+                ]);
         case /* DeclareModule */25 :
             const m = b._0;
             const lit = m.id;
@@ -17242,24 +17242,24 @@ function parse(content, options) {
             let tmp;
             tmp = match$2.TAG === /* CommonJS */0 ? string("CommonJS") : string("ES");
             return node("DeclareModule", loc, [
-                        [
-                          "id",
-                          id$2
-                        ],
-                        [
-                          "body",
-                          block(m.body)
-                        ],
-                        [
-                          "kind",
-                          tmp
-                        ]
-                      ]);
+                  [
+                    "id",
+                    id$2
+                  ],
+                  [
+                    "body",
+                    block(m.body)
+                  ],
+                  [
+                    "kind",
+                    tmp
+                  ]
+                ]);
         case /* DeclareModuleExports */26 :
             return node("DeclareModuleExports", loc, [[
-                          "typeAnnotation",
-                          type_annotation(b._0)
-                        ]]);
+                    "typeAnnotation",
+                    type_annotation(b._0)
+                  ]]);
         case /* DeclareExportDeclaration */27 :
             const $$export = b._0;
             const match$3 = $$export.declaration;
@@ -17290,23 +17290,23 @@ function parse(content, options) {
               declaration = $$null;
             }
             return node("DeclareExportDeclaration", loc, [
-                        [
-                          "default",
-                          bool($$export.default)
-                        ],
-                        [
-                          "declaration",
-                          declaration
-                        ],
-                        [
-                          "specifiers",
-                          export_specifiers($$export.specifiers)
-                        ],
-                        [
-                          "source",
-                          option(literal, $$export.source)
-                        ]
-                      ]);
+                  [
+                    "default",
+                    bool($$export.default)
+                  ],
+                  [
+                    "declaration",
+                    declaration
+                  ],
+                  [
+                    "specifiers",
+                    export_specifiers($$export.specifiers)
+                  ],
+                  [
+                    "source",
+                    option(literal, $$export.source)
+                  ]
+                ]);
         case /* ExportDeclaration */28 :
             const $$export$1 = b._0;
             const match$4 = $$export$1.declaration;
@@ -17314,27 +17314,27 @@ function parse(content, options) {
                 match$4.TAG === /* Declaration */0 ? statement(match$4._0) : expression(match$4._0)
               ) : $$null;
             return node("ExportDeclaration", loc, [
-                        [
-                          "default",
-                          bool($$export$1.default)
-                        ],
-                        [
-                          "declaration",
-                          declaration$1
-                        ],
-                        [
-                          "specifiers",
-                          export_specifiers($$export$1.specifiers)
-                        ],
-                        [
-                          "source",
-                          option(literal, $$export$1.source)
-                        ],
-                        [
-                          "exportKind",
-                          string(export_kind($$export$1.exportKind))
-                        ]
-                      ]);
+                  [
+                    "default",
+                    bool($$export$1.default)
+                  ],
+                  [
+                    "declaration",
+                    declaration$1
+                  ],
+                  [
+                    "specifiers",
+                    export_specifiers($$export$1.specifiers)
+                  ],
+                  [
+                    "source",
+                    option(literal, $$export$1.source)
+                  ],
+                  [
+                    "exportKind",
+                    string(export_kind($$export$1.exportKind))
+                  ]
+                ]);
         case /* ImportDeclaration */29 :
             const $$import = b._0;
             const specifiers = Stdlib__List.map((function (id) {
@@ -17345,27 +17345,27 @@ function parse(content, options) {
                           let remote_id = match.remote;
                           const span_loc = local_id !== undefined ? btwn(remote_id[0], local_id[0]) : remote_id[0];
                           return node("ImportSpecifier", span_loc, [
-                                      [
-                                        "id",
-                                        identifier(remote_id)
-                                      ],
-                                      [
-                                        "name",
-                                        option(identifier, local_id)
-                                      ]
-                                    ]);
+                                [
+                                  "id",
+                                  identifier(remote_id)
+                                ],
+                                [
+                                  "name",
+                                  option(identifier, local_id)
+                                ]
+                              ]);
                       case /* ImportDefaultSpecifier */1 :
                           let id$1 = id._0;
                           return node("ImportDefaultSpecifier", id$1[0], [[
-                                        "id",
-                                        identifier(id$1)
-                                      ]]);
+                                  "id",
+                                  identifier(id$1)
+                                ]]);
                       case /* ImportNamespaceSpecifier */2 :
                           let param = id._0;
                           return node("ImportNamespaceSpecifier", param[0], [[
-                                        "id",
-                                        identifier(param[1])
-                                      ]]);
+                                  "id",
+                                  identifier(param[1])
+                                ]]);
                       
                     }
                   }), $$import.specifiers);
@@ -17384,19 +17384,19 @@ function parse(content, options) {
               
             }
             return node("ImportDeclaration", loc, [
-                        [
-                          "specifiers",
-                          array(Stdlib__Array.of_list(specifiers))
-                        ],
-                        [
-                          "source",
-                          literal($$import.source)
-                        ],
-                        [
-                          "importKind",
-                          string(import_kind)
-                        ]
-                      ]);
+                  [
+                    "specifiers",
+                    array(Stdlib__Array.of_list(specifiers))
+                  ],
+                  [
+                    "source",
+                    literal($$import.source)
+                  ],
+                  [
+                    "importKind",
+                    string(import_kind)
+                  ]
+                ]);
         
       }
     };
@@ -17410,46 +17410,46 @@ function parse(content, options) {
         }
       };
       return node("TypeParameter", param[0], [
-                  [
-                    "name",
-                    string(tp.name)
-                  ],
-                  [
-                    "bound",
-                    option(type_annotation, tp.bound)
-                  ],
-                  [
-                    "variance",
-                    option(variance, tp.variance)
-                  ],
-                  [
-                    "default",
-                    option(_type, tp.default)
-                  ]
-                ]);
+            [
+              "name",
+              string(tp.name)
+            ],
+            [
+              "bound",
+              option(type_annotation, tp.bound)
+            ],
+            [
+              "variance",
+              option(variance, tp.variance)
+            ],
+            [
+              "default",
+              option(_type, tp.default)
+            ]
+          ]);
     };
     const $$catch = function (param) {
       const c = param[1];
       return node("CatchClause", param[0], [
-                  [
-                    "param",
-                    pattern(c.param)
-                  ],
-                  [
-                    "guard",
-                    option(expression, c.guard)
-                  ],
-                  [
-                    "body",
-                    block(c.body)
-                  ]
-                ]);
+            [
+              "param",
+              pattern(c.param)
+            ],
+            [
+              "guard",
+              option(expression, c.guard)
+            ],
+            [
+              "body",
+              block(c.body)
+            ]
+          ]);
     };
     const declare_function = function (param) {
       return node("DeclareFunction", param[0], [[
-                    "id",
-                    identifier(param[1].id)
-                  ]]);
+              "id",
+              identifier(param[1].id)
+            ]]);
     };
     const variable_declaration = function (param) {
       const $$var = param[1];
@@ -17468,63 +17468,63 @@ function parse(content, options) {
         
       }
       return node("VariableDeclaration", param[0], [
-                  [
-                    "declarations",
-                    array_of_list(variable_declarator, $$var.declarations)
-                  ],
-                  [
-                    "kind",
-                    string(kind)
-                  ]
-                ]);
+            [
+              "declarations",
+              array_of_list(variable_declarator, $$var.declarations)
+            ],
+            [
+              "kind",
+              string(kind)
+            ]
+          ]);
     };
     const declare_variable = function (param) {
       return node("DeclareVariable", param[0], [[
-                    "id",
-                    identifier(param[1].id)
-                  ]]);
+              "id",
+              identifier(param[1].id)
+            ]]);
     };
     const interface_declaration = function (param) {
       const i = param[1];
       return node("InterfaceDeclaration", param[0], [
-                  [
-                    "id",
-                    identifier(i.id)
-                  ],
-                  [
-                    "typeParameters",
-                    option(type_parameter_declaration, i.typeParameters)
-                  ],
-                  [
-                    "body",
-                    object_type(i.body)
-                  ],
-                  [
-                    "extends",
-                    array_of_list(interface_extends, i.extends)
-                  ]
-                ]);
+            [
+              "id",
+              identifier(i.id)
+            ],
+            [
+              "typeParameters",
+              option(type_parameter_declaration, i.typeParameters)
+            ],
+            [
+              "body",
+              object_type(i.body)
+            ],
+            [
+              "extends",
+              array_of_list(interface_extends, i.extends)
+            ]
+          ]);
     };
     const declare_class = function (param) {
       const d = param[1];
       return node("DeclareClass", param[0], [
-                  [
-                    "id",
-                    identifier(d.id)
-                  ],
-                  [
-                    "typeParameters",
-                    option(type_parameter_declaration, d.typeParameters)
-                  ],
-                  [
-                    "body",
-                    object_type(d.body)
-                  ],
-                  [
-                    "extends",
-                    array_of_list(interface_extends, d.extends)
-                  ]
-                ]);
+            [
+              "id",
+              identifier(d.id)
+            ],
+            [
+              "typeParameters",
+              option(type_parameter_declaration, d.typeParameters)
+            ],
+            [
+              "body",
+              object_type(d.body)
+            ],
+            [
+              "extends",
+              array_of_list(interface_extends, d.extends)
+            ]
+          ]);
     };
     const export_kind = function (param) {
       if (param === /* ExportType */0) {
@@ -17535,32 +17535,32 @@ function parse(content, options) {
     };
     const let_assignment = function (assignment) {
       return obj([
-                  [
-                    "id",
-                    pattern(assignment.id)
-                  ],
-                  [
-                    "init",
-                    option(expression, assignment.init)
-                  ]
-                ]);
+            [
+              "id",
+              pattern(assignment.id)
+            ],
+            [
+              "init",
+              option(expression, assignment.init)
+            ]
+          ]);
     };
     const type_alias = function (param) {
       const alias = param[1];
       return node("TypeAlias", param[0], [
-                  [
-                    "id",
-                    identifier(alias.id)
-                  ],
-                  [
-                    "typeParameters",
-                    option(type_parameter_declaration, alias.typeParameters)
-                  ],
-                  [
-                    "right",
-                    _type(alias.right)
-                  ]
-                ]);
+            [
+              "id",
+              identifier(alias.id)
+            ],
+            [
+              "typeParameters",
+              option(type_parameter_declaration, alias.typeParameters)
+            ],
+            [
+              "right",
+              _type(alias.right)
+            ]
+          ]);
     };
     const export_specifiers = function (param) {
       if (param !== undefined) {
@@ -17568,9 +17568,9 @@ function parse(content, options) {
           return array_of_list(export_specifier, param._0);
         } else {
           return array([node("ExportBatchSpecifier", param._0, [[
-                              "name",
-                              option(identifier, param._1)
-                            ]])]);
+                        "name",
+                        option(identifier, param._1)
+                      ]])]);
         }
       } else {
         return array([]);
@@ -17579,28 +17579,28 @@ function parse(content, options) {
     const $$case = function (param) {
       const c = param[1];
       return node("SwitchCase", param[0], [
-                  [
-                    "test",
-                    option(expression, c.test)
-                  ],
-                  [
-                    "consequent",
-                    array_of_list(statement, c.consequent)
-                  ]
-                ]);
+            [
+              "test",
+              option(expression, c.test)
+            ],
+            [
+              "consequent",
+              array_of_list(statement, c.consequent)
+            ]
+          ]);
     };
     const template_literal = function (param) {
       const value = param[1];
       return node("TemplateLiteral", param[0], [
-                  [
-                    "quasis",
-                    array_of_list(template_element, value.quasis)
-                  ],
-                  [
-                    "expressions",
-                    array_of_list(expression, value.expressions)
-                  ]
-                ]);
+            [
+              "quasis",
+              array_of_list(template_element, value.quasis)
+            ],
+            [
+              "expressions",
+              array_of_list(expression, value.expressions)
+            ]
+          ]);
     };
     const object_pattern_property = function (param) {
       if (param.TAG === /* Property */0) {
@@ -17630,29 +17630,29 @@ function parse(content, options) {
           
         }
         return node("PropertyPattern", match[0], [
-                    [
-                      "key",
-                      match$1[0]
-                    ],
-                    [
-                      "pattern",
-                      pattern(prop.pattern)
-                    ],
-                    [
-                      "computed",
-                      bool(match$1[1])
-                    ],
-                    [
-                      "shorthand",
-                      bool(prop.shorthand)
-                    ]
-                  ]);
+              [
+                "key",
+                match$1[0]
+              ],
+              [
+                "pattern",
+                pattern(prop.pattern)
+              ],
+              [
+                "computed",
+                bool(match$1[1])
+              ],
+              [
+                "shorthand",
+                bool(prop.shorthand)
+              ]
+            ]);
       }
       const match$2 = param._0;
       return node("SpreadPropertyPattern", match$2[0], [[
-                    "argument",
-                    pattern(match$2[1].argument)
-                  ]]);
+              "argument",
+              pattern(match$2[1].argument)
+            ]]);
     };
     const array_pattern_element = function (p) {
       if (p.TAG === /* Element */0) {
@@ -17660,28 +17660,28 @@ function parse(content, options) {
       }
       const match = p._0;
       return node("SpreadElementPattern", match[0], [[
-                    "argument",
-                    pattern(match[1].argument)
-                  ]]);
+              "argument",
+              pattern(match[1].argument)
+            ]]);
     };
     const class_body = function (param) {
       return node("ClassBody", param[0], [[
-                    "body",
-                    array_of_list(class_element, param[1].body)
-                  ]]);
+              "body",
+              array_of_list(class_element, param[1].body)
+            ]]);
     };
     const class_implements = function (param) {
       const $$implements = param[1];
       return node("ClassImplements", param[0], [
-                  [
-                    "id",
-                    identifier($$implements.id)
-                  ],
-                  [
-                    "typeParameters",
-                    option(type_parameter_instantiation, $$implements.typeParameters)
-                  ]
-                ]);
+            [
+              "id",
+              identifier($$implements.id)
+            ],
+            [
+              "typeParameters",
+              option(type_parameter_instantiation, $$implements.typeParameters)
+            ]
+          ]);
     };
     const object_property = function (param) {
       if (param.TAG === /* Property */0) {
@@ -17725,54 +17725,54 @@ function parse(content, options) {
           
         }
         return node("Property", match[0], [
-                    [
-                      "key",
-                      match$1[0]
-                    ],
-                    [
-                      "value",
-                      expression(prop.value)
-                    ],
-                    [
-                      "kind",
-                      string(kind)
-                    ],
-                    [
-                      "method",
-                      bool(prop._method)
-                    ],
-                    [
-                      "shorthand",
-                      bool(prop.shorthand)
-                    ],
-                    [
-                      "computed",
-                      bool(match$1[1])
-                    ]
-                  ]);
+              [
+                "key",
+                match$1[0]
+              ],
+              [
+                "value",
+                expression(prop.value)
+              ],
+              [
+                "kind",
+                string(kind)
+              ],
+              [
+                "method",
+                bool(prop._method)
+              ],
+              [
+                "shorthand",
+                bool(prop.shorthand)
+              ],
+              [
+                "computed",
+                bool(match$1[1])
+              ]
+            ]);
       }
       const match$3 = param._0;
       return node("SpreadProperty", match$3[0], [[
-                    "argument",
-                    expression(match$3[1].argument)
-                  ]]);
+              "argument",
+              expression(match$3[1].argument)
+            ]]);
     };
     const comprehension_block = function (param) {
       const b = param[1];
       return node("ComprehensionBlock", param[0], [
-                  [
-                    "left",
-                    pattern(b.left)
-                  ],
-                  [
-                    "right",
-                    expression(b.right)
-                  ],
-                  [
-                    "each",
-                    bool(b.each)
-                  ]
-                ]);
+            [
+              "left",
+              pattern(b.left)
+            ],
+            [
+              "right",
+              expression(b.right)
+            ],
+            [
+              "each",
+              bool(b.each)
+            ]
+          ]);
     };
     const expression_or_spread = function (expr) {
       if (expr.TAG === /* Expression */0) {
@@ -17780,21 +17780,21 @@ function parse(content, options) {
       }
       const match = expr._0;
       return node("SpreadElement", match[0], [[
-                    "argument",
-                    expression(match[1].argument)
-                  ]]);
+              "argument",
+              expression(match[1].argument)
+            ]]);
     };
     const program$2 = function (param) {
       return node("Program", param[0], [
-                  [
-                    "body",
-                    array_of_list(statement, param[1])
-                  ],
-                  [
-                    "comments",
-                    array_of_list(comment, param[2])
-                  ]
-                ]);
+            [
+              "body",
+              array_of_list(statement, param[1])
+            ],
+            [
+              "comments",
+              array_of_list(comment, param[2])
+            ]
+          ]);
     };
     const ret = program$2(match[0]);
     const translation_errors$1 = translation_errors.contents;
@@ -17828,10 +17828,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -17849,13 +17849,13 @@ if (f !== undefined) {
       ], v.range);
 } else {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "runParser.ml",
-              15,
-              12
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "runParser.ml",
+          15,
+          12
+        ]
+      });
 }
 
 Mt.from_pair_suites("Flow_parser_reg_test", suites.contents);
diff --git a/jscomp/test/dist/jscomp/test/for_loop_test.js b/jscomp/test/dist/jscomp/test/for_loop_test.js
index c7358a7d4..e715e7dcf 100644
--- a/jscomp/test/dist/jscomp/test/for_loop_test.js
+++ b/jscomp/test/dist/jscomp/test/for_loop_test.js
@@ -106,11 +106,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) {
@@ -200,20 +200,20 @@ function for_9(param) {
           Curry._1(f, undefined);
         }), arr2);
   return [[
-            vv.contents,
-            Stdlib__Array.of_list(Stdlib__List.rev(v.contents)),
-            vv2.contents
-          ]];
+      vv.contents,
+      Stdlib__Array.of_list(Stdlib__List.rev(v.contents)),
+      vv2.contents
+    ]];
 }
 
 const suites_0 = [
   "for_loop_test_3",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: 90,
-              _1: for_3(Caml_array.make(10, 2))
-            };
+        TAG: /* Eq */0,
+        _0: 90,
+        _1: for_3(Caml_array.make(10, 2))
+      };
     })
 ];
 
@@ -222,10 +222,10 @@ const suites_1 = {
     "for_loop_test_4",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: 180,
-                _1: for_4(Caml_array.make(10, 2))
-              };
+          TAG: /* Eq */0,
+          _0: 180,
+          _1: for_4(Caml_array.make(10, 2))
+        };
       })
   ],
   tl: {
@@ -233,10 +233,10 @@ const suites_1 = {
       "for_loop_test_5",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: 2420,
-                  _1: for_5(Caml_array.make(10, 2), 11)
-                };
+            TAG: /* Eq */0,
+            _0: 2420,
+            _1: for_5(Caml_array.make(10, 2), 11)
+          };
         })
     ],
     tl: {
@@ -244,15 +244,15 @@ const suites_1 = {
         "for_loop_test_6",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: [
-                      30,
-                      1,
-                      2,
-                      3
-                    ],
-                    _1: for_6(Caml_array.make(3, 0), 0)
-                  };
+              TAG: /* Eq */0,
+              _0: [
+                30,
+                1,
+                2,
+                3
+              ],
+              _1: for_6(Caml_array.make(3, 0), 0)
+            };
           })
       ],
       tl: {
@@ -260,10 +260,10 @@ const suites_1 = {
           "for_loop_test_7",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: 84,
-                      _1: for_7(undefined)
-                    };
+                TAG: /* Eq */0,
+                _0: 84,
+                _1: for_7(undefined)
+              };
             })
         ],
         tl: {
@@ -271,10 +271,10 @@ const suites_1 = {
             "for_loop_test_8",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: 294,
-                        _1: for_8(undefined)
-                      };
+                  TAG: /* Eq */0,
+                  _0: 294,
+                  _1: for_8(undefined)
+                };
               })
           ],
           tl: {
@@ -282,19 +282,19 @@ const suites_1 = {
               "for_loop_test_9",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: [[
-                              10,
-                              [
-                                1,
-                                2,
-                                2,
-                                3
-                              ],
-                              5
-                            ]],
-                          _1: for_9(undefined)
-                        };
+                    TAG: /* Eq */0,
+                    _0: [[
+                        10,
+                        [
+                          1,
+                          2,
+                          2,
+                          3
+                        ],
+                        5
+                      ]],
+                    _1: for_9(undefined)
+                  };
                 })
             ],
             tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/for_side_effect_test.js b/jscomp/test/dist/jscomp/test/for_side_effect_test.js
index aefebe033..f9126e4ab 100644
--- a/jscomp/test/dist/jscomp/test/for_side_effect_test.js
+++ b/jscomp/test/dist/jscomp/test/for_side_effect_test.js
@@ -23,10 +23,10 @@ const suites_0 = [
   "for_order",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: 10,
-              _1: test2(undefined)
-            };
+        TAG: /* Eq */0,
+        _0: 10,
+        _1: test2(undefined)
+      };
     })
 ];
 
diff --git a/jscomp/test/dist/jscomp/test/format_regression.js b/jscomp/test/dist/jscomp/test/format_regression.js
index 628fde9b6..78467ddc0 100644
--- a/jscomp/test/dist/jscomp/test/format_regression.js
+++ b/jscomp/test/dist/jscomp/test/format_regression.js
@@ -6,46 +6,46 @@ const Curry = require("melange.js/curry.js");
 
 function peek_queue(param) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/format_regression.ml",
-              10,
-              19
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/format_regression.ml",
+          10,
+          19
+        ]
+      });
 }
 
 function int_of_size(param) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/format_regression.ml",
-              11,
-              20
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/format_regression.ml",
+          11,
+          20
+        ]
+      });
 }
 
 function take_queue(param) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/format_regression.ml",
-              12,
-              19
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/format_regression.ml",
+          12,
+          19
+        ]
+      });
 }
 
 function format_pp_token(param, param$1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/format_regression.ml",
-              13,
-              26
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/format_regression.ml",
+          13,
+          26
+        ]
+      });
 }
 
 function advance_loop(state) {
diff --git a/jscomp/test/dist/jscomp/test/format_test.js b/jscomp/test/dist/jscomp/test/format_test.js
index 3d3485f3b..a2a85c525 100644
--- a/jscomp/test/dist/jscomp/test/format_test.js
+++ b/jscomp/test/dist/jscomp/test/format_test.js
@@ -26,10 +26,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -44,34 +44,34 @@ function eq3(loc, a, b, c) {
 
 function $caret$caret(param, param$1) {
   return {
-          TAG: /* Format */0,
-          _0: CamlinternalFormatBasics.concat_fmt(param._0, param$1._0),
-          _1: param._1 + ("%," + param$1._1)
-        };
+    TAG: /* Format */0,
+    _0: CamlinternalFormatBasics.concat_fmt(param._0, param$1._0),
+    _1: param._1 + ("%," + param$1._1)
+  };
 }
 
 function u(param) {
   return $caret$caret({
-              TAG: /* Format */0,
-              _0: {
-                TAG: /* String_literal */11,
-                _0: "xx ",
-                _1: {
-                  TAG: /* String */2,
-                  _0: /* No_padding */0,
-                  _1: /* End_of_format */0
-                }
-              },
-              _1: "xx %s"
-            }, {
-              TAG: /* Format */0,
-              _0: {
-                TAG: /* String_literal */11,
-                _0: "yy",
-                _1: /* End_of_format */0
-              },
-              _1: "yy"
-            });
+        TAG: /* Format */0,
+        _0: {
+          TAG: /* String_literal */11,
+          _0: "xx ",
+          _1: {
+            TAG: /* String */2,
+            _0: /* No_padding */0,
+            _1: /* End_of_format */0
+          }
+        },
+        _1: "xx %s"
+      }, {
+        TAG: /* Format */0,
+        _0: {
+          TAG: /* String_literal */11,
+          _0: "yy",
+          _1: /* End_of_format */0
+        },
+        _1: "yy"
+      });
 }
 
 const M = {};
@@ -166,19 +166,19 @@ f("File \"jscomp/test/format_test.ml\", line 82, characters 6-13", {
 
 function sl(f) {
   return Curry._1(Stdlib__Printf.sprintf({
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Float */8,
-                    _0: [
-                      /* Float_flag_ */0,
-                      /* Float_h */6
-                    ],
-                    _1: /* No_padding */0,
-                    _2: /* No_precision */0,
-                    _3: /* End_of_format */0
-                  },
-                  _1: "%h"
-                }), f);
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Float */8,
+              _0: [
+                /* Float_flag_ */0,
+                /* Float_h */6
+              ],
+              _1: /* No_padding */0,
+              _2: /* No_precision */0,
+              _3: /* End_of_format */0
+            },
+            _1: "%h"
+          }), f);
 }
 
 function aux_list(loc, ls) {
diff --git a/jscomp/test/dist/jscomp/test/fs_test.js b/jscomp/test/dist/jscomp/test/fs_test.js
index 0494b789b..878e7cd8d 100644
--- a/jscomp/test/dist/jscomp/test/fs_test.js
+++ b/jscomp/test/dist/jscomp/test/fs_test.js
@@ -22,10 +22,10 @@ function eq(loc, param) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/fun_pattern_match.js b/jscomp/test/dist/jscomp/test/fun_pattern_match.js
index 2c9073a3f..5c69da6d8 100644
--- a/jscomp/test/dist/jscomp/test/fun_pattern_match.js
+++ b/jscomp/test/dist/jscomp/test/fun_pattern_match.js
@@ -25,13 +25,13 @@ function f3(param, param$1) {
     rhs === /* Uninitialized */0;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/fun_pattern_match.ml",
-              41,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/fun_pattern_match.ml",
+          41,
+          9
+        ]
+      });
 }
 
 function f4(param, param$1) {
@@ -46,13 +46,13 @@ function f4(param, param$1) {
     rhs === /* Uninitialized */0;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/fun_pattern_match.ml",
-              49,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/fun_pattern_match.ml",
+          49,
+          9
+        ]
+      });
 }
 
 const x = {
diff --git a/jscomp/test/dist/jscomp/test/functor_app_test.js b/jscomp/test/dist/jscomp/test/functor_app_test.js
index 33a24957d..b66adf8d0 100644
--- a/jscomp/test/dist/jscomp/test/functor_app_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/functor_def.js b/jscomp/test/dist/jscomp/test/functor_def.js
index f3b3f233c..2d428abfb 100644
--- a/jscomp/test/dist/jscomp/test/functor_def.js
+++ b/jscomp/test/dist/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/dist/jscomp/test/functor_ffi.js b/jscomp/test/dist/jscomp/test/functor_ffi.js
index 91b245380..27bfe0f04 100644
--- a/jscomp/test/dist/jscomp/test/functor_ffi.js
+++ b/jscomp/test/dist/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 @@ const 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/dist/jscomp/test/functors.js b/jscomp/test/dist/jscomp/test/functors.js
index 675048fbb..c675334cc 100644
--- a/jscomp/test/dist/jscomp/test/functors.js
+++ b/jscomp/test/dist/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
+  };
 }
 
 const M = {
@@ -53,8 +53,8 @@ const M = {
         return 1 + Curry._1(funarg$1.foo, Curry._1(funarg.foo, x)) | 0;
       };
       return {
-              sheep: sheep
-            };
+        sheep: sheep
+      };
     })
 };
 
diff --git a/jscomp/test/dist/jscomp/test/global_exception_regression_test.js b/jscomp/test/dist/jscomp/test/global_exception_regression_test.js
index d695ceae9..3ded761d3 100644
--- a/jscomp/test/dist/jscomp/test/global_exception_regression_test.js
+++ b/jscomp/test/dist/jscomp/test/global_exception_regression_test.js
@@ -20,10 +20,10 @@ const suites_0 = [
   "not_found_equal",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: u,
-              _1: v
-            };
+        TAG: /* Eq */0,
+        _0: u,
+        _1: v
+      };
     })
 ];
 
@@ -32,10 +32,10 @@ const suites_1 = {
     "not_found_not_equal_end_of_file",
     (function (param) {
         return {
-                TAG: /* Neq */1,
-                _0: u,
-                _1: s
-              };
+          TAG: /* Neq */1,
+          _0: u,
+          _1: s
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/global_module_alias_test.js b/jscomp/test/dist/jscomp/test/global_module_alias_test.js
index 183add21f..2a8e708f4 100644
--- a/jscomp/test/dist/jscomp/test/global_module_alias_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -89,18 +89,18 @@ eq("File \"jscomp/test/global_module_alias_test.ml\", line 57, characters 5-12",
 
 function g(param) {
   return Stdlib__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/dist/jscomp/test/google_closure_test.js b/jscomp/test/dist/jscomp/test/google_closure_test.js
index 6b1b54d17..80f5a170c 100644
--- a/jscomp/test/dist/jscomp/test/google_closure_test.js
+++ b/jscomp/test/dist/jscomp/test/google_closure_test.js
@@ -9,21 +9,21 @@ Mt.from_pair_suites("Closure", {
         "partial",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: [
-                      Test_google_closure.a,
-                      Test_google_closure.b,
-                      Test_google_closure.c
-                    ],
-                    _1: [
-                      "3",
-                      101,
-                      [
-                        1,
-                        2
-                      ]
-                    ]
-                  };
+              TAG: /* Eq */0,
+              _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/dist/jscomp/test/gpr496_test.js b/jscomp/test/dist/jscomp/test/gpr496_test.js
index f5a436932..9c352ad1a 100644
--- a/jscomp/test/dist/jscomp/test/gpr496_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1150.js b/jscomp/test/dist/jscomp/test/gpr_1150.js
index 4424d7bbb..3906db76f 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1150.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1150.js
@@ -16,233 +16,233 @@ function f(children) {
   const a1 = children$1.hd;
   if (!children$2) {
     return [
-            a0,
-            a1
-          ];
+      a0,
+      a1
+    ];
   }
   const children$3 = children$2.tl;
   const a2 = children$2.hd;
   if (!children$3) {
     return [
-            a0,
-            a1,
-            a2
-          ];
+      a0,
+      a1,
+      a2
+    ];
   }
   const children$4 = children$3.tl;
   const a3 = children$3.hd;
   if (!children$4) {
     return [
-            a0,
-            a1,
-            a2,
-            a3
-          ];
+      a0,
+      a1,
+      a2,
+      a3
+    ];
   }
   const children$5 = children$4.tl;
   const a4 = children$4.hd;
   if (!children$5) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4
+    ];
   }
   const children$6 = children$5.tl;
   const a5 = children$5.hd;
   if (!children$6) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4,
+      a5
+    ];
   }
   const children$7 = children$6.tl;
   const a6 = children$6.hd;
   if (!children$7) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4,
+      a5,
+      a6
+    ];
   }
   const children$8 = children$7.tl;
   const a7 = children$7.hd;
   if (!children$8) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4,
+      a5,
+      a6,
+      a7
+    ];
   }
   const children$9 = children$8.tl;
   const 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
+    ];
   }
   const children$10 = children$9.tl;
   const 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
+    ];
   }
   const children$11 = children$10.tl;
   const 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
+    ];
   }
   const children$12 = children$11.tl;
   const 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
+    ];
   }
   const children$13 = children$12.tl;
   const 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
+    ];
   }
   const children$14 = children$13.tl;
   const 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
+    ];
   }
   const children$15 = children$14.tl;
   const 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 new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/gpr_1150.ml",
-                56,
-                34
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/gpr_1150.ml",
+            56,
+            34
+          ]
+        });
   }
   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/dist/jscomp/test/gpr_1154_test.js b/jscomp/test/dist/jscomp/test/gpr_1154_test.js
index 4429bf0ef..357a9b07a 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1154_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1154_test.js
@@ -21,10 +21,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1240_missing_unbox.js b/jscomp/test/dist/jscomp/test/gpr_1240_missing_unbox.js
index 6edcbae61..38e93cefb 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1240_missing_unbox.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1240_missing_unbox.js
@@ -6,9 +6,9 @@ function f(x, y) {
   let x$1 = x;
   let y$1 = y;
   return [
-          x$1,
-          y$1
-        ];
+    x$1,
+    y$1
+  ];
 }
 
 exports.f = f;
diff --git a/jscomp/test/dist/jscomp/test/gpr_1285_test.js b/jscomp/test/dist/jscomp/test/gpr_1285_test.js
index 25056053e..e1e63f4c4 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1285_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1285_test.js
@@ -21,10 +21,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1409_test.js b/jscomp/test/dist/jscomp/test/gpr_1409_test.js
index ac1463600..f93581710 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1409_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1423_app_test.js b/jscomp/test/dist/jscomp/test/gpr_1423_app_test.js
index ed489b88b..d32e9cef3 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1423_app_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1501_test.js b/jscomp/test/dist/jscomp/test/gpr_1501_test.js
index c79842fc6..2b6c2e318 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1501_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1501_test.js
@@ -21,10 +21,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1503_test.js b/jscomp/test/dist/jscomp/test/gpr_1503_test.js
index ae4df9418..d628c0432 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1503_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1503_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1658_test.js b/jscomp/test/dist/jscomp/test/gpr_1658_test.js
index 02a9f0b11..6444c979b 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1658_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1667_test.js b/jscomp/test/dist/jscomp/test/gpr_1667_test.js
index 8058c2b12..8d746c2cd 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1667_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1698_test.js b/jscomp/test/dist/jscomp/test/gpr_1698_test.js
index 3ea2b6d26..8f085ec27 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1698_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1698_test.js
@@ -51,13 +51,13 @@ function compare(context, state, _a, _b) {
                 break;
             case /* Frac */4 :
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/gpr_1698_test.ml",
-                            45,
-                            10
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/gpr_1698_test.ml",
+                        45,
+                        10
+                      ]
+                    });
             case /* Pow */3 :
             case /* Gcd */5 :
                 exit = 1;
@@ -76,13 +76,13 @@ function compare(context, state, _a, _b) {
           switch (b.TAG) {
             case /* Val */0 :
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/gpr_1698_test.ml",
-                            45,
-                            10
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/gpr_1698_test.ml",
+                        45,
+                        10
+                      ]
+                    });
             case /* Neg */1 :
                 exit$3 = 5;
                 break;
diff --git a/jscomp/test/dist/jscomp/test/gpr_1701_test.js b/jscomp/test/dist/jscomp/test/gpr_1701_test.js
index f954fda49..8c04db9e3 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1701_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1701_test.js
@@ -11,8 +11,8 @@ const Foo = /* @__PURE__ */Caml_exceptions.create("Gpr_1701_test.Foo");
 function test(n) {
   if (n === 0) {
     throw new Caml_js_exceptions.MelangeError(Foo, {
-              MEL_EXN_ID: Foo
-            });
+          MEL_EXN_ID: Foo
+        });
   }
   try {
     return test(n - 1 | 0);
@@ -83,9 +83,9 @@ function read_lines3(inc) {
     try {
       const l = Stdlib.input_line(inc);
       return loop({
-                  hd: l,
-                  tl: acc
-                });
+            hd: l,
+            tl: acc
+          });
     }
     catch (raw_exn){
       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
diff --git a/jscomp/test/dist/jscomp/test/gpr_1716_test.js b/jscomp/test/dist/jscomp/test/gpr_1716_test.js
index 4e65c10bf..53ec688ae 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1716_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1728_test.js b/jscomp/test/dist/jscomp/test/gpr_1728_test.js
index de6861e30..f9cb43b5c 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1728_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1749_test.js b/jscomp/test/dist/jscomp/test/gpr_1749_test.js
index e4be29c30..7fedd3842 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1749_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1760_test.js b/jscomp/test/dist/jscomp/test/gpr_1760_test.js
index 5ef565765..854b3ad41 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1760_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1762_test.js b/jscomp/test/dist/jscomp/test/gpr_1762_test.js
index e9f9f4635..470a8d437 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1762_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1817_test.js b/jscomp/test/dist/jscomp/test/gpr_1817_test.js
index f89e581f2..109400ad6 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1817_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -33,10 +33,10 @@ function f(param) {
   const x = new Date();
   const y = new Date();
   return [
-          Caml_obj.caml_greaterthan(y, x),
-          Caml_obj.caml_lessthan(y, x),
-          true
-        ];
+    Caml_obj.caml_greaterthan(y, x),
+    Caml_obj.caml_lessthan(y, x),
+    true
+  ];
 }
 
 const match = f(undefined);
diff --git a/jscomp/test/dist/jscomp/test/gpr_1822_test.js b/jscomp/test/dist/jscomp/test/gpr_1822_test.js
index ce6fa5cf4..fd57c136b 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1822_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_1943_test.js b/jscomp/test/dist/jscomp/test/gpr_1943_test.js
index d82d0b306..355c447e9 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1943_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _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'"]
+  ];
 }
 
 const v = f({
diff --git a/jscomp/test/dist/jscomp/test/gpr_1946_test.js b/jscomp/test/dist/jscomp/test/gpr_1946_test.js
index 4aeb10996..47253f5e0 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1946_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1946_test.js
@@ -16,13 +16,13 @@ function eq(loc, x, y) {
 }
 
 const x = ({
-    x: 3,
-    y: 4
-  }).x;
+  x: 3,
+  y: 4
+}).x;
 
 const zz = ({
-    "5": 3
-  })[5];
+  "5": 3
+})[5];
 
 const h = {
   "0123": 2,
@@ -37,8 +37,8 @@ function f(id) {
 }
 
 eq("File \"jscomp/test/gpr_1946_test.ml\", line 28, characters 6-13", ({
-        "5": 3
-      })[5], 3);
+      "5": 3
+    })[5], 3);
 
 eq("File \"jscomp/test/gpr_1946_test.ml\", line 29, characters 6-13", [
       2,
@@ -49,8 +49,8 @@ eq("File \"jscomp/test/gpr_1946_test.ml\", line 29, characters 6-13", [
     ]);
 
 console.log(({
-          "5": 3
-        }).TAG);
+        "5": 3
+      }).TAG);
 
 Mt.from_pair_suites("File \"jscomp/test/gpr_1946_test.ml\", line 32, characters 23-30", suites.contents);
 
diff --git a/jscomp/test/dist/jscomp/test/gpr_2250_test.js b/jscomp/test/dist/jscomp/test/gpr_2250_test.js
index f8c9d69ad..b908af4da 100644
--- a/jscomp/test/dist/jscomp/test/gpr_2250_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_2250_test.js
@@ -21,10 +21,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_2316_test.js b/jscomp/test/dist/jscomp/test/gpr_2316_test.js
index fd26cfc47..64ee8cf1e 100644
--- a/jscomp/test/dist/jscomp/test/gpr_2316_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_2316_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -34,9 +34,9 @@ let y;
 
 try {
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: "boo"
-          });
+        MEL_EXN_ID: "Failure",
+        _1: "boo"
+      });
 }
 catch (raw_msg){
   const msg = Caml_js_exceptions.internalToOCamlException(raw_msg);
@@ -53,9 +53,9 @@ let exit = 0;
 
 try {
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: "boo"
-          });
+        MEL_EXN_ID: "Failure",
+        _1: "boo"
+      });
 }
 catch (raw_msg$1){
   const msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg$1);
diff --git a/jscomp/test/dist/jscomp/test/gpr_2474.js b/jscomp/test/dist/jscomp/test/gpr_2474.js
index 60556f5b6..81f8ceaf8 100644
--- a/jscomp/test/dist/jscomp/test/gpr_2474.js
+++ b/jscomp/test/dist/jscomp/test/gpr_2474.js
@@ -4,13 +4,13 @@
 const Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 throw new Caml_js_exceptions.MelangeError("Match_failure", {
-          MEL_EXN_ID: "Match_failure",
-          _1: [
-            "jscomp/test/gpr_2474.ml",
-            6,
-            4
-          ]
-        });
+      MEL_EXN_ID: "Match_failure",
+      _1: [
+        "jscomp/test/gpr_2474.ml",
+        6,
+        4
+      ]
+    });
 
 exports.coordinates = coordinates;
 /*  Not a pure module */
diff --git a/jscomp/test/dist/jscomp/test/gpr_2682_test.js b/jscomp/test/dist/jscomp/test/gpr_2682_test.js
index db95d30e7..3330eba23 100644
--- a/jscomp/test/dist/jscomp/test/gpr_2682_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_2682_test.js
@@ -51,13 +51,13 @@ const bbbb = f3();
 
 if (!bbbb) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/gpr_2682_test.ml",
-              59,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/gpr_2682_test.ml",
+          59,
+          2
+        ]
+      });
 }
 
 exports.sum = sum;
diff --git a/jscomp/test/dist/jscomp/test/gpr_3546_test.js b/jscomp/test/dist/jscomp/test/gpr_3546_test.js
index a1c0bd6f9..9f1a9df48 100644
--- a/jscomp/test/dist/jscomp/test/gpr_3546_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_3546_test.js
@@ -4,9 +4,9 @@
 
 function t_error3(param_0) {
   return {
-          TAG: /* T_error3 */0,
-          _0: param_0
-        };
+    TAG: /* T_error3 */0,
+    _0: param_0
+  };
 }
 
 const t_error = /* T_error */0;
diff --git a/jscomp/test/dist/jscomp/test/gpr_3566_test.js b/jscomp/test/dist/jscomp/test/gpr_3566_test.js
index d59785298..0cdeb1caf 100644
--- a/jscomp/test/dist/jscomp/test/gpr_3566_test.js
+++ b/jscomp/test/dist/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) {
   const f = Caml_obj.caml_equal;
   const Caml_obj$1 = {};
   return {
-          f: f,
-          Caml_obj: Caml_obj$1
-        };
+    f: f,
+    Caml_obj: Caml_obj$1
+  };
 }
 
 function Test4($star) {
   const Caml_obj$1 = {};
   const f = Caml_obj.caml_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) {
   };
   const 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) {
   const 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) {
   };
   const Curry$1 = {};
   return {
-          f: f,
-          Curry: Curry$1
-        };
+    f: f,
+    Curry: Curry$1
+  };
 }
 
 function Test10($star) {
   const Curry = {};
   return {
-          Curry: Curry
-        };
+    Curry: Curry
+  };
 }
 
 const x = 3;
diff --git a/jscomp/test/dist/jscomp/test/gpr_3595_test.js b/jscomp/test/dist/jscomp/test/gpr_3595_test.js
index e4a196f73..9715cffad 100644
--- a/jscomp/test/dist/jscomp/test/gpr_3595_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_3595_test.js
@@ -20,13 +20,13 @@ const match = [1];
 
 if (match.length !== 1) {
   throw new Caml_js_exceptions.MelangeError("Match_failure", {
-            MEL_EXN_ID: "Match_failure",
-            _1: [
-              "jscomp/test/gpr_3595_test.ml",
-              9,
-              4
-            ]
-          });
+        MEL_EXN_ID: "Match_failure",
+        _1: [
+          "jscomp/test/gpr_3595_test.ml",
+          9,
+          4
+        ]
+      });
 }
 
 const a = match[0];
diff --git a/jscomp/test/dist/jscomp/test/gpr_3697_test.js b/jscomp/test/dist/jscomp/test/gpr_3697_test.js
index d7a6e5d21..c275060c2 100644
--- a/jscomp/test/dist/jscomp/test/gpr_3697_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_3697_test.js
@@ -5,14 +5,14 @@ const CamlinternalLazy = require("melange/camlinternalLazy.js");
 
 function fix(param) {
   return {
-          TAG: /* Fix */0,
-          _0: {
-            LAZY_DONE: false,
-            VAL: (function () {
-                return fix(undefined);
-              })
-          }
-        };
+    TAG: /* Fix */0,
+    _0: {
+      LAZY_DONE: false,
+      VAL: (function () {
+          return fix(undefined);
+        })
+    }
+  };
 }
 
 function unfixLeak(_f) {
diff --git a/jscomp/test/dist/jscomp/test/gpr_3877_test.js b/jscomp/test/dist/jscomp/test/gpr_3877_test.js
index 74817c29c..d1796abfb 100644
--- a/jscomp/test/dist/jscomp/test/gpr_3877_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_3877_test.js
@@ -23,24 +23,24 @@ const b = "bad response";
 
 if (a !== "good response") {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/gpr_3877_test.ml",
-              14,
-              3
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/gpr_3877_test.ml",
+          14,
+          3
+        ]
+      });
 }
 
 if (b !== "bad response") {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/gpr_3877_test.ml",
-              15,
-              3
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/gpr_3877_test.ml",
+          15,
+          3
+        ]
+      });
 }
 
 exports.test = test;
diff --git a/jscomp/test/dist/jscomp/test/gpr_3980_test.js b/jscomp/test/dist/jscomp/test/gpr_3980_test.js
index 8681400c4..cf52ae092 100644
--- a/jscomp/test/dist/jscomp/test/gpr_3980_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_3980_test.js
@@ -9,38 +9,38 @@ const match = 1;
 if (match !== undefined) {
   if (match !== 1) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/gpr_3980_test.ml",
-                16,
-                10
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/gpr_3980_test.ml",
+            16,
+            10
+          ]
+        });
   }
   const match$1 = 1;
   if (match$1 !== 1) {
     if (match$1 !== 2) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/gpr_3980_test.ml",
-                  14,
-                  12
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/gpr_3980_test.ml",
+              14,
+              12
+            ]
+          });
     }
     Js__Js_math.floor_int(1);
   }
   
 } else {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/gpr_3980_test.ml",
-              16,
-              10
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/gpr_3980_test.ml",
+          16,
+          10
+        ]
+      });
 }
 
 /*  Not a pure module */
diff --git a/jscomp/test/dist/jscomp/test/gpr_4025_test.js b/jscomp/test/dist/jscomp/test/gpr_4025_test.js
index 113e39815..1d99da411 100644
--- a/jscomp/test/dist/jscomp/test/gpr_4025_test.js
+++ b/jscomp/test/dist/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/dist/jscomp/test/gpr_405_test.js b/jscomp/test/dist/jscomp/test/gpr_405_test.js
index d2ba0516d..80a6a58d8 100644
--- a/jscomp/test/dist/jscomp/test/gpr_405_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_405_test.js
@@ -39,23 +39,23 @@ function Make(funarg) {
     const step2 = function (top, rest_of_stack) {
       if (find_default(already_processed, top)) {
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/gpr_405_test.ml",
-                    43,
-                    6
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/gpr_405_test.ml",
+                43,
+                6
+              ]
+            });
       }
       if (find_default(on_the_stack, top)) {
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/gpr_405_test.ml",
-                    44,
-                    6
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/gpr_405_test.ml",
+                44,
+                6
+              ]
+            });
       }
       Curry._3(H.add, on_the_stack, top, true);
       Curry._3(H.add, n_labels, top, counter.contents);
@@ -73,12 +73,12 @@ function Make(funarg) {
           const 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
+                });
           }
           const 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.caml_int_max(Curry._2(H.find, l_labels, top$1), x));
@@ -94,9 +94,9 @@ function Make(funarg) {
         }
         if (Curry._2(H.find, l_labels, top$1) > Curry._2(H.find, n_labels, top$1)) {
           throw new Caml_js_exceptions.MelangeError(Stdlib.Invalid_argument, {
-                    MEL_EXN_ID: Stdlib.Invalid_argument,
-                    _1: "Graph.Mincut: graph not reducible"
-                  });
+                MEL_EXN_ID: Stdlib.Invalid_argument,
+                _1: "Graph.Mincut: graph not reducible"
+              });
         }
         if (!rest_of_stack$1) {
           return cut_set.contents;
@@ -114,8 +114,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/dist/jscomp/test/gpr_459_test.js b/jscomp/test/dist/jscomp/test/gpr_459_test.js
index 6a1c6d5b2..24df3925e 100644
--- a/jscomp/test/dist/jscomp/test/gpr_459_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_4632.js b/jscomp/test/dist/jscomp/test/gpr_4632.js
index 86de4a09c..10450b06f 100644
--- a/jscomp/test/dist/jscomp/test/gpr_4632.js
+++ b/jscomp/test/dist/jscomp/test/gpr_4632.js
@@ -23,13 +23,13 @@ const T0 = {
 };
 
 throw new Caml_js_exceptions.MelangeError("Match_failure", {
-          MEL_EXN_ID: "Match_failure",
-          _1: [
-            "jscomp/test/gpr_4632.ml",
-            12,
-            6
-          ]
-        });
+      MEL_EXN_ID: "Match_failure",
+      _1: [
+        "jscomp/test/gpr_4632.ml",
+        12,
+        6
+      ]
+    });
 
 exports.T0 = T0;
 exports.T1 = T1;
diff --git a/jscomp/test/dist/jscomp/test/gpr_627_test.js b/jscomp/test/dist/jscomp/test/gpr_627_test.js
index dec1a72a0..c74f363a3 100644
--- a/jscomp/test/dist/jscomp/test/gpr_627_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_627_test.js
@@ -20,10 +20,10 @@ function eq(loc, param) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_858_unit2_test.js b/jscomp/test/dist/jscomp/test/gpr_858_unit2_test.js
index df5b56e9a..dbfcbfcc1 100644
--- a/jscomp/test/dist/jscomp/test/gpr_858_unit2_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_858_unit2_test.js
@@ -24,13 +24,13 @@ for (let i = 1; i <= 2; ++i) {
       return ;
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/gpr_858_unit2_test.ml",
-                6,
-                13
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/gpr_858_unit2_test.ml",
+            6,
+            13
+          ]
+        });
   };
   f(0, i);
 }
diff --git a/jscomp/test/dist/jscomp/test/gpr_904_test.js b/jscomp/test/dist/jscomp/test/gpr_904_test.js
index cb196db48..a661731a0 100644
--- a/jscomp/test/dist/jscomp/test/gpr_904_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/gpr_974_test.js b/jscomp/test/dist/jscomp/test/gpr_974_test.js
index 69f1bffed..5410a4856 100644
--- a/jscomp/test/dist/jscomp/test/gpr_974_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_974_test.js
@@ -7,35 +7,35 @@ const Caml_option = require("melange.js/caml_option.js");
 
 if (!Caml_obj.caml_equal(Caml_option.nullable_to_opt(""), "")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/gpr_974_test.ml",
-              3,
-              4
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/gpr_974_test.ml",
+          3,
+          4
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Caml_option.undefined_to_opt(""), "")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/gpr_974_test.ml",
-              4,
-              4
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/gpr_974_test.ml",
+          4,
+          4
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(Caml_option.null_to_opt(""), "")) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/gpr_974_test.ml",
-              5,
-              4
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/gpr_974_test.ml",
+          5,
+          4
+        ]
+      });
 }
 
 /*  Not a pure module */
diff --git a/jscomp/test/dist/jscomp/test/gpr_977_test.js b/jscomp/test/dist/jscomp/test/gpr_977_test.js
index f5a042344..227e4d3b7 100644
--- a/jscomp/test/dist/jscomp/test/gpr_977_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/guide_for_ext.js b/jscomp/test/dist/jscomp/test/guide_for_ext.js
index d4edeac20..b1f9640aa 100644
--- a/jscomp/test/dist/jscomp/test/guide_for_ext.js
+++ b/jscomp/test/dist/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/dist/jscomp/test/hamming_test.js b/jscomp/test/dist/jscomp/test/hamming_test.js
index c7ca2377b..39d6f3985 100644
--- a/jscomp/test/dist/jscomp/test/hamming_test.js
+++ b/jscomp/test/dist/jscomp/test/hamming_test.js
@@ -42,9 +42,9 @@ const digit = Caml_format.caml_int64_of_string("1000000000000000000");
 function mul(n, param) {
   const pl = param[0];
   return [
-          Caml_int64.mod_(Caml_int64.mul(n, pl), digit),
-          Caml_int64.add(Caml_int64.mul(n, param[1]), Caml_int64.div(Caml_int64.mul(n, pl), digit))
-        ];
+    Caml_int64.mod_(Caml_int64.mul(n, pl), digit),
+    Caml_int64.add(Caml_int64.mul(n, param[1]), Caml_int64.div(Caml_int64.mul(n, pl), digit))
+  ];
 }
 
 function cmp(param, param$1) {
@@ -91,95 +91,95 @@ function pr(param) {
   const nl = param[0];
   if (Caml_int64.compare(nh, n0) === 0) {
     return Curry._1(Stdlib__Printf.bprintf(buf, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Int64 */7,
-                      _0: /* Int_d */0,
-                      _1: /* No_padding */0,
-                      _2: /* No_precision */0,
-                      _3: {
-                        TAG: /* Char_literal */12,
-                        _0: /* '\n' */10,
-                        _1: /* End_of_format */0
-                      }
-                    },
-                    _1: "%Ld\n"
-                  }), nl);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Int64 */7,
+                _0: /* Int_d */0,
+                _1: /* No_padding */0,
+                _2: /* No_precision */0,
+                _3: {
+                  TAG: /* Char_literal */12,
+                  _0: /* '\n' */10,
+                  _1: /* End_of_format */0
+                }
+              },
+              _1: "%Ld\n"
+            }), nl);
   } else {
     return Curry._2(Stdlib__Printf.bprintf(buf, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Int64 */7,
-                      _0: /* Int_d */0,
-                      _1: /* No_padding */0,
-                      _2: /* No_precision */0,
-                      _3: {
-                        TAG: /* Int64 */7,
-                        _0: /* Int_d */0,
-                        _1: {
-                          TAG: /* Lit_padding */0,
-                          _0: /* Zeros */2,
-                          _1: 18
-                        },
-                        _2: /* No_precision */0,
-                        _3: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '\n' */10,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "%Ld%018Ld\n"
-                  }), nh, nl);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Int64 */7,
+                _0: /* Int_d */0,
+                _1: /* No_padding */0,
+                _2: /* No_precision */0,
+                _3: {
+                  TAG: /* Int64 */7,
+                  _0: /* Int_d */0,
+                  _1: {
+                    TAG: /* Lit_padding */0,
+                    _0: /* Zeros */2,
+                    _1: 18
+                  },
+                  _2: /* No_precision */0,
+                  _3: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '\n' */10,
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "%Ld%018Ld\n"
+            }), nh, nl);
   }
 }
 
 function map(f, l) {
   return {
-          LAZY_DONE: false,
-          VAL: (function () {
-              const match = CamlinternalLazy.force(l);
-              return {
-                      TAG: /* Cons */0,
-                      _0: Curry._1(f, match._0),
-                      _1: map(f, match._1)
-                    };
-            })
+    LAZY_DONE: false,
+    VAL: (function () {
+        const match = CamlinternalLazy.force(l);
+        return {
+          TAG: /* Cons */0,
+          _0: Curry._1(f, match._0),
+          _1: map(f, match._1)
         };
+      })
+  };
 }
 
 function merge(cmp, l1, l2) {
   return {
-          LAZY_DONE: false,
-          VAL: (function () {
-              const match = CamlinternalLazy.force(l1);
-              const match$1 = CamlinternalLazy.force(l2);
-              const ll2 = match$1._1;
-              const x2 = match$1._0;
-              const ll1 = match._1;
-              const x1 = match._0;
-              const c = Curry._2(cmp, x1, x2);
-              if (c === 0) {
-                return {
-                        TAG: /* Cons */0,
-                        _0: x1,
-                        _1: merge(cmp, ll1, ll2)
-                      };
-              } else if (c < 0) {
-                return {
-                        TAG: /* Cons */0,
-                        _0: x1,
-                        _1: merge(cmp, ll1, l2)
-                      };
-              } else {
-                return {
-                        TAG: /* Cons */0,
-                        _0: x2,
-                        _1: merge(cmp, l1, ll2)
-                      };
-              }
-            })
-        };
+    LAZY_DONE: false,
+    VAL: (function () {
+        const match = CamlinternalLazy.force(l1);
+        const match$1 = CamlinternalLazy.force(l2);
+        const ll2 = match$1._1;
+        const x2 = match$1._0;
+        const ll1 = match._1;
+        const x1 = match._0;
+        const c = Curry._2(cmp, x1, x2);
+        if (c === 0) {
+          return {
+            TAG: /* Cons */0,
+            _0: x1,
+            _1: merge(cmp, ll1, ll2)
+          };
+        } else if (c < 0) {
+          return {
+            TAG: /* Cons */0,
+            _0: x1,
+            _1: merge(cmp, ll1, l2)
+          };
+        } else {
+          return {
+            TAG: /* Cons */0,
+            _0: x2,
+            _1: merge(cmp, l1, ll2)
+          };
+        }
+      })
+  };
 }
 
 function iter_interval(f, _l, _param) {
@@ -208,10 +208,10 @@ const hamming = {
   LAZY_DONE: false,
   VAL: (function () {
       return {
-              TAG: /* Cons */0,
-              _0: nn1,
-              _1: merge(cmp, ham2, merge(cmp, ham3, ham5))
-            };
+        TAG: /* Cons */0,
+        _0: nn1,
+        _1: merge(cmp, ham2, merge(cmp, ham3, ham5))
+      };
     })
 };
 
@@ -246,10 +246,10 @@ Mt.from_pair_suites("Hamming_test", {
         "output",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: Stdlib__Buffer.contents(buf),
-                    _1: "6726050156250000000000000000000000000\n6729216728661136606575523242669244416\n6730293634611118019721084375000000000\n6731430439413948088320000000000000000\n6733644878411293029785156250000000000\n6736815026358904613608094481682268160\n6739031236724077363200000000000000000\n6743282904874568941599068856042651648\n6744421903677486140423997176256921600\n6746640616477458432000000000000000000\n6750000000000000000000000000000000000\n6750897085400702945836103937453588480\n6752037370304563380023474956271616000\n6754258588364960445000000000000000000\n6755399441055744000000000000000000000\n6757621765136718750000000000000000000\n6758519863481752323552044362431792300\n6759661435938757375539248533340160000\n6761885162088395001166534423828125000\n6763027302973440000000000000000000000\n6765252136392518877983093261718750000\n6767294110289640371843415775641600000\n6768437164792816653010961694720000000\n6770663777894400000000000000000000000\n6774935403077748181101173538816000000\n6776079748261363229431903027200000000\n6778308875544000000000000000000000000\n6782585324034592562287109312160000000\n6783730961356018699387011072000000000\n6785962605658597412109375000000000000\n6789341568946838378906250000000000000\n6791390813820928754681118720000000000\n6794772480000000000000000000000000000\n6799059315411241693033267200000000000\n6800207735332289107722240000000000000\n6802444800000000000000000000000000000\n6806736475893120841673472000000000000\n6807886192552970708582400000000000000\n6810125783203125000000000000000000000\n6814422305043756994967597929687500000\n6815573319906622439424000000000000000\n6817815439391434192657470703125000000\n6821025214188390921278195662703296512\n6821210263296961784362792968750000000\n6823269127183128330240000000000000000\n6828727177473454717179297140960133120\n6830973624183426662400000000000000000\n6834375000000000000000000000000000000\n6835283298968211732659055236671758336\n6836437837433370422273768393225011200\n6838686820719522450562500000000000000\n6839841934068940800000000000000000000\n6842092037200927734375000000000000000\n6844157203887991842733489140006912000\n6845313241232438768082197309030400000\n6847565144260608000000000000000000000\n6849817788097425363957881927490234375\n6851885286668260876491458472837120000\n6853042629352726861173598715904000000\n6855297075118080000000000000000000000\n6859622095616220033364938208051200000\n6860780745114630269799801815040000000\n6863037736488300000000000000000000000\n6866455078125000000000000000000000000\n6867367640585024969315698178562000000\n6868527598372968933129348710400000000\n6870787138229329879760742187500000000\n6871947673600000000000000000000000000\n6874208338558673858642578125000000000\n6876283198993690364114632704000000000\n6879707136000000000000000000000000000\n6884047556853882214196183040000000000\n6885210332023942721568768000000000000\n6887475360000000000000000000000000000\n6891820681841784852194390400000000000\n6892984769959882842439680000000000000\n6895252355493164062500000000000000000\n6899602583856803957404692903808593750\n6900767986405455219916800000000000000\n6903038132383827120065689086914062500\n6906475391588173806667327880859375000\n6908559991272917434368000000000000000\n6912000000000000000000000000000000000\n6914086267191872901144038355222134784\n6916360794485719495680000000000000000\n6917529027641081856000000000000000000\n6919804687500000000000000000000000000\n6921893310401287552552190498140323840\n6924170405978516481194531250000000000\n6925339958244802560000000000000000000\n6927618187665939331054687500000000000\n6929709168936591740767657754256998400\n6930879656747844252683224775393280000\n6933159708563865600000000000000000000\n6937533852751614137447601703747584000\n6938705662219635946938268699852800000\n6940988288557056000000000000000000000\n6945367371811422783781999935651840000\n6946540504428563148172299337728000000\n6948825708194403750000000000000000000\n"
-                  };
+              TAG: /* Eq */0,
+              _0: Stdlib__Buffer.contents(buf),
+              _1: "6726050156250000000000000000000000000\n6729216728661136606575523242669244416\n6730293634611118019721084375000000000\n6731430439413948088320000000000000000\n6733644878411293029785156250000000000\n6736815026358904613608094481682268160\n6739031236724077363200000000000000000\n6743282904874568941599068856042651648\n6744421903677486140423997176256921600\n6746640616477458432000000000000000000\n6750000000000000000000000000000000000\n6750897085400702945836103937453588480\n6752037370304563380023474956271616000\n6754258588364960445000000000000000000\n6755399441055744000000000000000000000\n6757621765136718750000000000000000000\n6758519863481752323552044362431792300\n6759661435938757375539248533340160000\n6761885162088395001166534423828125000\n6763027302973440000000000000000000000\n6765252136392518877983093261718750000\n6767294110289640371843415775641600000\n6768437164792816653010961694720000000\n6770663777894400000000000000000000000\n6774935403077748181101173538816000000\n6776079748261363229431903027200000000\n6778308875544000000000000000000000000\n6782585324034592562287109312160000000\n6783730961356018699387011072000000000\n6785962605658597412109375000000000000\n6789341568946838378906250000000000000\n6791390813820928754681118720000000000\n6794772480000000000000000000000000000\n6799059315411241693033267200000000000\n6800207735332289107722240000000000000\n6802444800000000000000000000000000000\n6806736475893120841673472000000000000\n6807886192552970708582400000000000000\n6810125783203125000000000000000000000\n6814422305043756994967597929687500000\n6815573319906622439424000000000000000\n6817815439391434192657470703125000000\n6821025214188390921278195662703296512\n6821210263296961784362792968750000000\n6823269127183128330240000000000000000\n6828727177473454717179297140960133120\n6830973624183426662400000000000000000\n6834375000000000000000000000000000000\n6835283298968211732659055236671758336\n6836437837433370422273768393225011200\n6838686820719522450562500000000000000\n6839841934068940800000000000000000000\n6842092037200927734375000000000000000\n6844157203887991842733489140006912000\n6845313241232438768082197309030400000\n6847565144260608000000000000000000000\n6849817788097425363957881927490234375\n6851885286668260876491458472837120000\n6853042629352726861173598715904000000\n6855297075118080000000000000000000000\n6859622095616220033364938208051200000\n6860780745114630269799801815040000000\n6863037736488300000000000000000000000\n6866455078125000000000000000000000000\n6867367640585024969315698178562000000\n6868527598372968933129348710400000000\n6870787138229329879760742187500000000\n6871947673600000000000000000000000000\n6874208338558673858642578125000000000\n6876283198993690364114632704000000000\n6879707136000000000000000000000000000\n6884047556853882214196183040000000000\n6885210332023942721568768000000000000\n6887475360000000000000000000000000000\n6891820681841784852194390400000000000\n6892984769959882842439680000000000000\n6895252355493164062500000000000000000\n6899602583856803957404692903808593750\n6900767986405455219916800000000000000\n6903038132383827120065689086914062500\n6906475391588173806667327880859375000\n6908559991272917434368000000000000000\n6912000000000000000000000000000000000\n6914086267191872901144038355222134784\n6916360794485719495680000000000000000\n6917529027641081856000000000000000000\n6919804687500000000000000000000000000\n6921893310401287552552190498140323840\n6924170405978516481194531250000000000\n6925339958244802560000000000000000000\n6927618187665939331054687500000000000\n6929709168936591740767657754256998400\n6930879656747844252683224775393280000\n6933159708563865600000000000000000000\n6937533852751614137447601703747584000\n6938705662219635946938268699852800000\n6940988288557056000000000000000000000\n6945367371811422783781999935651840000\n6946540504428563148172299337728000000\n6948825708194403750000000000000000000\n"
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/hashtbl_test.js b/jscomp/test/dist/jscomp/test/hashtbl_test.js
index d5eba5f96..db3b9c3cb 100644
--- a/jscomp/test/dist/jscomp/test/hashtbl_test.js
+++ b/jscomp/test/dist/jscomp/test/hashtbl_test.js
@@ -11,14 +11,14 @@ const Stdlib__MoreLabels = require("melange/moreLabels.js");
 
 function to_list(tbl) {
   return Stdlib__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) {
@@ -26,8 +26,8 @@ function f(param) {
   Stdlib__Hashtbl.add(tbl, 1, /* '1' */49);
   Stdlib__Hashtbl.add(tbl, 2, /* '2' */50);
   return Stdlib__List.sort((function (param, param$1) {
-                return Caml.caml_int_compare(param[0], param$1[0]);
-              }), to_list(tbl));
+          return Caml.caml_int_compare(param[0], param$1[0]);
+        }), to_list(tbl));
 }
 
 function g(count) {
@@ -40,30 +40,30 @@ function g(count) {
   }
   const v = to_list(tbl);
   return Stdlib__Array.of_list(Stdlib__List.sort((function (param, param$1) {
-                    return Caml.caml_int_compare(param[0], param$1[0]);
-                  }), v));
+              return Caml.caml_int_compare(param[0], param$1[0]);
+            }), v));
 }
 
 const suites_0 = [
   "simple",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: {
-                hd: [
-                  1,
-                  /* '1' */49
-                ],
-                tl: {
-                  hd: [
-                    2,
-                    /* '2' */50
-                  ],
-                  tl: /* [] */0
-                }
-              },
-              _1: f(undefined)
-            };
+        TAG: /* Eq */0,
+        _0: {
+          hd: [
+            1,
+            /* '1' */49
+          ],
+          tl: {
+            hd: [
+              2,
+              /* '2' */50
+            ],
+            tl: /* [] */0
+          }
+        },
+        _1: f(undefined)
+      };
     })
 ];
 
@@ -72,15 +72,15 @@ const suites_1 = {
     "more_iterations",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: Stdlib__Array.init(1001, (function (i) {
-                        return [
-                                (i << 1),
-                                String(i)
-                              ];
-                      })),
-                _1: g(1000)
-              };
+          TAG: /* Eq */0,
+          _0: Stdlib__Array.init(1001, (function (i) {
+                  return [
+                    (i << 1),
+                    String(i)
+                  ];
+                })),
+          _1: g(1000)
+        };
       })
   ],
   tl: {
@@ -90,10 +90,10 @@ const suites_1 = {
           const tbl = Curry._2(Stdlib__MoreLabels.Hashtbl.create, undefined, 30);
           Stdlib__Hashtbl.add(tbl, 3, 3);
           return {
-                  TAG: /* Eq */0,
-                  _0: tbl.size,
-                  _1: 1
-                };
+            TAG: /* Eq */0,
+            _0: tbl.size,
+            _1: 1
+          };
         })
     ],
     tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/ignore_test.js b/jscomp/test/dist/jscomp/test/ignore_test.js
index 19e1ac4d6..343c42594 100644
--- a/jscomp/test/dist/jscomp/test/ignore_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/imm_map_bench.js b/jscomp/test/dist/jscomp/test/imm_map_bench.js
index 6a33b060b..c55c74a4d 100644
--- a/jscomp/test/dist/jscomp/test/imm_map_bench.js
+++ b/jscomp/test/dist/jscomp/test/imm_map_bench.js
@@ -27,9 +27,9 @@ function should(b) {
 
 const shuffledDataAdd = Belt__Belt_Array.makeByAndShuffle(1000001, (function (i) {
         return [
-                i,
-                i
-              ];
+          i,
+          i
+        ];
       }));
 
 function test(param) {
diff --git a/jscomp/test/dist/jscomp/test/incomplete_toplevel_test.js b/jscomp/test/dist/jscomp/test/incomplete_toplevel_test.js
index 1a13fdffd..1422a3396 100644
--- a/jscomp/test/dist/jscomp/test/incomplete_toplevel_test.js
+++ b/jscomp/test/dist/jscomp/test/incomplete_toplevel_test.js
@@ -5,10 +5,10 @@
 function f(param) {
   console.log("no inline");
   return [
-          1,
-          2,
-          3
-        ];
+    1,
+    2,
+    3
+  ];
 }
 
 const match = f(undefined);
diff --git a/jscomp/test/dist/jscomp/test/inline_map2_test.js b/jscomp/test/dist/jscomp/test/inline_map2_test.js
index 6dc34ae71..b3274bdad 100644
--- a/jscomp/test/dist/jscomp/test/inline_map2_test.js
+++ b/jscomp/test/dist/jscomp/test/inline_map2_test.js
@@ -21,23 +21,23 @@ function Make(Ord) {
     const hl = height(l);
     const hr = height(r);
     return {
-            TAG: /* Node */0,
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      _0: l,
+      _1: x,
+      _2: d,
+      _3: r,
+      _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   };
   const singleton = function (x, d) {
     return {
-            TAG: /* Node */0,
-            _0: /* Empty */0,
-            _1: x,
-            _2: d,
-            _3: /* Empty */0,
-            _4: 1
-          };
+      TAG: /* Node */0,
+      _0: /* Empty */0,
+      _1: x,
+      _2: d,
+      _3: /* Empty */0,
+      _4: 1
+    };
   };
   const bal = function (l, x, d, r) {
     let hl;
@@ -47,9 +47,9 @@ function Make(Ord) {
     if (hl > (hr + 2 | 0)) {
       if (/* tag */typeof l === "number" || typeof l === "string") {
         throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                  MEL_EXN_ID: "Invalid_argument",
-                  _1: "Map.bal"
-                });
+              MEL_EXN_ID: "Invalid_argument",
+              _1: "Map.bal"
+            });
       }
       const lr = l._3;
       const ld = l._2;
@@ -62,25 +62,25 @@ function Make(Ord) {
         return create(create(ll, lv, ld, lr._0), lr._1, lr._2, create(lr._3, x, d, r));
       }
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     if (hr <= (hl + 2 | 0)) {
       return {
-              TAG: /* Node */0,
-              _0: l,
-              _1: x,
-              _2: d,
-              _3: r,
-              _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-            };
+        TAG: /* Node */0,
+        _0: l,
+        _1: x,
+        _2: d,
+        _3: r,
+        _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+      };
     }
     if (/* tag */typeof r === "number" || typeof r === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const rr = r._3;
     const rd = r._2;
@@ -93,9 +93,9 @@ function Make(Ord) {
       return create(create(l, x, d, rl._0), rl._1, rl._2, create(rl._3, rv, rd, rr));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   };
   const is_empty = function (param) {
     if (/* tag */typeof param === "number" || typeof param === "string") {
@@ -107,13 +107,13 @@ function Make(Ord) {
   const add = function (x, data, param) {
     if (/* tag */typeof param === "number" || typeof param === "string") {
       return {
-              TAG: /* Node */0,
-              _0: /* Empty */0,
-              _1: x,
-              _2: data,
-              _3: /* Empty */0,
-              _4: 1
-            };
+        TAG: /* Node */0,
+        _0: /* Empty */0,
+        _1: x,
+        _2: data,
+        _3: /* Empty */0,
+        _4: 1
+      };
     }
     const r = param._3;
     const d = param._2;
@@ -122,13 +122,13 @@ function Make(Ord) {
     const c = Curry._2(Ord.compare, x, v);
     if (c === 0) {
       return {
-              TAG: /* Node */0,
-              _0: l,
-              _1: x,
-              _2: data,
-              _3: r,
-              _4: param._4
-            };
+        TAG: /* Node */0,
+        _0: l,
+        _1: x,
+        _2: data,
+        _3: r,
+        _4: param._4
+      };
     } else if (c < 0) {
       return bal(add(x, data, l), v, d, r);
     } else {
@@ -140,8 +140,8 @@ function Make(Ord) {
       const param = _param;
       if (/* tag */typeof param === "number" || typeof param === "string") {
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
       }
       const c = Curry._2(Ord.compare, x, param._1);
       if (c === 0) {
@@ -170,15 +170,15 @@ function Make(Ord) {
       const param = _param;
       if (/* tag */typeof param === "number" || typeof param === "string") {
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
       }
       const l = param._0;
       if (/* tag */typeof l === "number" || typeof l === "string") {
         return [
-                param._1,
-                param._2
-              ];
+          param._1,
+          param._2
+        ];
       }
       _param = l;
       continue ;
@@ -189,15 +189,15 @@ function Make(Ord) {
       const param = _param;
       if (/* tag */typeof param === "number" || typeof param === "string") {
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
       }
       let tmp = param._3;
       if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
         return [
-                param._1,
-                param._2
-              ];
+          param._1,
+          param._2
+        ];
       }
       _param = param._3;
       continue ;
@@ -206,9 +206,9 @@ function Make(Ord) {
   const remove_min_binding = function (param) {
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.remove_min_elt"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.remove_min_elt"
+          });
     }
     const l = param._0;
     if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -261,13 +261,13 @@ function Make(Ord) {
     const d$p = Curry._1(f, param._2);
     const r$p = map(f, param._3);
     return {
-            TAG: /* Node */0,
-            _0: l$p,
-            _1: param._1,
-            _2: d$p,
-            _3: r$p,
-            _4: param._4
-          };
+      TAG: /* Node */0,
+      _0: l$p,
+      _1: param._1,
+      _2: d$p,
+      _3: r$p,
+      _4: param._4
+    };
   };
   const mapi = function (f, param) {
     if (/* tag */typeof param === "number" || typeof param === "string") {
@@ -278,13 +278,13 @@ function Make(Ord) {
     const d$p = Curry._2(f, v, param._2);
     const r$p = mapi(f, param._3);
     return {
-            TAG: /* Node */0,
-            _0: l$p,
-            _1: v,
-            _2: d$p,
-            _3: r$p,
-            _4: param._4
-          };
+      TAG: /* Node */0,
+      _0: l$p,
+      _1: v,
+      _2: d$p,
+      _3: r$p,
+      _4: param._4
+    };
   };
   const fold = function (f, _m, _accu) {
     while(true) {
@@ -381,10 +381,10 @@ function Make(Ord) {
   const split = function (x, param) {
     if (/* tag */typeof param === "number" || typeof param === "string") {
       return [
-              /* Empty */0,
-              undefined,
-              /* Empty */0
-            ];
+        /* Empty */0,
+        undefined,
+        /* Empty */0
+      ];
     }
     const r = param._3;
     const d = param._2;
@@ -393,25 +393,25 @@ function Make(Ord) {
     const 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) {
       const 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)
+      ];
     }
     const 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]
+    ];
   };
   const merge = function (f, s1, s2) {
     if (/* tag */typeof s1 === "number" || typeof s1 === "string") {
@@ -429,13 +429,13 @@ function Make(Ord) {
     }
     if (/* tag */typeof s2 === "number" || typeof s2 === "string") {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/inline_map2_test.ml",
-                  270,
-                  10
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/inline_map2_test.ml",
+              270,
+              10
+            ]
+          });
     }
     const v2 = s2._1;
     const match$1 = split(v2, s1);
@@ -459,9 +459,9 @@ function Make(Ord) {
   const partition = function (p, param) {
     if (/* tag */typeof param === "number" || typeof param === "string") {
       return [
-              /* Empty */0,
-              /* Empty */0
-            ];
+        /* Empty */0,
+        /* Empty */0
+      ];
     }
     const d = param._2;
     const v = param._1;
@@ -474,14 +474,14 @@ function Make(Ord) {
     const 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)
+      ];
     }
   };
   const cons_enum = function (_m, _e) {
@@ -587,42 +587,42 @@ function Make(Ord) {
     return bindings_aux(/* [] */0, s);
   };
   return {
-          height: height,
-          create: create,
-          singleton: singleton,
-          bal: bal,
-          empty: /* Empty */0,
-          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 */0,
+    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(param) {
@@ -637,24 +637,24 @@ function create(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    _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,
-          _0: /* Empty */0,
-          _1: x,
-          _2: d,
-          _3: /* Empty */0,
-          _4: 1
-        };
+    TAG: /* Node */0,
+    _0: /* Empty */0,
+    _1: x,
+    _2: d,
+    _3: /* Empty */0,
+    _4: 1
+  };
 }
 
 function bal(l, x, d, r) {
@@ -665,9 +665,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l._3;
     const ld = l._2;
@@ -680,25 +680,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      _0: l,
+      _1: x,
+      _2: d,
+      _3: r,
+      _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r._3;
   const rd = r._2;
@@ -711,9 +711,9 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function is_empty(param) {
@@ -727,13 +727,13 @@ function is_empty(param) {
 function add(x, data, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return {
-            TAG: /* Node */0,
-            _0: /* Empty */0,
-            _1: x,
-            _2: data,
-            _3: /* Empty */0,
-            _4: 1
-          };
+      TAG: /* Node */0,
+      _0: /* Empty */0,
+      _1: x,
+      _2: data,
+      _3: /* Empty */0,
+      _4: 1
+    };
   }
   const r = param._3;
   const d = param._2;
@@ -742,13 +742,13 @@ function add(x, data, param) {
   const c = Caml.caml_int_compare(x, v);
   if (c === 0) {
     return {
-            TAG: /* Node */0,
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: param._4
-          };
+      TAG: /* Node */0,
+      _0: l,
+      _1: x,
+      _2: data,
+      _3: r,
+      _4: param._4
+    };
   } else if (c < 0) {
     return bal(add(x, data, l), v, d, r);
   } else {
@@ -761,8 +761,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Caml.caml_int_compare(x, param._1);
     if (c === 0) {
@@ -793,15 +793,15 @@ function min_binding(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param._0;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param._1,
-              param._2
-            ];
+        param._1,
+        param._2
+      ];
     }
     _param = l;
     continue ;
@@ -813,15 +813,15 @@ function max_binding(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     let tmp = param._3;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param._1,
-              param._2
-            ];
+        param._1,
+        param._2
+      ];
     }
     _param = param._3;
     continue ;
@@ -831,9 +831,9 @@ function max_binding(_param) {
 function remove_min_binding(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.remove_min_elt"
+        });
   }
   const l = param._0;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -889,13 +889,13 @@ function map(f, param) {
   const d$p = Curry._1(f, param._2);
   const r$p = map(f, param._3);
   return {
-          TAG: /* Node */0,
-          _0: l$p,
-          _1: param._1,
-          _2: d$p,
-          _3: r$p,
-          _4: param._4
-        };
+    TAG: /* Node */0,
+    _0: l$p,
+    _1: param._1,
+    _2: d$p,
+    _3: r$p,
+    _4: param._4
+  };
 }
 
 function mapi(f, param) {
@@ -907,13 +907,13 @@ function mapi(f, param) {
   const d$p = Curry._2(f, v, param._2);
   const r$p = mapi(f, param._3);
   return {
-          TAG: /* Node */0,
-          _0: l$p,
-          _1: v,
-          _2: d$p,
-          _3: r$p,
-          _4: param._4
-        };
+    TAG: /* Node */0,
+    _0: l$p,
+    _1: v,
+    _2: d$p,
+    _3: r$p,
+    _4: param._4
+  };
 }
 
 function fold(f, _m, _accu) {
@@ -1019,10 +1019,10 @@ function concat_or_join(t1, v, d, t2) {
 function split(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            undefined,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      undefined,
+      /* Empty */0
+    ];
   }
   const r = param._3;
   const d = param._2;
@@ -1031,25 +1031,25 @@ function split(x, param) {
   const c = Caml.caml_int_compare(x, v);
   if (c === 0) {
     return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
+      l,
+      Caml_option.some(d),
+      r
+    ];
   }
   if (c < 0) {
     const 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)
+    ];
   }
   const 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) {
@@ -1068,13 +1068,13 @@ function merge(f, s1, s2) {
   }
   if (/* tag */typeof s2 === "number" || typeof s2 === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/inline_map2_test.ml",
-                270,
-                10
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/inline_map2_test.ml",
+            270,
+            10
+          ]
+        });
   }
   const v2 = s2._1;
   const match$1 = split(v2, s1);
@@ -1100,9 +1100,9 @@ function filter(p, param) {
 function partition(p, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      /* Empty */0
+    ];
   }
   const d = param._2;
   const v = param._1;
@@ -1115,14 +1115,14 @@ function partition(p, param) {
   const 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)
+    ];
   }
 }
 
@@ -1312,24 +1312,24 @@ function create$1(l, x, d, r) {
   const hl = height$1(l);
   const hr = height$1(r);
   return {
-          TAG: /* Node */0,
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    _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,
-          _0: /* Empty */0,
-          _1: x,
-          _2: d,
-          _3: /* Empty */0,
-          _4: 1
-        };
+    TAG: /* Node */0,
+    _0: /* Empty */0,
+    _1: x,
+    _2: d,
+    _3: /* Empty */0,
+    _4: 1
+  };
 }
 
 function bal$1(l, x, d, r) {
@@ -1340,9 +1340,9 @@ function bal$1(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l._3;
     const ld = l._2;
@@ -1355,25 +1355,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      _0: l,
+      _1: x,
+      _2: d,
+      _3: r,
+      _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r._3;
   const rd = r._2;
@@ -1386,9 +1386,9 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function is_empty$1(param) {
@@ -1402,13 +1402,13 @@ function is_empty$1(param) {
 function add$1(x, data, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return {
-            TAG: /* Node */0,
-            _0: /* Empty */0,
-            _1: x,
-            _2: data,
-            _3: /* Empty */0,
-            _4: 1
-          };
+      TAG: /* Node */0,
+      _0: /* Empty */0,
+      _1: x,
+      _2: data,
+      _3: /* Empty */0,
+      _4: 1
+    };
   }
   const r = param._3;
   const d = param._2;
@@ -1417,13 +1417,13 @@ function add$1(x, data, param) {
   const c = Caml.caml_string_compare(x, v);
   if (c === 0) {
     return {
-            TAG: /* Node */0,
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: param._4
-          };
+      TAG: /* Node */0,
+      _0: l,
+      _1: x,
+      _2: data,
+      _3: r,
+      _4: param._4
+    };
   } else if (c < 0) {
     return bal$1(add$1(x, data, l), v, d, r);
   } else {
@@ -1436,8 +1436,8 @@ function find$1(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Caml.caml_string_compare(x, param._1);
     if (c === 0) {
@@ -1468,15 +1468,15 @@ function min_binding$1(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param._0;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param._1,
-              param._2
-            ];
+        param._1,
+        param._2
+      ];
     }
     _param = l;
     continue ;
@@ -1488,15 +1488,15 @@ function max_binding$1(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     let tmp = param._3;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param._1,
-              param._2
-            ];
+        param._1,
+        param._2
+      ];
     }
     _param = param._3;
     continue ;
@@ -1506,9 +1506,9 @@ function max_binding$1(_param) {
 function remove_min_binding$1(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.remove_min_elt"
+        });
   }
   const l = param._0;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -1564,13 +1564,13 @@ function map$1(f, param) {
   const d$p = Curry._1(f, param._2);
   const r$p = map$1(f, param._3);
   return {
-          TAG: /* Node */0,
-          _0: l$p,
-          _1: param._1,
-          _2: d$p,
-          _3: r$p,
-          _4: param._4
-        };
+    TAG: /* Node */0,
+    _0: l$p,
+    _1: param._1,
+    _2: d$p,
+    _3: r$p,
+    _4: param._4
+  };
 }
 
 function mapi$1(f, param) {
@@ -1582,13 +1582,13 @@ function mapi$1(f, param) {
   const d$p = Curry._2(f, v, param._2);
   const r$p = mapi$1(f, param._3);
   return {
-          TAG: /* Node */0,
-          _0: l$p,
-          _1: v,
-          _2: d$p,
-          _3: r$p,
-          _4: param._4
-        };
+    TAG: /* Node */0,
+    _0: l$p,
+    _1: v,
+    _2: d$p,
+    _3: r$p,
+    _4: param._4
+  };
 }
 
 function fold$1(f, _m, _accu) {
@@ -1694,10 +1694,10 @@ function concat_or_join$1(t1, v, d, t2) {
 function split$1(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            undefined,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      undefined,
+      /* Empty */0
+    ];
   }
   const r = param._3;
   const d = param._2;
@@ -1706,25 +1706,25 @@ function split$1(x, param) {
   const c = Caml.caml_string_compare(x, v);
   if (c === 0) {
     return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
+      l,
+      Caml_option.some(d),
+      r
+    ];
   }
   if (c < 0) {
     const 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)
+    ];
   }
   const 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) {
@@ -1743,13 +1743,13 @@ function merge$1(f, s1, s2) {
   }
   if (/* tag */typeof s2 === "number" || typeof s2 === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/inline_map2_test.ml",
-                270,
-                10
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/inline_map2_test.ml",
+            270,
+            10
+          ]
+        });
   }
   const v2 = s2._1;
   const match$1 = split$1(v2, s1);
@@ -1775,9 +1775,9 @@ function filter$1(p, param) {
 function partition$1(p, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      /* Empty */0
+    ];
   }
   const d = param._2;
   const v = param._1;
@@ -1790,14 +1790,14 @@ function partition$1(p, param) {
   const 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)
+    ];
   }
 }
 
@@ -1980,10 +1980,10 @@ Mt.from_pair_suites("Inline_map2_test", {
         "assertion1",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: find(10, m),
-                    _1: /* 'a' */97
-                  };
+              TAG: /* Eq */0,
+              _0: find(10, m),
+              _1: /* 'a' */97
+            };
           })
       ],
       tl: {
@@ -1991,10 +1991,10 @@ Mt.from_pair_suites("Inline_map2_test", {
           "assertion2",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: find$1("10", s),
-                      _1: /* 'a' */97
-                    };
+                TAG: /* Eq */0,
+                _0: find$1("10", s),
+                _1: /* 'a' */97
+              };
             })
         ],
         tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/inline_map_test.js b/jscomp/test/dist/jscomp/test/inline_map_test.js
index 8310d456d..3fa74bc22 100644
--- a/jscomp/test/dist/jscomp/test/inline_map_test.js
+++ b/jscomp/test/dist/jscomp/test/inline_map_test.js
@@ -19,13 +19,13 @@ function create(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    _0: l,
+    _1: x,
+    _2: d,
+    _3: r,
+    _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -36,9 +36,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l._3;
     const ld = l._2;
@@ -51,25 +51,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      _0: l,
+      _1: x,
+      _2: d,
+      _3: r,
+      _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r._3;
   const rd = r._2;
@@ -82,21 +82,21 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add(x, data, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return {
-            TAG: /* Node */0,
-            _0: /* Empty */0,
-            _1: x,
-            _2: data,
-            _3: /* Empty */0,
-            _4: 1
-          };
+      TAG: /* Node */0,
+      _0: /* Empty */0,
+      _1: x,
+      _2: data,
+      _3: /* Empty */0,
+      _4: 1
+    };
   }
   const r = param._3;
   const d = param._2;
@@ -105,13 +105,13 @@ function add(x, data, param) {
   const c = Caml.caml_int_compare(x, v);
   if (c === 0) {
     return {
-            TAG: /* Node */0,
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: param._4
-          };
+      TAG: /* Node */0,
+      _0: l,
+      _1: x,
+      _2: data,
+      _3: r,
+      _4: param._4
+    };
   } else if (c < 0) {
     return bal(add(x, data, l), v, d, r);
   } else {
@@ -124,8 +124,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Caml.caml_int_compare(x, param._1);
     if (c === 0) {
@@ -169,10 +169,10 @@ Mt.from_pair_suites("Inline_map_test", {
         "find",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: find(10, m),
-                    _1: /* 'a' */97
-                  };
+              TAG: /* Eq */0,
+              _0: find(10, m),
+              _1: /* 'a' */97
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/inline_record_test.js b/jscomp/test/dist/jscomp/test/inline_record_test.js
index f5130ef0c..dfb37d136 100644
--- a/jscomp/test/dist/jscomp/test/inline_record_test.js
+++ b/jscomp/test/dist/jscomp/test/inline_record_test.js
@@ -38,12 +38,12 @@ const v1 = {
 function f(x) {
   if (x.TAG === /* A0 */0) {
     return Stdlib__List.fold_left((function (prim0, prim1) {
-                  return prim0 + prim1 | 0;
-                }), x.lbl, x.more);
+            return prim0 + prim1 | 0;
+          }), x.lbl, x.more);
   } else {
     return Stdlib__List.fold_left((function (prim0, prim1) {
-                  return prim0 + prim1 | 0;
-                }), 0, x.more);
+            return prim0 + prim1 | 0;
+          }), 0, x.more);
   }
 }
 
@@ -69,13 +69,13 @@ if (A0 === A0) {
   tmp = 3;
 } else {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/inline_record_test.ml",
-              46,
-              54
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/inline_record_test.ml",
+          46,
+          54
+        ]
+      });
 }
 
 eq("File \"jscomp/test/inline_record_test.ml\", line 46, characters 6-13", tmp, 3);
@@ -111,13 +111,13 @@ if (v4.TAG === /* A0 */0) {
   tmp$1 = v4.x;
 } else {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/inline_record_test.ml",
-              64,
-              48
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/inline_record_test.ml",
+          64,
+          48
+        ]
+      });
 }
 
 eq("File \"jscomp/test/inline_record_test.ml\", line 64, characters 6-13", tmp$1, 11);
@@ -126,13 +126,13 @@ let tmp$2;
 
 if (v5.TAG === /* A0 */0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/inline_record_test.ml",
-              66,
-              48
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/inline_record_test.ml",
+          66,
+          48
+        ]
+      });
 }
 
 tmp$2 = v5.z;
@@ -167,13 +167,13 @@ if (v6.MEL_EXN_ID === A4) {
   tmp$3 = v6.x;
 } else {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/inline_record_test.ml",
-              82,
-              49
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/inline_record_test.ml",
+          82,
+          49
+        ]
+      });
 }
 
 eq("File \"jscomp/test/inline_record_test.ml\", line 82, characters 6-13", tmp$3, 11);
@@ -183,10 +183,10 @@ function ff1(x) {
     return /* A1 */0;
   } else {
     return {
-            TAG: /* A0 */0,
-            lbl: x.lbl + 1 | 0,
-            more: x.more
-          };
+      TAG: /* A0 */0,
+      lbl: x.lbl + 1 | 0,
+      more: x.more
+    };
   }
 }
 
diff --git a/jscomp/test/dist/jscomp/test/inline_regression_test.js b/jscomp/test/dist/jscomp/test/inline_regression_test.js
index c30c29aa5..7f339f34d 100644
--- a/jscomp/test/dist/jscomp/test/inline_regression_test.js
+++ b/jscomp/test/dist/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;
-              }), Stdlib__Filename.current_dir_name, param);
+          return Caml_string.get(s, i) === /* '/' */47;
+        }), Stdlib__Filename.current_dir_name, param);
 }
 
 const suites_0 = [
   "basename",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: basename("b/c/a.b"),
-              _1: "a.b"
-            };
+        TAG: /* Eq */0,
+        _0: basename("b/c/a.b"),
+        _1: "a.b"
+      };
     })
 ];
 
diff --git a/jscomp/test/dist/jscomp/test/inner_call.js b/jscomp/test/dist/jscomp/test/inner_call.js
index a33e02846..a005f0af4 100644
--- a/jscomp/test/dist/jscomp/test/inner_call.js
+++ b/jscomp/test/dist/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/dist/jscomp/test/inner_unused.js b/jscomp/test/dist/jscomp/test/inner_unused.js
index 5d60bc9f3..98e77cc08 100644
--- a/jscomp/test/dist/jscomp/test/inner_unused.js
+++ b/jscomp/test/dist/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/dist/jscomp/test/installation_test.js b/jscomp/test/dist/jscomp/test/installation_test.js
index cf9b16018..23ee36c4e 100644
--- a/jscomp/test/dist/jscomp/test/installation_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/int32_test.js b/jscomp/test/dist/jscomp/test/int32_test.js
index 9b5e7aa1e..93063f95c 100644
--- a/jscomp/test/dist/jscomp/test/int32_test.js
+++ b/jscomp/test/dist/jscomp/test/int32_test.js
@@ -12,10 +12,10 @@ const Stdlib__Int32 = require("melange/int32.js");
 
 function f(x) {
   return [
-          x,
-          (x >>> 1),
-          (x >>> 2)
-        ];
+    x,
+    (x >>> 1),
+    (x >>> 2)
+  ];
 }
 
 const shift_right_logical_tests_0 = Stdlib__Array.map((function (x) {
@@ -160,10 +160,10 @@ const suites = {
           "File \"jscomp/test/int32_test.ml\", line 31, characters 2-9",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: 1,
-                      _1: 1
-                    };
+                TAG: /* Eq */0,
+                _0: 1,
+                _1: 1
+              };
             })
         ],
         tl: {
@@ -171,89 +171,89 @@ const suites = {
             "File \"jscomp/test/int32_test.ml\", line 32, characters 2-9",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: -2147483647,
-                        _1: -2147483647
-                      };
+                  TAG: /* Eq */0,
+                  _0: -2147483647,
+                  _1: -2147483647
+                };
               })
           ],
           tl: /* [] */0
         }
       }, Stdlib.$at(Stdlib__Array.to_list(Ext_array_test.map2i((function (i, a, b) {
                       return [
-                              Curry._1(Stdlib__Format.asprintf({
-                                        TAG: /* Format */0,
-                                        _0: {
-                                          TAG: /* String_literal */11,
-                                          _0: "shift_right_logical_cases ",
-                                          _1: {
-                                            TAG: /* Int */4,
-                                            _0: /* Int_d */0,
-                                            _1: /* No_padding */0,
-                                            _2: /* No_precision */0,
-                                            _3: /* End_of_format */0
-                                          }
-                                        },
-                                        _1: "shift_right_logical_cases %d"
-                                      }), i),
-                              (function (param) {
-                                  return {
-                                          TAG: /* Eq */0,
-                                          _0: a,
-                                          _1: b
-                                        };
-                                })
-                            ];
+                        Curry._1(Stdlib__Format.asprintf({
+                                  TAG: /* Format */0,
+                                  _0: {
+                                    TAG: /* String_literal */11,
+                                    _0: "shift_right_logical_cases ",
+                                    _1: {
+                                      TAG: /* Int */4,
+                                      _0: /* Int_d */0,
+                                      _1: /* No_padding */0,
+                                      _2: /* No_precision */0,
+                                      _3: /* End_of_format */0
+                                    }
+                                  },
+                                  _1: "shift_right_logical_cases %d"
+                                }), i),
+                        (function (param) {
+                            return {
+                              TAG: /* Eq */0,
+                              _0: a,
+                              _1: b
+                            };
+                          })
+                      ];
                     }), shift_right_logical_tests_0, shift_right_logical_tests_1)), Stdlib.$at(Stdlib__Array.to_list(Ext_array_test.map2i((function (i, a, b) {
                           return [
-                                  Curry._1(Stdlib__Format.asprintf({
-                                            TAG: /* Format */0,
-                                            _0: {
-                                              TAG: /* String_literal */11,
-                                              _0: "shift_right_cases ",
-                                              _1: {
-                                                TAG: /* Int */4,
-                                                _0: /* Int_d */0,
-                                                _1: /* No_padding */0,
-                                                _2: /* No_precision */0,
-                                                _3: /* End_of_format */0
-                                              }
-                                            },
-                                            _1: "shift_right_cases %d"
-                                          }), i),
-                                  (function (param) {
-                                      return {
-                                              TAG: /* Eq */0,
-                                              _0: a,
-                                              _1: b
-                                            };
-                                    })
-                                ];
+                            Curry._1(Stdlib__Format.asprintf({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* String_literal */11,
+                                        _0: "shift_right_cases ",
+                                        _1: {
+                                          TAG: /* Int */4,
+                                          _0: /* Int_d */0,
+                                          _1: /* No_padding */0,
+                                          _2: /* No_precision */0,
+                                          _3: /* End_of_format */0
+                                        }
+                                      },
+                                      _1: "shift_right_cases %d"
+                                    }), i),
+                            (function (param) {
+                                return {
+                                  TAG: /* Eq */0,
+                                  _0: a,
+                                  _1: b
+                                };
+                              })
+                          ];
                         }), shift_right_tests_0, shift_right_tests_1)), Stdlib__Array.to_list(Ext_array_test.map2i((function (i, a, b) {
                           return [
-                                  Curry._1(Stdlib__Format.asprintf({
-                                            TAG: /* Format */0,
-                                            _0: {
-                                              TAG: /* String_literal */11,
-                                              _0: "shift_left_cases ",
-                                              _1: {
-                                                TAG: /* Int */4,
-                                                _0: /* Int_d */0,
-                                                _1: /* No_padding */0,
-                                                _2: /* No_precision */0,
-                                                _3: /* End_of_format */0
-                                              }
-                                            },
-                                            _1: "shift_left_cases %d"
-                                          }), i),
-                                  (function (param) {
-                                      return {
-                                              TAG: /* Eq */0,
-                                              _0: a,
-                                              _1: b
-                                            };
-                                    })
-                                ];
+                            Curry._1(Stdlib__Format.asprintf({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* String_literal */11,
+                                        _0: "shift_left_cases ",
+                                        _1: {
+                                          TAG: /* Int */4,
+                                          _0: /* Int_d */0,
+                                          _1: /* No_padding */0,
+                                          _2: /* No_precision */0,
+                                          _3: /* End_of_format */0
+                                        }
+                                      },
+                                      _1: "shift_left_cases %d"
+                                    }), i),
+                            (function (param) {
+                                return {
+                                  TAG: /* Eq */0,
+                                  _0: a,
+                                  _1: b
+                                };
+                              })
+                          ];
                         }), shift_left_tests_0, shift_left_tests_1)))))
 };
 
diff --git a/jscomp/test/dist/jscomp/test/int64_mul_div_test.js b/jscomp/test/dist/jscomp/test/int64_mul_div_test.js
index f62096526..cb8c08e9e 100644
--- a/jscomp/test/dist/jscomp/test/int64_mul_div_test.js
+++ b/jscomp/test/dist/jscomp/test/int64_mul_div_test.js
@@ -13,16 +13,16 @@ const Stdlib__Printf = require("melange/printf.js");
 
 function commutative_mul(result, a, b) {
   return {
-          TAG: /* Eq */0,
-          _0: [
-            result,
-            result
-          ],
-          _1: [
-            Caml_int64.mul(a, b),
-            Caml_int64.mul(b, a)
-          ]
-        };
+    TAG: /* Eq */0,
+    _0: [
+      result,
+      result
+    ],
+    _1: [
+      Caml_int64.mul(a, b),
+      Caml_int64.mul(b, a)
+    ]
+  };
 }
 
 const pairs = [
@@ -310,34 +310,34 @@ const pairs = [
 
 function from_pairs(prefix, pairs) {
   return Stdlib__Array.to_list(Stdlib__Array.mapi((function (i, param) {
-                    const b = param[2];
-                    const a = param[1];
-                    const result = param[0];
-                    return [
-                            Curry._2(Stdlib__Printf.sprintf({
-                                      TAG: /* Format */0,
-                                      _0: {
-                                        TAG: /* String */2,
-                                        _0: /* No_padding */0,
-                                        _1: {
-                                          TAG: /* Char_literal */12,
-                                          _0: /* '_' */95,
-                                          _1: {
-                                            TAG: /* Int */4,
-                                            _0: /* Int_d */0,
-                                            _1: /* No_padding */0,
-                                            _2: /* No_precision */0,
-                                            _3: /* End_of_format */0
-                                          }
-                                        }
-                                      },
-                                      _1: "%s_%d"
-                                    }), prefix, i),
-                            (function (param) {
-                                return commutative_mul(result, a, b);
-                              })
-                          ];
-                  }), pairs));
+              const b = param[2];
+              const a = param[1];
+              const result = param[0];
+              return [
+                Curry._2(Stdlib__Printf.sprintf({
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
+                            _1: {
+                              TAG: /* Char_literal */12,
+                              _0: /* '_' */95,
+                              _1: {
+                                TAG: /* Int */4,
+                                _0: /* Int_d */0,
+                                _1: /* No_padding */0,
+                                _2: /* No_precision */0,
+                                _3: /* End_of_format */0
+                              }
+                            }
+                          },
+                          _1: "%s_%d"
+                        }), prefix, i),
+                (function (param) {
+                    return commutative_mul(result, a, b);
+                  })
+              ];
+            }), pairs));
 }
 
 const small_pairs = [
@@ -1531,39 +1531,39 @@ const simple_divs = [
 
 function from(xs) {
   return Stdlib__List.mapi((function (i, param) {
-                const d = param[3];
-                const c = param[2];
-                const b = param[1];
-                const a = param[0];
-                return [
-                        Curry._1(Stdlib__Printf.sprintf({
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* String_literal */11,
-                                    _0: "small_divs ",
-                                    _1: {
-                                      TAG: /* Scan_get_counter */21,
-                                      _0: /* Token_counter */2,
-                                      _1: /* End_of_format */0
-                                    }
-                                  },
-                                  _1: "small_divs %L"
-                                }), i),
-                        (function (param) {
-                            return {
-                                    TAG: /* Eq */0,
-                                    _0: [
-                                      c,
-                                      d
-                                    ],
-                                    _1: [
-                                      Caml_int64.div(a, b),
-                                      Caml_int64.mod_(a, b)
-                                    ]
-                                  };
-                          })
-                      ];
-              }), Stdlib__Array.to_list(xs));
+          const d = param[3];
+          const c = param[2];
+          const b = param[1];
+          const a = param[0];
+          return [
+            Curry._1(Stdlib__Printf.sprintf({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: "small_divs ",
+                        _1: {
+                          TAG: /* Scan_get_counter */21,
+                          _0: /* Token_counter */2,
+                          _1: /* End_of_format */0
+                        }
+                      },
+                      _1: "small_divs %L"
+                    }), i),
+            (function (param) {
+                return {
+                  TAG: /* Eq */0,
+                  _0: [
+                    c,
+                    d
+                  ],
+                  _1: [
+                    Caml_int64.div(a, b),
+                    Caml_int64.mod_(a, b)
+                  ]
+                };
+              })
+          ];
+        }), Stdlib__Array.to_list(xs));
 }
 
 const to_string = [[
@@ -1600,128 +1600,128 @@ const int64_compare_tests = [
 
 function from_compare(xs) {
   return Stdlib__List.mapi((function (i, param) {
-                const c = param[2];
-                const b = param[1];
-                const a = param[0];
-                return [
-                        Curry._1(Stdlib__Printf.sprintf({
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* String_literal */11,
-                                    _0: "int64_compare ",
-                                    _1: {
-                                      TAG: /* Scan_get_counter */21,
-                                      _0: /* Token_counter */2,
-                                      _1: /* End_of_format */0
-                                    }
-                                  },
-                                  _1: "int64_compare %L"
-                                }), i),
-                        (function (param) {
-                            return {
-                                    TAG: /* Eq */0,
-                                    _0: c,
-                                    _1: Caml_int64.compare(a, b)
-                                  };
-                          })
-                      ];
-              }), Stdlib__Array.to_list(xs));
+          const c = param[2];
+          const b = param[1];
+          const a = param[0];
+          return [
+            Curry._1(Stdlib__Printf.sprintf({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: "int64_compare ",
+                        _1: {
+                          TAG: /* Scan_get_counter */21,
+                          _0: /* Token_counter */2,
+                          _1: /* End_of_format */0
+                        }
+                      },
+                      _1: "int64_compare %L"
+                    }), i),
+            (function (param) {
+                return {
+                  TAG: /* Eq */0,
+                  _0: c,
+                  _1: Caml_int64.compare(a, b)
+                };
+              })
+          ];
+        }), Stdlib__Array.to_list(xs));
 }
 
 function from_to_string(xs) {
   return Stdlib__List.mapi((function (i, param) {
-                const str_a = param[1];
-                const a = param[0];
-                return [
-                        Curry._1(Stdlib__Printf.sprintf({
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* String_literal */11,
-                                    _0: "to_string ",
-                                    _1: {
-                                      TAG: /* Scan_get_counter */21,
-                                      _0: /* Token_counter */2,
-                                      _1: /* End_of_format */0
-                                    }
-                                  },
-                                  _1: "to_string %L"
-                                }), i),
-                        (function (param) {
-                            return {
-                                    TAG: /* Eq */0,
-                                    _0: str_a,
-                                    _1: Caml_format.caml_int64_format("%d", a)
-                                  };
-                          })
-                      ];
-              }), Stdlib__Array.to_list(xs));
+          const str_a = param[1];
+          const a = param[0];
+          return [
+            Curry._1(Stdlib__Printf.sprintf({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: "to_string ",
+                        _1: {
+                          TAG: /* Scan_get_counter */21,
+                          _0: /* Token_counter */2,
+                          _1: /* End_of_format */0
+                        }
+                      },
+                      _1: "to_string %L"
+                    }), i),
+            (function (param) {
+                return {
+                  TAG: /* Eq */0,
+                  _0: str_a,
+                  _1: Caml_format.caml_int64_format("%d", a)
+                };
+              })
+          ];
+        }), Stdlib__Array.to_list(xs));
 }
 
 Mt.from_pair_suites("Int64_mul_div_test", Stdlib.$at(from_pairs("random", pairs), Stdlib.$at(from_pairs("small", small_pairs), Stdlib.$at(Stdlib__List.mapi((function (i, param) {
                         const f = param[1];
                         const i64 = param[0];
                         return [
-                                Curry._1(Stdlib__Printf.sprintf({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: "to_float_",
-                                            _1: {
-                                              TAG: /* Int */4,
-                                              _0: /* Int_d */0,
-                                              _1: /* No_padding */0,
-                                              _2: /* No_precision */0,
-                                              _3: /* End_of_format */0
-                                            }
-                                          },
-                                          _1: "to_float_%d"
-                                        }), i),
-                                (function (param) {
-                                    return {
-                                            TAG: /* Eq */0,
-                                            _0: Caml_int64.to_float(i64),
-                                            _1: f
-                                          };
-                                  })
-                              ];
+                          Curry._1(Stdlib__Printf.sprintf({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "to_float_",
+                                      _1: {
+                                        TAG: /* Int */4,
+                                        _0: /* Int_d */0,
+                                        _1: /* No_padding */0,
+                                        _2: /* No_precision */0,
+                                        _3: /* End_of_format */0
+                                      }
+                                    },
+                                    _1: "to_float_%d"
+                                  }), i),
+                          (function (param) {
+                              return {
+                                TAG: /* Eq */0,
+                                _0: Caml_int64.to_float(i64),
+                                _1: f
+                              };
+                            })
+                        ];
                       }), Stdlib__Array.to_list(to_floats)), Stdlib.$at(Stdlib__List.mapi((function (i, param) {
                             const i64 = param[1];
                             const f = param[0];
                             return [
-                                    Curry._1(Stdlib__Printf.sprintf({
-                                              TAG: /* Format */0,
-                                              _0: {
-                                                TAG: /* String_literal */11,
-                                                _0: "of_float_",
-                                                _1: {
-                                                  TAG: /* Int */4,
-                                                  _0: /* Int_d */0,
-                                                  _1: /* No_padding */0,
-                                                  _2: /* No_precision */0,
-                                                  _3: /* End_of_format */0
-                                                }
-                                              },
-                                              _1: "of_float_%d"
-                                            }), i),
-                                    (function (param) {
-                                        return {
-                                                TAG: /* Eq */0,
-                                                _0: Caml_int64.of_float(f),
-                                                _1: i64
-                                              };
-                                      })
-                                  ];
+                              Curry._1(Stdlib__Printf.sprintf({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "of_float_",
+                                          _1: {
+                                            TAG: /* Int */4,
+                                            _0: /* Int_d */0,
+                                            _1: /* No_padding */0,
+                                            _2: /* No_precision */0,
+                                            _3: /* End_of_format */0
+                                          }
+                                        },
+                                        _1: "of_float_%d"
+                                      }), i),
+                              (function (param) {
+                                  return {
+                                    TAG: /* Eq */0,
+                                    _0: Caml_int64.of_float(f),
+                                    _1: i64
+                                  };
+                                })
+                            ];
                           }), Stdlib__Array.to_list(of_float_pairs)), Stdlib.$at({
                           hd: [
                             "compare_check_complete",
                             (function (param) {
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: Stdlib__Array.map((function (param) {
-                                                return true;
-                                              }), check_complete_compare),
-                                        _1: check_complete_compare
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: Stdlib__Array.map((function (param) {
+                                          return true;
+                                        }), check_complete_compare),
+                                  _1: check_complete_compare
+                                };
                               })
                           ],
                           tl: /* [] */0
@@ -1730,10 +1730,10 @@ Mt.from_pair_suites("Int64_mul_div_test", Stdlib.$at(from_pairs("random", pairs)
                                     "div_rem_0",
                                     (function (param) {
                                         return {
-                                                TAG: /* Eq */0,
-                                                _0: Caml_int64.zero,
-                                                _1: Caml_int64.zero
-                                              };
+                                          TAG: /* Eq */0,
+                                          _0: Caml_int64.zero,
+                                          _1: Caml_int64.zero
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -1741,10 +1741,10 @@ Mt.from_pair_suites("Int64_mul_div_test", Stdlib.$at(from_pairs("random", pairs)
                                       "div_rem_1",
                                       (function (param) {
                                           return {
-                                                  TAG: /* Eq */0,
-                                                  _0: Caml_int64.neg_one,
-                                                  _1: Caml_int64.neg_one
-                                                };
+                                            TAG: /* Eq */0,
+                                            _0: Caml_int64.neg_one,
+                                            _1: Caml_int64.neg_one
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -1752,10 +1752,10 @@ Mt.from_pair_suites("Int64_mul_div_test", Stdlib.$at(from_pairs("random", pairs)
                                         "File \"jscomp/test/int64_mul_div_test.ml\", line 214, characters 5-12",
                                         (function (param) {
                                             return {
-                                                    TAG: /* Eq */0,
-                                                    _0: Caml_int64.to_float(Stdlib__Int64.max_int),
-                                                    _1: 9.22337203685477581e+18
-                                                  };
+                                              TAG: /* Eq */0,
+                                              _0: Caml_int64.to_float(Stdlib__Int64.max_int),
+                                              _1: 9.22337203685477581e+18
+                                            };
                                           })
                                       ],
                                       tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/int64_string_test.js b/jscomp/test/dist/jscomp/test/int64_string_test.js
index 12df3d3aa..154b614b7 100644
--- a/jscomp/test/dist/jscomp/test/int64_string_test.js
+++ b/jscomp/test/dist/jscomp/test/int64_string_test.js
@@ -1310,18 +1310,6 @@ Belt__Belt_List.forEach(random_data, (function (u) {
         if (u) {
           if (u.tl) {
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "jscomp/test/int64_string_test.ml",
-                        161,
-                        9
-                      ]
-                    });
-          }
-          const match = u.hd;
-          return eq("File \"jscomp/test/int64_string_test.ml\", line 160, characters 21-28", Caml_format.caml_int64_format("%d", match[0]), match[1]);
-        }
-        throw new Caml_js_exceptions.MelangeError("Assert_failure", {
                   MEL_EXN_ID: "Assert_failure",
                   _1: [
                     "jscomp/test/int64_string_test.ml",
@@ -1329,6 +1317,18 @@ Belt__Belt_List.forEach(random_data, (function (u) {
                     9
                   ]
                 });
+          }
+          const match = u.hd;
+          return eq("File \"jscomp/test/int64_string_test.ml\", line 160, characters 21-28", Caml_format.caml_int64_format("%d", match[0]), match[1]);
+        }
+        throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/int64_string_test.ml",
+                161,
+                9
+              ]
+            });
       }));
 
 eq("File \"jscomp/test/int64_string_test.ml\", line 164, characters 7-14", Caml_format.caml_int64_format("%d", [
diff --git a/jscomp/test/dist/jscomp/test/int64_test.js b/jscomp/test/dist/jscomp/test/int64_test.js
index 6dd430874..47f2bd531 100644
--- a/jscomp/test/dist/jscomp/test/int64_test.js
+++ b/jscomp/test/dist/jscomp/test/int64_test.js
@@ -28,16 +28,16 @@ const a = [
 
 function commutative_add(result, a, b) {
   return {
-          TAG: /* Eq */0,
-          _0: [
-            result,
-            result
-          ],
-          _1: [
-            Caml_int64.add(a, b),
-            Caml_int64.add(b, a)
-          ]
-        };
+    TAG: /* Eq */0,
+    _0: [
+      result,
+      result
+    ],
+    _1: [
+      Caml_int64.add(a, b),
+      Caml_int64.add(b, a)
+    ]
+  };
 }
 
 const generic_compare = Caml_obj.caml_compare;
@@ -861,13 +861,13 @@ const suites = Stdlib.$at({
         "add_one",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: v,
-                    _1: [
-                      0,
-                      2147483648
-                    ]
-                  };
+              TAG: /* Eq */0,
+              _0: v,
+              _1: [
+                0,
+                2147483648
+              ]
+            };
           })
       ],
       tl: {
@@ -875,13 +875,13 @@ const suites = Stdlib.$at({
           "add_2",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: [
-                        0,
-                        4294967294
-                      ],
-                      _1: Caml_int64.add(a, a)
-                    };
+                TAG: /* Eq */0,
+                _0: [
+                  0,
+                  4294967294
+                ],
+                _1: Caml_int64.add(a, a)
+              };
             })
         ],
         tl: {
@@ -889,10 +889,10 @@ const suites = Stdlib.$at({
             "add_3",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: Caml_int64.zero,
-                        _1: Caml_int64.zero
-                      };
+                  TAG: /* Eq */0,
+                  _0: Caml_int64.zero,
+                  _1: Caml_int64.zero
+                };
               })
           ],
           tl: {
@@ -900,12 +900,12 @@ const suites = Stdlib.$at({
               "add_4",
               (function (param) {
                   return commutative_add([
-                              -1,
-                              4294967294
-                            ], [
-                              -1,
-                              4294967293
-                            ], Caml_int64.one);
+                        -1,
+                        4294967294
+                      ], [
+                        -1,
+                        4294967293
+                      ], Caml_int64.one);
                 })
             ],
             tl: {
@@ -913,12 +913,12 @@ const suites = Stdlib.$at({
                 "add_5",
                 (function (param) {
                     return commutative_add([
-                                -1,
-                                4294967293
-                              ], [
-                                -1,
-                                4294967293
-                              ], Caml_int64.zero);
+                          -1,
+                          4294967293
+                        ], [
+                          -1,
+                          4294967293
+                        ], Caml_int64.zero);
                   })
               ],
               tl: {
@@ -926,15 +926,15 @@ const suites = Stdlib.$at({
                   "add_6",
                   (function (param) {
                       return commutative_add([
-                                  0,
-                                  4
-                                ], [
-                                  -1,
-                                  4294967293
-                                ], [
-                                  0,
-                                  7
-                                ]);
+                            0,
+                            4
+                          ], [
+                            -1,
+                            4294967293
+                          ], [
+                            0,
+                            7
+                          ]);
                     })
                 ],
                 tl: {
@@ -942,15 +942,15 @@ const suites = Stdlib.$at({
                     "add_7",
                     (function (param) {
                         return commutative_add([
-                                    1,
-                                    0
-                                  ], [
-                                    0,
-                                    2147483648
-                                  ], [
-                                    0,
-                                    2147483648
-                                  ]);
+                              1,
+                              0
+                            ], [
+                              0,
+                              2147483648
+                            ], [
+                              0,
+                              2147483648
+                            ]);
                       })
                   ],
                   tl: {
@@ -958,12 +958,12 @@ const suites = Stdlib.$at({
                       "add_8",
                       (function (param) {
                           return commutative_add([
-                                      1,
-                                      0
-                                    ], [
-                                      0,
-                                      4294967295
-                                    ], Caml_int64.one);
+                                1,
+                                0
+                              ], [
+                                0,
+                                4294967295
+                              ], Caml_int64.one);
                         })
                     ],
                     tl: {
@@ -971,15 +971,15 @@ const suites = Stdlib.$at({
                         "add_9",
                         (function (param) {
                             return commutative_add([
-                                        0,
-                                        4294967295
-                                      ], [
-                                        0,
-                                        2147483648
-                                      ], [
-                                        0,
-                                        2147483647
-                                      ]);
+                                  0,
+                                  4294967295
+                                ], [
+                                  0,
+                                  2147483648
+                                ], [
+                                  0,
+                                  2147483647
+                                ]);
                           })
                       ],
                       tl: {
@@ -987,12 +987,12 @@ const suites = Stdlib.$at({
                           "add_10",
                           (function (param) {
                               return commutative_add([
-                                          0,
-                                          2147483648
-                                        ], [
-                                          0,
-                                          2147483648
-                                        ], Caml_int64.zero);
+                                    0,
+                                    2147483648
+                                  ], [
+                                    0,
+                                    2147483648
+                                  ], Caml_int64.zero);
                             })
                         ],
                         tl: {
@@ -1000,12 +1000,12 @@ const suites = Stdlib.$at({
                             "add_11",
                             (function (param) {
                                 return commutative_add([
-                                            0,
-                                            4294967295
-                                          ], [
-                                            0,
-                                            4294967295
-                                          ], Caml_int64.zero);
+                                      0,
+                                      4294967295
+                                    ], [
+                                      0,
+                                      4294967295
+                                    ], Caml_int64.zero);
                               })
                           ],
                           tl: {
@@ -1013,13 +1013,13 @@ const suites = Stdlib.$at({
                               "to_int32",
                               (function (param) {
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: 3,
-                                          _1: Caml_int64.to_int32([
-                                                0,
-                                                3
-                                              ])
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: 3,
+                                    _1: Caml_int64.to_int32([
+                                          0,
+                                          3
+                                        ])
+                                  };
                                 })
                             ],
                             tl: {
@@ -1027,13 +1027,13 @@ const suites = Stdlib.$at({
                                 "to_int",
                                 (function (param) {
                                     return {
-                                            TAG: /* Eq */0,
-                                            _0: 3,
-                                            _1: Caml_int64.to_int32([
-                                                  0,
-                                                  3
-                                                ])
-                                          };
+                                      TAG: /* Eq */0,
+                                      _0: 3,
+                                      _1: Caml_int64.to_int32([
+                                            0,
+                                            3
+                                          ])
+                                    };
                                   })
                               ],
                               tl: {
@@ -1041,16 +1041,16 @@ const suites = Stdlib.$at({
                                   "of_int",
                                   (function (param) {
                                       return {
-                                              TAG: /* Eq */0,
-                                              _0: [
-                                                0,
-                                                3
-                                              ],
-                                              _1: [
-                                                0,
-                                                3
-                                              ]
-                                            };
+                                        TAG: /* Eq */0,
+                                        _0: [
+                                          0,
+                                          3
+                                        ],
+                                        _1: [
+                                          0,
+                                          3
+                                        ]
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -1058,16 +1058,16 @@ const suites = Stdlib.$at({
                                     "lognot",
                                     (function (param) {
                                         return {
-                                                TAG: /* Eq */0,
-                                                _0: [
-                                                  -1,
-                                                  4294967293
-                                                ],
-                                                _1: [
-                                                  -1,
-                                                  4294967293
-                                                ]
-                                              };
+                                          TAG: /* Eq */0,
+                                          _0: [
+                                            -1,
+                                            4294967293
+                                          ],
+                                          _1: [
+                                            -1,
+                                            4294967293
+                                          ]
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -1075,16 +1075,16 @@ const suites = Stdlib.$at({
                                       "neg",
                                       (function (param) {
                                           return {
-                                                  TAG: /* Eq */0,
-                                                  _0: [
-                                                    -1,
-                                                    4294967294
-                                                  ],
-                                                  _1: [
-                                                    -1,
-                                                    4294967294
-                                                  ]
-                                                };
+                                            TAG: /* Eq */0,
+                                            _0: [
+                                              -1,
+                                              4294967294
+                                            ],
+                                            _1: [
+                                              -1,
+                                              4294967294
+                                            ]
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -1092,10 +1092,10 @@ const suites = Stdlib.$at({
                                         "File \"jscomp/test/int64_test.ml\", line 80, characters 4-11",
                                         (function (param) {
                                             return {
-                                                    TAG: /* Eq */0,
-                                                    _0: Stdlib__Int64.min_int,
-                                                    _1: Caml_int64.neg(Stdlib__Int64.min_int)
-                                                  };
+                                              TAG: /* Eq */0,
+                                              _0: Stdlib__Int64.min_int,
+                                              _1: Caml_int64.neg(Stdlib__Int64.min_int)
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -1103,10 +1103,10 @@ const suites = Stdlib.$at({
                                           "File \"jscomp/test/int64_test.ml\", line 81, characters 4-11",
                                           (function (param) {
                                               return {
-                                                      TAG: /* Eq */0,
-                                                      _0: Stdlib__Int64.max_int,
-                                                      _1: Caml_int64.neg(Caml_int64.add(Stdlib__Int64.min_int, Caml_int64.one))
-                                                    };
+                                                TAG: /* Eq */0,
+                                                _0: Stdlib__Int64.max_int,
+                                                _1: Caml_int64.neg(Caml_int64.add(Stdlib__Int64.min_int, Caml_int64.one))
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -1114,16 +1114,16 @@ const suites = Stdlib.$at({
                                             "sub1",
                                             (function (param) {
                                                 return {
-                                                        TAG: /* Eq */0,
-                                                        _0: [
-                                                          0,
-                                                          2
-                                                        ],
-                                                        _1: [
-                                                          0,
-                                                          2
-                                                        ]
-                                                      };
+                                                  TAG: /* Eq */0,
+                                                  _0: [
+                                                    0,
+                                                    2
+                                                  ],
+                                                  _1: [
+                                                    0,
+                                                    2
+                                                  ]
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -1131,28 +1131,28 @@ const suites = Stdlib.$at({
                                               "xor1",
                                               (function (param) {
                                                   return {
-                                                          TAG: /* Eq */0,
-                                                          _0: [
-                                                            [
-                                                              0,
-                                                              286331153
-                                                            ],
-                                                            Caml_int64.xor(a, [
-                                                                  0,
-                                                                  4009750271
-                                                                ])
-                                                          ],
-                                                          _1: [
-                                                            [
-                                                              0,
-                                                              286331153
-                                                            ],
-                                                            [
-                                                              0,
-                                                              2432700672
-                                                            ]
-                                                          ]
-                                                        };
+                                                    TAG: /* Eq */0,
+                                                    _0: [
+                                                      [
+                                                        0,
+                                                        286331153
+                                                      ],
+                                                      Caml_int64.xor(a, [
+                                                            0,
+                                                            4009750271
+                                                          ])
+                                                    ],
+                                                    _1: [
+                                                      [
+                                                        0,
+                                                        286331153
+                                                      ],
+                                                      [
+                                                        0,
+                                                        2432700672
+                                                      ]
+                                                    ]
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -1160,16 +1160,16 @@ const suites = Stdlib.$at({
                                                 "or",
                                                 (function (param) {
                                                     return {
-                                                            TAG: /* Eq */0,
-                                                            _0: [
-                                                              0,
-                                                              4294967295
-                                                            ],
-                                                            _1: [
-                                                              0,
-                                                              4294967295
-                                                            ]
-                                                          };
+                                                      TAG: /* Eq */0,
+                                                      _0: [
+                                                        0,
+                                                        4294967295
+                                                      ],
+                                                      _1: [
+                                                        0,
+                                                        4294967295
+                                                      ]
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -1177,16 +1177,16 @@ const suites = Stdlib.$at({
                                                   "and",
                                                   (function (param) {
                                                       return {
-                                                              TAG: /* Eq */0,
-                                                              _0: [
-                                                                0,
-                                                                4008636142
-                                                              ],
-                                                              _1: [
-                                                                0,
-                                                                4008636142
-                                                              ]
-                                                            };
+                                                        TAG: /* Eq */0,
+                                                        _0: [
+                                                          0,
+                                                          4008636142
+                                                        ],
+                                                        _1: [
+                                                          0,
+                                                          4008636142
+                                                        ]
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -1194,528 +1194,528 @@ const suites = Stdlib.$at({
                                                     "lsl",
                                                     (function (param) {
                                                         return {
-                                                                TAG: /* Eq */0,
-                                                                _0: Stdlib__Array.map((function (x) {
-                                                                        return Caml_int64.lsl_(Caml_int64.one, x);
-                                                                      }), Stdlib__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,
-                                                                  _0: Stdlib__Array.map((function (x) {
-                                                                          return Caml_int64.lsr_(Caml_int64.neg_one, x);
-                                                                        }), Stdlib__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,
+                                                          _0: Stdlib__Array.map((function (x) {
+                                                                  return Caml_int64.lsl_(Caml_int64.one, x);
+                                                                }), Stdlib__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,
+                                                            _0: Stdlib__Array.map((function (x) {
+                                                                    return Caml_int64.lsr_(Caml_int64.neg_one, x);
+                                                                  }), Stdlib__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: {
@@ -1723,79 +1723,79 @@ const suites = Stdlib.$at({
                                                         "asr",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: /* Eq */0,
-                                                                    _0: Stdlib__Array.map((function (x) {
-                                                                            return Caml_int64.asr_(Caml_int64.neg_one, x);
-                                                                          }), Stdlib__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,
+                                                              _0: Stdlib__Array.map((function (x) {
+                                                                      return Caml_int64.asr_(Caml_int64.neg_one, x);
+                                                                    }), Stdlib__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: {
@@ -1803,16 +1803,16 @@ const suites = Stdlib.$at({
                                                           "mul simple",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: /* Eq */0,
-                                                                      _0: [
-                                                                        0,
-                                                                        6
-                                                                      ],
-                                                                      _1: [
-                                                                        0,
-                                                                        6
-                                                                      ]
-                                                                    };
+                                                                TAG: /* Eq */0,
+                                                                _0: [
+                                                                  0,
+                                                                  6
+                                                                ],
+                                                                _1: [
+                                                                  0,
+                                                                  6
+                                                                ]
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -1820,19 +1820,19 @@ const suites = Stdlib.$at({
                                                             "of_int32",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: /* Eq */0,
-                                                                        _0: Stdlib__Array.map(Caml_int64.of_int32, [
-                                                                              0,
-                                                                              -2147483648
-                                                                            ]),
-                                                                        _1: [
-                                                                          Caml_int64.zero,
-                                                                          [
-                                                                            -1,
-                                                                            2147483648
-                                                                          ]
-                                                                        ]
-                                                                      };
+                                                                  TAG: /* Eq */0,
+                                                                  _0: Stdlib__Array.map(Caml_int64.of_int32, [
+                                                                        0,
+                                                                        -2147483648
+                                                                      ]),
+                                                                  _1: [
+                                                                    Caml_int64.zero,
+                                                                    [
+                                                                      -1,
+                                                                      2147483648
+                                                                    ]
+                                                                  ]
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -1840,16 +1840,16 @@ const suites = Stdlib.$at({
                                                               "of_int32_singleton",
                                                               (function (param) {
                                                                   return {
-                                                                          TAG: /* Eq */0,
-                                                                          _0: [
-                                                                            -1,
-                                                                            4294967293
-                                                                          ],
-                                                                          _1: [
-                                                                            -1,
-                                                                            4294967293
-                                                                          ]
-                                                                        };
+                                                                    TAG: /* Eq */0,
+                                                                    _0: [
+                                                                      -1,
+                                                                      4294967293
+                                                                    ],
+                                                                    _1: [
+                                                                      -1,
+                                                                      4294967293
+                                                                    ]
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -1857,16 +1857,16 @@ const suites = Stdlib.$at({
                                                                 "File \"jscomp/test/int64_test.ml\", line 134, characters 4-11",
                                                                 (function (param) {
                                                                     return {
-                                                                            TAG: /* Eq */0,
-                                                                            _0: [
-                                                                              0,
-                                                                              3
-                                                                            ],
-                                                                            _1: [
-                                                                              0,
-                                                                              3
-                                                                            ]
-                                                                          };
+                                                                      TAG: /* Eq */0,
+                                                                      _0: [
+                                                                        0,
+                                                                        3
+                                                                      ],
+                                                                      _1: [
+                                                                        0,
+                                                                        3
+                                                                      ]
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -1874,19 +1874,19 @@ const suites = Stdlib.$at({
                                                                   "to_int32",
                                                                   (function (param) {
                                                                       return {
-                                                                              TAG: /* Eq */0,
-                                                                              _0: Stdlib__Array.map(Caml_int64.to_int32, [
-                                                                                    Caml_int64.zero,
-                                                                                    [
-                                                                                      0,
-                                                                                      2147483648
-                                                                                    ]
-                                                                                  ]),
-                                                                              _1: [
+                                                                        TAG: /* Eq */0,
+                                                                        _0: Stdlib__Array.map(Caml_int64.to_int32, [
+                                                                              Caml_int64.zero,
+                                                                              [
                                                                                 0,
-                                                                                -2147483648
+                                                                                2147483648
                                                                               ]
-                                                                            };
+                                                                            ]),
+                                                                        _1: [
+                                                                          0,
+                                                                          -2147483648
+                                                                        ]
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -1894,10 +1894,10 @@ const suites = Stdlib.$at({
                                                                     "discard_sign",
                                                                     (function (param) {
                                                                         return {
-                                                                                TAG: /* Eq */0,
-                                                                                _0: Caml_int64.discard_sign(Caml_int64.neg_one),
-                                                                                _1: Caml_int64.max_int
-                                                                              };
+                                                                          TAG: /* Eq */0,
+                                                                          _0: Caml_int64.discard_sign(Caml_int64.neg_one),
+                                                                          _1: Caml_int64.max_int
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -1905,22 +1905,22 @@ const suites = Stdlib.$at({
                                                                       "div_mod",
                                                                       (function (param) {
                                                                           return {
-                                                                                  TAG: /* Eq */0,
-                                                                                  _0: Caml_int64.div_mod([
-                                                                                        0,
-                                                                                        7
-                                                                                      ], [
-                                                                                        0,
-                                                                                        3
-                                                                                      ]),
-                                                                                  _1: [
-                                                                                    [
-                                                                                      0,
-                                                                                      2
-                                                                                    ],
-                                                                                    Caml_int64.one
-                                                                                  ]
-                                                                                };
+                                                                            TAG: /* Eq */0,
+                                                                            _0: Caml_int64.div_mod([
+                                                                                  0,
+                                                                                  7
+                                                                                ], [
+                                                                                  0,
+                                                                                  3
+                                                                                ]),
+                                                                            _1: [
+                                                                              [
+                                                                                0,
+                                                                                2
+                                                                              ],
+                                                                              Caml_int64.one
+                                                                            ]
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -1928,10 +1928,10 @@ const suites = Stdlib.$at({
                                                                         "to_hex",
                                                                         (function (param) {
                                                                             return {
-                                                                                    TAG: /* Eq */0,
-                                                                                    _0: Caml_int64.to_hex(Caml_int64.neg_one),
-                                                                                    _1: "ffffffffffffffff"
-                                                                                  };
+                                                                              TAG: /* Eq */0,
+                                                                              _0: Caml_int64.to_hex(Caml_int64.neg_one),
+                                                                              _1: "ffffffffffffffff"
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -1939,13 +1939,13 @@ const suites = Stdlib.$at({
                                                                           "generic_compare",
                                                                           (function (param) {
                                                                               return {
-                                                                                      TAG: /* Eq */0,
-                                                                                      _0: Caml_obj.caml_compare([
-                                                                                            1,
-                                                                                            0
-                                                                                          ], Caml_int64.one) > 0,
-                                                                                      _1: true
-                                                                                    };
+                                                                                TAG: /* Eq */0,
+                                                                                _0: Caml_obj.caml_compare([
+                                                                                      1,
+                                                                                      0
+                                                                                    ], Caml_int64.one) > 0,
+                                                                                _1: true
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -1953,16 +1953,16 @@ const suites = Stdlib.$at({
                                                                             "test_compier_literal",
                                                                             (function (param) {
                                                                                 return {
-                                                                                        TAG: /* Eq */0,
-                                                                                        _0: [
-                                                                                          0,
-                                                                                          4294967295
-                                                                                        ],
-                                                                                        _1: [
-                                                                                          0,
-                                                                                          4294967295
-                                                                                        ]
-                                                                                      };
+                                                                                  TAG: /* Eq */0,
+                                                                                  _0: [
+                                                                                    0,
+                                                                                    4294967295
+                                                                                  ],
+                                                                                  _1: [
+                                                                                    0,
+                                                                                    4294967295
+                                                                                  ]
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -1970,13 +1970,13 @@ const suites = Stdlib.$at({
                                                                               "generic_compare2",
                                                                               (function (param) {
                                                                                   return {
-                                                                                          TAG: /* Eq */0,
-                                                                                          _0: Caml_obj.caml_compare([
-                                                                                                0,
-                                                                                                2147483648
-                                                                                              ], Caml_int64.one) > 0,
-                                                                                          _1: true
-                                                                                        };
+                                                                                    TAG: /* Eq */0,
+                                                                                    _0: Caml_obj.caml_compare([
+                                                                                          0,
+                                                                                          2147483648
+                                                                                        ], Caml_int64.one) > 0,
+                                                                                    _1: true
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -1984,16 +1984,16 @@ const suites = Stdlib.$at({
                                                                                 "shift_left",
                                                                                 (function (param) {
                                                                                     return {
-                                                                                            TAG: /* Eq */0,
-                                                                                            _0: [
-                                                                                              0,
-                                                                                              4294967040
-                                                                                            ],
-                                                                                            _1: [
-                                                                                              0,
-                                                                                              4294967040
-                                                                                            ]
-                                                                                          };
+                                                                                      TAG: /* Eq */0,
+                                                                                      _0: [
+                                                                                        0,
+                                                                                        4294967040
+                                                                                      ],
+                                                                                      _1: [
+                                                                                        0,
+                                                                                        4294967040
+                                                                                      ]
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -2001,16 +2001,16 @@ const suites = Stdlib.$at({
                                                                                   "fib_int64",
                                                                                   (function (param) {
                                                                                       return {
-                                                                                              TAG: /* Eq */0,
-                                                                                              _0: fib(1000, Caml_int64.one, [
-                                                                                                    0,
-                                                                                                    2
-                                                                                                  ]),
-                                                                                              _1: [
-                                                                                                -1990564327,
-                                                                                                2874523960
-                                                                                              ]
-                                                                                            };
+                                                                                        TAG: /* Eq */0,
+                                                                                        _0: fib(1000, Caml_int64.one, [
+                                                                                              0,
+                                                                                              2
+                                                                                            ]),
+                                                                                        _1: [
+                                                                                          -1990564327,
+                                                                                          2874523960
+                                                                                        ]
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -2018,13 +2018,13 @@ const suites = Stdlib.$at({
                                                                                     "fac_int64",
                                                                                     (function (param) {
                                                                                         return {
-                                                                                                TAG: /* Eq */0,
-                                                                                                _0: fac(30, Caml_int64.one),
-                                                                                                _1: [
-                                                                                                  -2040662563,
-                                                                                                  1409286144
-                                                                                                ]
-                                                                                              };
+                                                                                          TAG: /* Eq */0,
+                                                                                          _0: fac(30, Caml_int64.one),
+                                                                                          _1: [
+                                                                                            -2040662563,
+                                                                                            1409286144
+                                                                                          ]
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -2032,13 +2032,13 @@ const suites = Stdlib.$at({
                                                                                       "File \"jscomp/test/int64_test.ml\", line 163, characters 6-13",
                                                                                       (function (param) {
                                                                                           return {
-                                                                                                  TAG: /* Eq */0,
-                                                                                                  _0: Caml_int64.add(Stdlib__Int64.max_int, Stdlib__Int64.max_int),
-                                                                                                  _1: [
-                                                                                                    -1,
-                                                                                                    4294967294
-                                                                                                  ]
-                                                                                                };
+                                                                                            TAG: /* Eq */0,
+                                                                                            _0: Caml_int64.add(Stdlib__Int64.max_int, Stdlib__Int64.max_int),
+                                                                                            _1: [
+                                                                                              -1,
+                                                                                              4294967294
+                                                                                            ]
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: {
@@ -2046,10 +2046,10 @@ const suites = Stdlib.$at({
                                                                                         "File \"jscomp/test/int64_test.ml\", line 166, characters 6-13",
                                                                                         (function (param) {
                                                                                             return {
-                                                                                                    TAG: /* Eq */0,
-                                                                                                    _0: Caml_int64.add(Stdlib__Int64.min_int, Stdlib__Int64.min_int),
-                                                                                                    _1: Caml_int64.zero
-                                                                                                  };
+                                                                                              TAG: /* Eq */0,
+                                                                                              _0: Caml_int64.add(Stdlib__Int64.min_int, Stdlib__Int64.min_int),
+                                                                                              _1: Caml_int64.zero
+                                                                                            };
                                                                                           })
                                                                                       ],
                                                                                       tl: {
@@ -2057,10 +2057,10 @@ const suites = Stdlib.$at({
                                                                                           "File \"jscomp/test/int64_test.ml\", line 170, characters 6-13",
                                                                                           (function (param) {
                                                                                               return {
-                                                                                                      TAG: /* Eq */0,
-                                                                                                      _0: Caml_int64.neg_one,
-                                                                                                      _1: Caml_int64.neg_one
-                                                                                                    };
+                                                                                                TAG: /* Eq */0,
+                                                                                                _0: Caml_int64.neg_one,
+                                                                                                _1: Caml_int64.neg_one
+                                                                                              };
                                                                                             })
                                                                                         ],
                                                                                         tl: /* [] */0
@@ -2107,79 +2107,79 @@ const suites = Stdlib.$at({
       }
     }, Stdlib.$at(Stdlib__Array.to_list(Ext_array_test.map2i((function (i, a, b) {
                     return [
-                            Curry._1(Stdlib__Format.asprintf({
-                                      TAG: /* Format */0,
-                                      _0: {
-                                        TAG: /* String_literal */11,
-                                        _0: "shift_left_cases ",
-                                        _1: {
-                                          TAG: /* Int */4,
-                                          _0: /* Int_d */0,
-                                          _1: /* No_padding */0,
-                                          _2: /* No_precision */0,
-                                          _3: /* End_of_format */0
-                                        }
-                                      },
-                                      _1: "shift_left_cases %d"
-                                    }), i),
-                            (function (param) {
-                                return {
-                                        TAG: /* Eq */0,
-                                        _0: a,
-                                        _1: b
-                                      };
-                              })
-                          ];
+                      Curry._1(Stdlib__Format.asprintf({
+                                TAG: /* Format */0,
+                                _0: {
+                                  TAG: /* String_literal */11,
+                                  _0: "shift_left_cases ",
+                                  _1: {
+                                    TAG: /* Int */4,
+                                    _0: /* Int_d */0,
+                                    _1: /* No_padding */0,
+                                    _2: /* No_precision */0,
+                                    _3: /* End_of_format */0
+                                  }
+                                },
+                                _1: "shift_left_cases %d"
+                              }), i),
+                      (function (param) {
+                          return {
+                            TAG: /* Eq */0,
+                            _0: a,
+                            _1: b
+                          };
+                        })
+                    ];
                   }), shift_left_tests_0, shift_left_tests_1)), Stdlib.$at(Stdlib__Array.to_list(Ext_array_test.map2i((function (i, a, b) {
                         return [
-                                Curry._1(Stdlib__Format.asprintf({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: "shift_right_cases ",
-                                            _1: {
-                                              TAG: /* Int */4,
-                                              _0: /* Int_d */0,
-                                              _1: /* No_padding */0,
-                                              _2: /* No_precision */0,
-                                              _3: /* End_of_format */0
-                                            }
-                                          },
-                                          _1: "shift_right_cases %d"
-                                        }), i),
-                                (function (param) {
-                                    return {
-                                            TAG: /* Eq */0,
-                                            _0: a,
-                                            _1: b
-                                          };
-                                  })
-                              ];
+                          Curry._1(Stdlib__Format.asprintf({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "shift_right_cases ",
+                                      _1: {
+                                        TAG: /* Int */4,
+                                        _0: /* Int_d */0,
+                                        _1: /* No_padding */0,
+                                        _2: /* No_precision */0,
+                                        _3: /* End_of_format */0
+                                      }
+                                    },
+                                    _1: "shift_right_cases %d"
+                                  }), i),
+                          (function (param) {
+                              return {
+                                TAG: /* Eq */0,
+                                _0: a,
+                                _1: b
+                              };
+                            })
+                        ];
                       }), shift_right_tests_0, shift_right_tests_1)), Stdlib__Array.to_list(Ext_array_test.map2i((function (i, a, b) {
                         return [
-                                Curry._1(Stdlib__Format.asprintf({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: "shift_right_logical_cases ",
-                                            _1: {
-                                              TAG: /* Int */4,
-                                              _0: /* Int_d */0,
-                                              _1: /* No_padding */0,
-                                              _2: /* No_precision */0,
-                                              _3: /* End_of_format */0
-                                            }
-                                          },
-                                          _1: "shift_right_logical_cases %d"
-                                        }), i),
-                                (function (param) {
-                                    return {
-                                            TAG: /* Eq */0,
-                                            _0: a,
-                                            _1: b
-                                          };
-                                  })
-                              ];
+                          Curry._1(Stdlib__Format.asprintf({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "shift_right_logical_cases ",
+                                      _1: {
+                                        TAG: /* Int */4,
+                                        _0: /* Int_d */0,
+                                        _1: /* No_padding */0,
+                                        _2: /* No_precision */0,
+                                        _3: /* End_of_format */0
+                                      }
+                                    },
+                                    _1: "shift_right_logical_cases %d"
+                                  }), i),
+                          (function (param) {
+                              return {
+                                TAG: /* Eq */0,
+                                _0: a,
+                                _1: b
+                              };
+                            })
+                        ];
                       }), shift_right_logical_suites_0, shift_right_logical_suites_1)))));
 
 const suites$1 = {
diff --git a/jscomp/test/dist/jscomp/test/int_hashtbl_test.js b/jscomp/test/dist/jscomp/test/int_hashtbl_test.js
index 544be52e8..5bed092fd 100644
--- a/jscomp/test/dist/jscomp/test/int_hashtbl_test.js
+++ b/jscomp/test/dist/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 Stdlib__List.sort((function (param, param$1) {
-                return Caml.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.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) {
   }
   const v = Curry._3(H.fold, (function (k, v, acc) {
           return {
-                  hd: [
-                    k,
-                    v
-                  ],
-                  tl: acc
-                };
+            hd: [
+              k,
+              v
+            ],
+            tl: acc
+          };
         }), tbl, /* [] */0);
   return Stdlib__Array.of_list(Stdlib__List.sort((function (param, param$1) {
-                    return Caml.caml_int_compare(param[0], param$1[0]);
-                  }), v));
+              return Caml.caml_int_compare(param[0], param$1[0]);
+            }), v));
 }
 
 const hash = Stdlib__Hashtbl.hash;
@@ -62,22 +62,22 @@ const suites_0 = [
   "simple",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: {
-                hd: [
-                  1,
-                  /* '1' */49
-                ],
-                tl: {
-                  hd: [
-                    2,
-                    /* '2' */50
-                  ],
-                  tl: /* [] */0
-                }
-              },
-              _1: f(Int_hash)
-            };
+        TAG: /* Eq */0,
+        _0: {
+          hd: [
+            1,
+            /* '1' */49
+          ],
+          tl: {
+            hd: [
+              2,
+              /* '2' */50
+            ],
+            tl: /* [] */0
+          }
+        },
+        _1: f(Int_hash)
+      };
     })
 ];
 
@@ -86,15 +86,15 @@ const suites_1 = {
     "more_iterations",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: Stdlib__Array.init(1001, (function (i) {
-                        return [
-                                (i << 1),
-                                String(i)
-                              ];
-                      })),
-                _1: g(Int_hash, 1000)
-              };
+          TAG: /* Eq */0,
+          _0: Stdlib__Array.init(1001, (function (i) {
+                  return [
+                    (i << 1),
+                    String(i)
+                  ];
+                })),
+          _1: g(Int_hash, 1000)
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/int_map.js b/jscomp/test/dist/jscomp/test/int_map.js
index b61a080ab..2d7b3d411 100644
--- a/jscomp/test/dist/jscomp/test/int_map.js
+++ b/jscomp/test/dist/jscomp/test/int_map.js
@@ -27,24 +27,24 @@ function create(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function singleton(x, d) {
   return {
-          TAG: /* Node */0,
-          l: /* Empty */0,
-          v: x,
-          d: d,
-          r: /* Empty */0,
-          h: 1
-        };
+    TAG: /* Node */0,
+    l: /* Empty */0,
+    v: x,
+    d: d,
+    r: /* Empty */0,
+    h: 1
+  };
 }
 
 function bal(l, x, d, r) {
@@ -55,9 +55,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -70,25 +70,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -101,9 +101,9 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function is_empty(param) {
@@ -117,13 +117,13 @@ function is_empty(param) {
 function add(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -135,13 +135,13 @@ function add(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -165,8 +165,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg.compare, x, param.v);
     if (c === 0) {
@@ -182,8 +182,8 @@ function find_first(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -196,9 +196,9 @@ function find_first(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -233,9 +233,9 @@ function find_first_opt(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -258,8 +258,8 @@ function find_last(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -272,9 +272,9 @@ function find_last(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -309,9 +309,9 @@ function find_last_opt(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -364,15 +364,15 @@ function min_binding(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -388,9 +388,9 @@ function min_binding_opt(_param) {
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -402,15 +402,15 @@ function max_binding(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = param.r;
     continue ;
@@ -426,9 +426,9 @@ function max_binding_opt(_param) {
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = param.r;
     continue ;
@@ -438,9 +438,9 @@ function max_binding_opt(_param) {
 function remove_min_binding(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.remove_min_elt"
+        });
   }
   const l = param.l;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -494,13 +494,13 @@ function update(x, f, m) {
     const data = Curry._1(f, undefined);
     if (data !== undefined) {
       return {
-              TAG: /* Node */0,
-              l: /* Empty */0,
-              v: x,
-              d: Caml_option.valFromOption(data),
-              r: /* Empty */0,
-              h: 1
-            };
+        TAG: /* Node */0,
+        l: /* Empty */0,
+        v: x,
+        d: Caml_option.valFromOption(data),
+        r: /* Empty */0,
+        h: 1
+      };
     } else {
       return /* Empty */0;
     }
@@ -520,13 +520,13 @@ function update(x, f, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data$2,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data$2,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -549,14 +549,14 @@ function add_to_list(x, data, m) {
   const add = function (l) {
     if (l !== undefined) {
       return {
-              hd: data,
-              tl: l
-            };
+        hd: data,
+        tl: l
+      };
     } else {
       return {
-              hd: data,
-              tl: /* [] */0
-            };
+        hd: data,
+        tl: /* [] */0
+      };
     }
   };
   return update(x, add, m);
@@ -583,13 +583,13 @@ function map(f, param) {
   const d$p = Curry._1(f, param.d);
   const r$p = map(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: param.v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: param.v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function mapi(f, param) {
@@ -601,13 +601,13 @@ function mapi(f, param) {
   const d$p = Curry._2(f, v, param.d);
   const r$p = mapi(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function fold(f, _m, _accu) {
@@ -713,10 +713,10 @@ function concat_or_join(t1, v, d, t2) {
 function split(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            undefined,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      undefined,
+      /* Empty */0
+    ];
   }
   const r = param.r;
   const d = param.d;
@@ -725,25 +725,25 @@ function split(x, param) {
   const 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) {
     const 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)
+    ];
   }
   const 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) {
@@ -762,13 +762,13 @@ function merge$1(f, s1, s2) {
   }
   if (/* tag */typeof s2 === "number" || typeof s2 === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/stdlib/map.ml",
-                408,
-                10
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/stdlib/map.ml",
+            408,
+            10
+          ]
+        });
   }
   const v2 = s2.v;
   const match$1 = split(v2, s1);
@@ -848,9 +848,9 @@ function filter_map(f, param) {
 function partition(p, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      /* Empty */0
+    ];
   }
   const d = param.d;
   const v = param.v;
@@ -863,14 +863,14 @@ function partition(p, param) {
   const 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)
+    ];
   }
 }
 
@@ -984,14 +984,14 @@ function bindings(s) {
 
 function of_list(bs) {
   return Stdlib__List.fold_left((function (m, param) {
-                return add(param[0], param[1], m);
-              }), /* Empty */0, bs);
+          return add(param[0], param[1], m);
+        }), /* Empty */0, bs);
 }
 
 function add_seq(i, m) {
   return Stdlib__Seq.fold_left((function (m, param) {
-                return add(param[0], param[1], m);
-              }), m, i);
+          return add(param[0], param[1], m);
+        }), m, i);
 }
 
 function of_seq(i) {
@@ -1004,15 +1004,15 @@ function seq_of_enum_(c, param) {
   }
   const partial_arg = cons_enum(c._2, c._3);
   return {
-          TAG: /* Cons */0,
-          _0: [
-            c._0,
-            c._1
-          ],
-          _1: (function (param) {
-              return seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: [
+      c._0,
+      c._1
+    ],
+    _1: (function (param) {
+        return seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_seq(m) {
@@ -1047,15 +1047,15 @@ function rev_seq_of_enum_(c, param) {
   }
   const partial_arg = snoc_enum(c._2, c._3);
   return {
-          TAG: /* Cons */0,
-          _0: [
-            c._0,
-            c._1
-          ],
-          _1: (function (param) {
-              return rev_seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: [
+      c._0,
+      c._1
+    ],
+    _1: (function (param) {
+        return rev_seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_rev_seq(c) {
@@ -1079,12 +1079,12 @@ function to_seq_from(low, m) {
       const n = Curry._2(funarg.compare, v, low);
       if (n === 0) {
         return {
-                TAG: /* More */0,
-                _0: v,
-                _1: d,
-                _2: r,
-                _3: c
-              };
+          TAG: /* More */0,
+          _0: v,
+          _1: d,
+          _2: r,
+          _3: c
+        };
       }
       if (n < 0) {
         _m = r;
diff --git a/jscomp/test/dist/jscomp/test/int_overflow_test.js b/jscomp/test/dist/jscomp/test/int_overflow_test.js
index 7be1d43f9..bc6604425 100644
--- a/jscomp/test/dist/jscomp/test/int_overflow_test.js
+++ b/jscomp/test/dist/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,
-                    _0: true,
-                    _1: (Stdlib__Int32.max_int + 1 | 0) === Stdlib__Int32.min_int
-                  };
+              TAG: /* Eq */0,
+              _0: true,
+              _1: (Stdlib__Int32.max_int + 1 | 0) === Stdlib__Int32.min_int
+            };
           })
       ],
       tl: {
@@ -54,10 +54,10 @@ Mt.from_pair_suites("Int_overflow_test", {
           "minus_overflow",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: true,
-                      _1: (Stdlib__Int32.min_int - Stdlib__Int32.one | 0) === Stdlib__Int32.max_int
-                    };
+                TAG: /* Eq */0,
+                _0: true,
+                _1: (Stdlib__Int32.min_int - Stdlib__Int32.one | 0) === Stdlib__Int32.max_int
+              };
             })
         ],
         tl: {
@@ -65,10 +65,10 @@ Mt.from_pair_suites("Int_overflow_test", {
             "flow_again",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: 2147483646,
-                        _1: (Stdlib__Int32.max_int + Stdlib__Int32.max_int | 0) + Stdlib__Int32.min_int | 0
-                      };
+                  TAG: /* Eq */0,
+                  _0: 2147483646,
+                  _1: (Stdlib__Int32.max_int + Stdlib__Int32.max_int | 0) + Stdlib__Int32.min_int | 0
+                };
               })
           ],
           tl: {
@@ -76,10 +76,10 @@ Mt.from_pair_suites("Int_overflow_test", {
               "flow_again",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: -2,
-                          _1: Stdlib__Int32.max_int + Stdlib__Int32.max_int | 0
-                        };
+                    TAG: /* Eq */0,
+                    _0: -2,
+                    _1: Stdlib__Int32.max_int + Stdlib__Int32.max_int | 0
+                  };
                 })
             ],
             tl: {
@@ -87,10 +87,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                 "hash_test",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: hash_variant("xxyyzzuuxxzzyy00112233"),
-                            _1: 544087776
-                          };
+                      TAG: /* Eq */0,
+                      _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,
-                              _0: hash_variant("xxyyzxzzyy"),
-                              _1: -449896130
-                            };
+                        TAG: /* Eq */0,
+                        _0: hash_variant("xxyyzxzzyy"),
+                        _1: -449896130
+                      };
                     })
                 ],
                 tl: {
@@ -109,10 +109,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                     "File \"jscomp/test/int_overflow_test.ml\", line 37, characters 2-9",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: hash_variant2("xxyyzzuuxxzzyy00112233"),
-                                _1: 544087776
-                              };
+                          TAG: /* Eq */0,
+                          _0: hash_variant2("xxyyzzuuxxzzyy00112233"),
+                          _1: 544087776
+                        };
                       })
                   ],
                   tl: {
@@ -120,10 +120,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                       "File \"jscomp/test/int_overflow_test.ml\", line 38, characters 2-9",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: hash_variant2("xxyyzxzzyy"),
-                                  _1: -449896130
-                                };
+                            TAG: /* Eq */0,
+                            _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,
-                                    _0: -1,
-                                    _1: -1
-                                  };
+                              TAG: /* Eq */0,
+                              _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,
-                                      _0: -1,
-                                      _1: -1
-                                    };
+                                TAG: /* Eq */0,
+                                _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,
-                                        _0: -1,
-                                        _1: -1
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: -1,
+                                  _1: -1
+                                };
                               })
                           ],
                           tl: {
@@ -164,10 +164,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                               "int32_mul",
                               (function (param) {
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: -33554431,
-                                          _1: -33554431
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: -33554431,
+                                    _1: -33554431
+                                  };
                                 })
                             ],
                             tl: {
@@ -175,10 +175,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                                 "File \"jscomp/test/int_overflow_test.ml\", line 44, characters 3-10",
                                 (function (param) {
                                     return {
-                                            TAG: /* Eq */0,
-                                            _0: Number("3") | 0,
-                                            _1: 3
-                                          };
+                                      TAG: /* Eq */0,
+                                      _0: Number("3") | 0,
+                                      _1: 3
+                                    };
                                   })
                               ],
                               tl: {
@@ -186,10 +186,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                                   "File \"jscomp/test/int_overflow_test.ml\", line 46, characters 3-10",
                                   (function (param) {
                                       return {
-                                              TAG: /* Eq */0,
-                                              _0: Number("3.2") | 0,
-                                              _1: 3
-                                            };
+                                        TAG: /* Eq */0,
+                                        _0: Number("3.2") | 0,
+                                        _1: 3
+                                      };
                                     })
                                 ],
                                 tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/internal_unused_test.js b/jscomp/test/dist/jscomp/test/internal_unused_test.js
index f34cf8a45..cd1e7f9d8 100644
--- a/jscomp/test/dist/jscomp/test/internal_unused_test.js
+++ b/jscomp/test/dist/jscomp/test/internal_unused_test.js
@@ -10,8 +10,8 @@ const A = /* @__PURE__ */Caml_exceptions.create("Internal_unused_test.P1.A");
 
 function f(param) {
   throw new Caml_js_exceptions.MelangeError(A, {
-            MEL_EXN_ID: A
-          });
+        MEL_EXN_ID: A
+      });
 }
 
 const c = 5;
diff --git a/jscomp/test/dist/jscomp/test/js_array_test.js b/jscomp/test/dist/jscomp/test/js_array_test.js
index b78dd323c..b7f815c6c 100644
--- a/jscomp/test/dist/jscomp/test/js_array_test.js
+++ b/jscomp/test/dist/jscomp/test/js_array_test.js
@@ -8,10 +8,10 @@ const suites_0 = [
   "isArray_array",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: true,
-              _1: Array.isArray([])
-            };
+        TAG: /* Eq */0,
+        _0: true,
+        _1: Array.isArray([])
+      };
     })
 ];
 
@@ -20,10 +20,10 @@ const suites_1 = {
     "isArray_int",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: false,
-                _1: Array.isArray(34)
-              };
+          TAG: /* Eq */0,
+          _0: false,
+          _1: Array.isArray(34)
+        };
       })
   ],
   tl: {
@@ -31,14 +31,14 @@ const suites_1 = {
       "length",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: 3,
-                  _1: [
-                    1,
-                    2,
-                    3
-                  ].length
-                };
+            TAG: /* Eq */0,
+            _0: 3,
+            _1: [
+              1,
+              2,
+              3
+            ].length
+          };
         })
     ],
     tl: {
@@ -46,22 +46,22 @@ const suites_1 = {
         "copyWithin",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: [
-                      1,
-                      2,
-                      3,
-                      1,
-                      2
-                    ],
-                    _1: [
-                        1,
-                        2,
-                        3,
-                        4,
-                        5
-                      ].copyWithin(-2, undefined, undefined)
-                  };
+              TAG: /* Eq */0,
+              _0: [
+                1,
+                2,
+                3,
+                1,
+                2
+              ],
+              _1: [
+                  1,
+                  2,
+                  3,
+                  4,
+                  5
+                ].copyWithin(-2, undefined, undefined)
+            };
           })
       ],
       tl: {
@@ -69,22 +69,22 @@ const suites_1 = {
           "copyWithinFrom",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: [
-                        4,
-                        5,
-                        3,
-                        4,
-                        5
-                      ],
-                      _1: [
-                          1,
-                          2,
-                          3,
-                          4,
-                          5
-                        ].copyWithin(0, 3, undefined)
-                    };
+                TAG: /* Eq */0,
+                _0: [
+                  4,
+                  5,
+                  3,
+                  4,
+                  5
+                ],
+                _1: [
+                    1,
+                    2,
+                    3,
+                    4,
+                    5
+                  ].copyWithin(0, 3, undefined)
+              };
             })
         ],
         tl: {
@@ -92,22 +92,22 @@ const suites_1 = {
             "copyWithinFromRange",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: [
-                          4,
-                          2,
-                          3,
-                          4,
-                          5
-                        ],
-                        _1: [
-                            1,
-                            2,
-                            3,
-                            4,
-                            5
-                          ].copyWithin(0, 3, 4)
-                      };
+                  TAG: /* Eq */0,
+                  _0: [
+                    4,
+                    2,
+                    3,
+                    4,
+                    5
+                  ],
+                  _1: [
+                      1,
+                      2,
+                      3,
+                      4,
+                      5
+                    ].copyWithin(0, 3, 4)
+                };
               })
           ],
           tl: {
@@ -115,18 +115,18 @@ const suites_1 = {
               "fillInPlace",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: [
-                            4,
-                            4,
-                            4
-                          ],
-                          _1: [
-                              1,
-                              2,
-                              3
-                            ].fill(4, undefined, undefined)
-                        };
+                    TAG: /* Eq */0,
+                    _0: [
+                      4,
+                      4,
+                      4
+                    ],
+                    _1: [
+                        1,
+                        2,
+                        3
+                      ].fill(4, undefined, undefined)
+                  };
                 })
             ],
             tl: {
@@ -134,18 +134,18 @@ const suites_1 = {
                 "fillFromInPlace",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: [
-                              1,
-                              4,
-                              4
-                            ],
-                            _1: [
-                                1,
-                                2,
-                                3
-                              ].fill(4, 1, undefined)
-                          };
+                      TAG: /* Eq */0,
+                      _0: [
+                        1,
+                        4,
+                        4
+                      ],
+                      _1: [
+                          1,
+                          2,
+                          3
+                        ].fill(4, 1, undefined)
+                    };
                   })
               ],
               tl: {
@@ -153,18 +153,18 @@ const suites_1 = {
                   "fillRangeInPlace",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: [
-                                1,
-                                4,
-                                3
-                              ],
-                              _1: [
-                                  1,
-                                  2,
-                                  3
-                                ].fill(4, 1, 2)
-                            };
+                        TAG: /* Eq */0,
+                        _0: [
+                          1,
+                          4,
+                          3
+                        ],
+                        _1: [
+                            1,
+                            2,
+                            3
+                          ].fill(4, 1, 2)
+                      };
                     })
                 ],
                 tl: {
@@ -172,14 +172,14 @@ const suites_1 = {
                     "pop",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: 3,
-                                _1: Caml_option.undefined_to_opt([
-                                        1,
-                                        2,
-                                        3
-                                      ].pop())
-                              };
+                          TAG: /* Eq */0,
+                          _0: 3,
+                          _1: Caml_option.undefined_to_opt([
+                                  1,
+                                  2,
+                                  3
+                                ].pop())
+                        };
                       })
                   ],
                   tl: {
@@ -187,10 +187,10 @@ const suites_1 = {
                       "pop - empty array",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: undefined,
-                                  _1: Caml_option.undefined_to_opt([].pop())
-                                };
+                            TAG: /* Eq */0,
+                            _0: undefined,
+                            _1: Caml_option.undefined_to_opt([].pop())
+                          };
                         })
                     ],
                     tl: {
@@ -198,14 +198,14 @@ const suites_1 = {
                         "push",
                         (function (param) {
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: 4,
-                                    _1: [
-                                        1,
-                                        2,
-                                        3
-                                      ].push(4)
-                                  };
+                              TAG: /* Eq */0,
+                              _0: 4,
+                              _1: [
+                                  1,
+                                  2,
+                                  3
+                                ].push(4)
+                            };
                           })
                       ],
                       tl: {
@@ -213,14 +213,14 @@ const suites_1 = {
                           "pushMany",
                           (function (param) {
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: 5,
-                                      _1: [
-                                          1,
-                                          2,
-                                          3
-                                        ].push(4, 5)
-                                    };
+                                TAG: /* Eq */0,
+                                _0: 5,
+                                _1: [
+                                    1,
+                                    2,
+                                    3
+                                  ].push(4, 5)
+                              };
                             })
                         ],
                         tl: {
@@ -228,18 +228,18 @@ const suites_1 = {
                             "reverseInPlace",
                             (function (param) {
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: [
-                                          3,
-                                          2,
-                                          1
-                                        ],
-                                        _1: [
-                                            1,
-                                            2,
-                                            3
-                                          ].reverse()
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: [
+                                    3,
+                                    2,
+                                    1
+                                  ],
+                                  _1: [
+                                      1,
+                                      2,
+                                      3
+                                    ].reverse()
+                                };
                               })
                           ],
                           tl: {
@@ -247,14 +247,14 @@ const suites_1 = {
                               "shift",
                               (function (param) {
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: 1,
-                                          _1: Caml_option.undefined_to_opt([
-                                                  1,
-                                                  2,
-                                                  3
-                                                ].shift())
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: 1,
+                                    _1: Caml_option.undefined_to_opt([
+                                            1,
+                                            2,
+                                            3
+                                          ].shift())
+                                  };
                                 })
                             ],
                             tl: {
@@ -262,10 +262,10 @@ const suites_1 = {
                                 "shift - empty array",
                                 (function (param) {
                                     return {
-                                            TAG: /* Eq */0,
-                                            _0: undefined,
-                                            _1: Caml_option.undefined_to_opt([].shift())
-                                          };
+                                      TAG: /* Eq */0,
+                                      _0: undefined,
+                                      _1: Caml_option.undefined_to_opt([].shift())
+                                    };
                                   })
                               ],
                               tl: {
@@ -273,18 +273,18 @@ const suites_1 = {
                                   "sortInPlace",
                                   (function (param) {
                                       return {
-                                              TAG: /* Eq */0,
-                                              _0: [
-                                                1,
-                                                2,
-                                                3
-                                              ],
-                                              _1: [
-                                                  3,
-                                                  1,
-                                                  2
-                                                ].sort()
-                                            };
+                                        TAG: /* Eq */0,
+                                        _0: [
+                                          1,
+                                          2,
+                                          3
+                                        ],
+                                        _1: [
+                                            3,
+                                            1,
+                                            2
+                                          ].sort()
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -292,20 +292,20 @@ const suites_1 = {
                                     "sortInPlaceWith",
                                     (function (param) {
                                         return {
-                                                TAG: /* Eq */0,
-                                                _0: [
-                                                  3,
-                                                  2,
-                                                  1
-                                                ],
-                                                _1: [
-                                                    3,
-                                                    1,
-                                                    2
-                                                  ].sort(function (a, b) {
-                                                      return b - a | 0;
-                                                    })
-                                              };
+                                          TAG: /* Eq */0,
+                                          _0: [
+                                            3,
+                                            2,
+                                            1
+                                          ],
+                                          _1: [
+                                              3,
+                                              1,
+                                              2
+                                            ].sort(function (a, b) {
+                                                return b - a | 0;
+                                              })
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -320,22 +320,22 @@ const suites_1 = {
                                           ];
                                           const removed = arr.splice(2, 0, 5);
                                           return {
-                                                  TAG: /* Eq */0,
-                                                  _0: [
-                                                    [
-                                                      1,
-                                                      2,
-                                                      5,
-                                                      3,
-                                                      4
-                                                    ],
-                                                    []
-                                                  ],
-                                                  _1: [
-                                                    arr,
-                                                    removed
-                                                  ]
-                                                };
+                                            TAG: /* Eq */0,
+                                            _0: [
+                                              [
+                                                1,
+                                                2,
+                                                5,
+                                                3,
+                                                4
+                                              ],
+                                              []
+                                            ],
+                                            _1: [
+                                              arr,
+                                              removed
+                                            ]
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -350,22 +350,22 @@ const suites_1 = {
                                             ];
                                             const removed = arr.splice(2);
                                             return {
-                                                    TAG: /* Eq */0,
-                                                    _0: [
-                                                      [
-                                                        1,
-                                                        2
-                                                      ],
-                                                      [
-                                                        3,
-                                                        4
-                                                      ]
-                                                    ],
-                                                    _1: [
-                                                      arr,
-                                                      removed
-                                                    ]
-                                                  };
+                                              TAG: /* Eq */0,
+                                              _0: [
+                                                [
+                                                  1,
+                                                  2
+                                                ],
+                                                [
+                                                  3,
+                                                  4
+                                                ]
+                                              ],
+                                              _1: [
+                                                arr,
+                                                removed
+                                              ]
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -380,20 +380,20 @@ const suites_1 = {
                                               ];
                                               const removed = arr.splice(2, 1);
                                               return {
-                                                      TAG: /* Eq */0,
-                                                      _0: [
-                                                        [
-                                                          1,
-                                                          2,
-                                                          4
-                                                        ],
-                                                        [3]
-                                                      ],
-                                                      _1: [
-                                                        arr,
-                                                        removed
-                                                      ]
-                                                    };
+                                                TAG: /* Eq */0,
+                                                _0: [
+                                                  [
+                                                    1,
+                                                    2,
+                                                    4
+                                                  ],
+                                                  [3]
+                                                ],
+                                                _1: [
+                                                  arr,
+                                                  removed
+                                                ]
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -401,14 +401,14 @@ const suites_1 = {
                                             "unshift",
                                             (function (param) {
                                                 return {
-                                                        TAG: /* Eq */0,
-                                                        _0: 4,
-                                                        _1: [
-                                                            1,
-                                                            2,
-                                                            3
-                                                          ].unshift(4)
-                                                      };
+                                                  TAG: /* Eq */0,
+                                                  _0: 4,
+                                                  _1: [
+                                                      1,
+                                                      2,
+                                                      3
+                                                    ].unshift(4)
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -416,14 +416,14 @@ const suites_1 = {
                                               "unshiftMany",
                                               (function (param) {
                                                   return {
-                                                          TAG: /* Eq */0,
-                                                          _0: 5,
-                                                          _1: [
-                                                              1,
-                                                              2,
-                                                              3
-                                                            ].unshift(4, 5)
-                                                        };
+                                                    TAG: /* Eq */0,
+                                                    _0: 5,
+                                                    _1: [
+                                                        1,
+                                                        2,
+                                                        3
+                                                      ].unshift(4, 5)
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -431,19 +431,19 @@ const suites_1 = {
                                                 "append",
                                                 (function (param) {
                                                     return {
-                                                            TAG: /* Eq */0,
-                                                            _0: [
-                                                              1,
-                                                              2,
-                                                              3,
-                                                              4
-                                                            ],
-                                                            _1: [
-                                                                1,
-                                                                2,
-                                                                3
-                                                              ].concat([4])
-                                                          };
+                                                      TAG: /* Eq */0,
+                                                      _0: [
+                                                        1,
+                                                        2,
+                                                        3,
+                                                        4
+                                                      ],
+                                                      _1: [
+                                                          1,
+                                                          2,
+                                                          3
+                                                        ].concat([4])
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -451,23 +451,23 @@ const suites_1 = {
                                                   "concat",
                                                   (function (param) {
                                                       return {
-                                                              TAG: /* Eq */0,
-                                                              _0: [
-                                                                1,
-                                                                2,
-                                                                3,
-                                                                4,
-                                                                5
-                                                              ],
-                                                              _1: [
-                                                                  1,
-                                                                  2,
-                                                                  3
-                                                                ].concat([
-                                                                    4,
-                                                                    5
-                                                                  ])
-                                                            };
+                                                        TAG: /* Eq */0,
+                                                        _0: [
+                                                          1,
+                                                          2,
+                                                          3,
+                                                          4,
+                                                          5
+                                                        ],
+                                                        _1: [
+                                                            1,
+                                                            2,
+                                                            3
+                                                          ].concat([
+                                                              4,
+                                                              5
+                                                            ])
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -475,28 +475,28 @@ const suites_1 = {
                                                     "concatMany",
                                                     (function (param) {
                                                         return {
-                                                                TAG: /* Eq */0,
-                                                                _0: [
-                                                                  1,
-                                                                  2,
-                                                                  3,
-                                                                  4,
-                                                                  5,
-                                                                  6,
-                                                                  7
-                                                                ],
-                                                                _1: [
-                                                                    1,
-                                                                    2,
-                                                                    3
-                                                                  ].concat([
-                                                                      4,
-                                                                      5
-                                                                    ], [
-                                                                      6,
-                                                                      7
-                                                                    ])
-                                                              };
+                                                          TAG: /* Eq */0,
+                                                          _0: [
+                                                            1,
+                                                            2,
+                                                            3,
+                                                            4,
+                                                            5,
+                                                            6,
+                                                            7
+                                                          ],
+                                                          _1: [
+                                                              1,
+                                                              2,
+                                                              3
+                                                            ].concat([
+                                                                4,
+                                                                5
+                                                              ], [
+                                                                6,
+                                                                7
+                                                              ])
+                                                        };
                                                       })
                                                   ],
                                                   tl: {
@@ -504,14 +504,14 @@ const suites_1 = {
                                                       "includes",
                                                       (function (param) {
                                                           return {
-                                                                  TAG: /* Eq */0,
-                                                                  _0: true,
-                                                                  _1: [
-                                                                      1,
-                                                                      2,
-                                                                      3
-                                                                    ].includes(3)
-                                                                };
+                                                            TAG: /* Eq */0,
+                                                            _0: true,
+                                                            _1: [
+                                                                1,
+                                                                2,
+                                                                3
+                                                              ].includes(3)
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -519,14 +519,14 @@ const suites_1 = {
                                                         "indexOf",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: /* Eq */0,
-                                                                    _0: 1,
-                                                                    _1: [
-                                                                        1,
-                                                                        2,
-                                                                        3
-                                                                      ].indexOf(2, undefined)
-                                                                  };
+                                                              TAG: /* Eq */0,
+                                                              _0: 1,
+                                                              _1: [
+                                                                  1,
+                                                                  2,
+                                                                  3
+                                                                ].indexOf(2, undefined)
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -534,15 +534,15 @@ const suites_1 = {
                                                           "indexOfFrom",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: /* Eq */0,
-                                                                      _0: 3,
-                                                                      _1: [
-                                                                          1,
-                                                                          2,
-                                                                          3,
-                                                                          2
-                                                                        ].indexOf(2, 2)
-                                                                    };
+                                                                TAG: /* Eq */0,
+                                                                _0: 3,
+                                                                _1: [
+                                                                    1,
+                                                                    2,
+                                                                    3,
+                                                                    2
+                                                                  ].indexOf(2, 2)
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -550,14 +550,14 @@ const suites_1 = {
                                                             "join",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: /* Eq */0,
-                                                                        _0: "1,2,3",
-                                                                        _1: [
-                                                                            1,
-                                                                            2,
-                                                                            3
-                                                                          ].join(",")
-                                                                      };
+                                                                  TAG: /* Eq */0,
+                                                                  _0: "1,2,3",
+                                                                  _1: [
+                                                                      1,
+                                                                      2,
+                                                                      3
+                                                                    ].join(",")
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -565,14 +565,14 @@ const suites_1 = {
                                                               "joinWith",
                                                               (function (param) {
                                                                   return {
-                                                                          TAG: /* Eq */0,
-                                                                          _0: "1;2;3",
-                                                                          _1: [
-                                                                              1,
-                                                                              2,
-                                                                              3
-                                                                            ].join(";")
-                                                                        };
+                                                                    TAG: /* Eq */0,
+                                                                    _0: "1;2;3",
+                                                                    _1: [
+                                                                        1,
+                                                                        2,
+                                                                        3
+                                                                      ].join(";")
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -580,14 +580,14 @@ const suites_1 = {
                                                                 "lastIndexOf",
                                                                 (function (param) {
                                                                     return {
-                                                                            TAG: /* Eq */0,
-                                                                            _0: 1,
-                                                                            _1: [
-                                                                                1,
-                                                                                2,
-                                                                                3
-                                                                              ].lastIndexOf(2)
-                                                                          };
+                                                                      TAG: /* Eq */0,
+                                                                      _0: 1,
+                                                                      _1: [
+                                                                          1,
+                                                                          2,
+                                                                          3
+                                                                        ].lastIndexOf(2)
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -595,15 +595,15 @@ const suites_1 = {
                                                                   "lastIndexOfFrom",
                                                                   (function (param) {
                                                                       return {
-                                                                              TAG: /* Eq */0,
-                                                                              _0: 1,
-                                                                              _1: [
-                                                                                  1,
-                                                                                  2,
-                                                                                  3,
-                                                                                  2
-                                                                                ].lastIndexOf(2, 2)
-                                                                            };
+                                                                        TAG: /* Eq */0,
+                                                                        _0: 1,
+                                                                        _1: [
+                                                                            1,
+                                                                            2,
+                                                                            3,
+                                                                            2
+                                                                          ].lastIndexOf(2, 2)
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -611,19 +611,19 @@ const suites_1 = {
                                                                     "slice",
                                                                     (function (param) {
                                                                         return {
-                                                                                TAG: /* Eq */0,
-                                                                                _0: [
-                                                                                  2,
-                                                                                  3
-                                                                                ],
-                                                                                _1: [
-                                                                                    1,
-                                                                                    2,
-                                                                                    3,
-                                                                                    4,
-                                                                                    5
-                                                                                  ].slice(1, 3)
-                                                                              };
+                                                                          TAG: /* Eq */0,
+                                                                          _0: [
+                                                                            2,
+                                                                            3
+                                                                          ],
+                                                                          _1: [
+                                                                              1,
+                                                                              2,
+                                                                              3,
+                                                                              4,
+                                                                              5
+                                                                            ].slice(1, 3)
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -631,22 +631,22 @@ const suites_1 = {
                                                                       "copy",
                                                                       (function (param) {
                                                                           return {
-                                                                                  TAG: /* Eq */0,
-                                                                                  _0: [
-                                                                                    1,
-                                                                                    2,
-                                                                                    3,
-                                                                                    4,
-                                                                                    5
-                                                                                  ],
-                                                                                  _1: [
-                                                                                      1,
-                                                                                      2,
-                                                                                      3,
-                                                                                      4,
-                                                                                      5
-                                                                                    ].slice()
-                                                                                };
+                                                                            TAG: /* Eq */0,
+                                                                            _0: [
+                                                                              1,
+                                                                              2,
+                                                                              3,
+                                                                              4,
+                                                                              5
+                                                                            ],
+                                                                            _1: [
+                                                                                1,
+                                                                                2,
+                                                                                3,
+                                                                                4,
+                                                                                5
+                                                                              ].slice()
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -654,20 +654,20 @@ const suites_1 = {
                                                                         "sliceFrom",
                                                                         (function (param) {
                                                                             return {
-                                                                                    TAG: /* Eq */0,
-                                                                                    _0: [
-                                                                                      3,
-                                                                                      4,
-                                                                                      5
-                                                                                    ],
-                                                                                    _1: [
-                                                                                        1,
-                                                                                        2,
-                                                                                        3,
-                                                                                        4,
-                                                                                        5
-                                                                                      ].slice(2, undefined)
-                                                                                  };
+                                                                              TAG: /* Eq */0,
+                                                                              _0: [
+                                                                                3,
+                                                                                4,
+                                                                                5
+                                                                              ],
+                                                                              _1: [
+                                                                                  1,
+                                                                                  2,
+                                                                                  3,
+                                                                                  4,
+                                                                                  5
+                                                                                ].slice(2, undefined)
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -675,14 +675,14 @@ const suites_1 = {
                                                                           "toString",
                                                                           (function (param) {
                                                                               return {
-                                                                                      TAG: /* Eq */0,
-                                                                                      _0: "1,2,3",
-                                                                                      _1: [
-                                                                                          1,
-                                                                                          2,
-                                                                                          3
-                                                                                        ].toString()
-                                                                                    };
+                                                                                TAG: /* Eq */0,
+                                                                                _0: "1,2,3",
+                                                                                _1: [
+                                                                                    1,
+                                                                                    2,
+                                                                                    3
+                                                                                  ].toString()
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -690,14 +690,14 @@ const suites_1 = {
                                                                             "toLocaleString",
                                                                             (function (param) {
                                                                                 return {
-                                                                                        TAG: /* Eq */0,
-                                                                                        _0: "1,2,3",
-                                                                                        _1: [
-                                                                                            1,
-                                                                                            2,
-                                                                                            3
-                                                                                          ].toLocaleString()
-                                                                                      };
+                                                                                  TAG: /* Eq */0,
+                                                                                  _0: "1,2,3",
+                                                                                  _1: [
+                                                                                      1,
+                                                                                      2,
+                                                                                      3
+                                                                                    ].toLocaleString()
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -705,16 +705,16 @@ const suites_1 = {
                                                                               "every",
                                                                               (function (param) {
                                                                                   return {
-                                                                                          TAG: /* Eq */0,
-                                                                                          _0: true,
-                                                                                          _1: [
-                                                                                              1,
-                                                                                              2,
-                                                                                              3
-                                                                                            ].every(function (n) {
-                                                                                                return n > 0;
-                                                                                              })
-                                                                                        };
+                                                                                    TAG: /* Eq */0,
+                                                                                    _0: true,
+                                                                                    _1: [
+                                                                                        1,
+                                                                                        2,
+                                                                                        3
+                                                                                      ].every(function (n) {
+                                                                                          return n > 0;
+                                                                                        })
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -722,16 +722,16 @@ const suites_1 = {
                                                                                 "everyi",
                                                                                 (function (param) {
                                                                                     return {
-                                                                                            TAG: /* Eq */0,
-                                                                                            _0: false,
-                                                                                            _1: [
-                                                                                                1,
-                                                                                                2,
-                                                                                                3
-                                                                                              ].every(function (param, i) {
-                                                                                                  return i > 0;
-                                                                                                })
-                                                                                          };
+                                                                                      TAG: /* Eq */0,
+                                                                                      _0: false,
+                                                                                      _1: [
+                                                                                          1,
+                                                                                          2,
+                                                                                          3
+                                                                                        ].every(function (param, i) {
+                                                                                            return i > 0;
+                                                                                          })
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -739,20 +739,20 @@ const suites_1 = {
                                                                                   "filter",
                                                                                   (function (param) {
                                                                                       return {
-                                                                                              TAG: /* Eq */0,
-                                                                                              _0: [
-                                                                                                2,
-                                                                                                4
-                                                                                              ],
-                                                                                              _1: [
-                                                                                                  1,
-                                                                                                  2,
-                                                                                                  3,
-                                                                                                  4
-                                                                                                ].filter(function (n) {
-                                                                                                    return n % 2 === 0;
-                                                                                                  })
-                                                                                            };
+                                                                                        TAG: /* Eq */0,
+                                                                                        _0: [
+                                                                                          2,
+                                                                                          4
+                                                                                        ],
+                                                                                        _1: [
+                                                                                            1,
+                                                                                            2,
+                                                                                            3,
+                                                                                            4
+                                                                                          ].filter(function (n) {
+                                                                                              return n % 2 === 0;
+                                                                                            })
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -760,20 +760,20 @@ const suites_1 = {
                                                                                     "filteri",
                                                                                     (function (param) {
                                                                                         return {
-                                                                                                TAG: /* Eq */0,
-                                                                                                _0: [
-                                                                                                  1,
-                                                                                                  3
-                                                                                                ],
-                                                                                                _1: [
-                                                                                                    1,
-                                                                                                    2,
-                                                                                                    3,
-                                                                                                    4
-                                                                                                  ].filter(function (param, i) {
-                                                                                                      return i % 2 === 0;
-                                                                                                    })
-                                                                                              };
+                                                                                          TAG: /* Eq */0,
+                                                                                          _0: [
+                                                                                            1,
+                                                                                            3
+                                                                                          ],
+                                                                                          _1: [
+                                                                                              1,
+                                                                                              2,
+                                                                                              3,
+                                                                                              4
+                                                                                            ].filter(function (param, i) {
+                                                                                                return i % 2 === 0;
+                                                                                              })
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -781,17 +781,17 @@ const suites_1 = {
                                                                                       "find",
                                                                                       (function (param) {
                                                                                           return {
-                                                                                                  TAG: /* Eq */0,
-                                                                                                  _0: 2,
-                                                                                                  _1: Caml_option.undefined_to_opt([
-                                                                                                          1,
-                                                                                                          2,
-                                                                                                          3,
-                                                                                                          4
-                                                                                                        ].find(function (n) {
-                                                                                                            return n % 2 === 0;
-                                                                                                          }))
-                                                                                                };
+                                                                                            TAG: /* Eq */0,
+                                                                                            _0: 2,
+                                                                                            _1: Caml_option.undefined_to_opt([
+                                                                                                    1,
+                                                                                                    2,
+                                                                                                    3,
+                                                                                                    4
+                                                                                                  ].find(function (n) {
+                                                                                                      return n % 2 === 0;
+                                                                                                    }))
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: {
@@ -799,17 +799,17 @@ const suites_1 = {
                                                                                         "find - no match",
                                                                                         (function (param) {
                                                                                             return {
-                                                                                                    TAG: /* Eq */0,
-                                                                                                    _0: undefined,
-                                                                                                    _1: Caml_option.undefined_to_opt([
-                                                                                                            1,
-                                                                                                            2,
-                                                                                                            3,
-                                                                                                            4
-                                                                                                          ].find(function (n) {
-                                                                                                              return n % 2 === 5;
-                                                                                                            }))
-                                                                                                  };
+                                                                                              TAG: /* Eq */0,
+                                                                                              _0: undefined,
+                                                                                              _1: Caml_option.undefined_to_opt([
+                                                                                                      1,
+                                                                                                      2,
+                                                                                                      3,
+                                                                                                      4
+                                                                                                    ].find(function (n) {
+                                                                                                        return n % 2 === 5;
+                                                                                                      }))
+                                                                                            };
                                                                                           })
                                                                                       ],
                                                                                       tl: {
@@ -817,17 +817,17 @@ const suites_1 = {
                                                                                           "findi",
                                                                                           (function (param) {
                                                                                               return {
-                                                                                                      TAG: /* Eq */0,
-                                                                                                      _0: 1,
-                                                                                                      _1: Caml_option.undefined_to_opt([
-                                                                                                              1,
-                                                                                                              2,
-                                                                                                              3,
-                                                                                                              4
-                                                                                                            ].find(function (param, i) {
-                                                                                                                return i % 2 === 0;
-                                                                                                              }))
-                                                                                                    };
+                                                                                                TAG: /* Eq */0,
+                                                                                                _0: 1,
+                                                                                                _1: Caml_option.undefined_to_opt([
+                                                                                                        1,
+                                                                                                        2,
+                                                                                                        3,
+                                                                                                        4
+                                                                                                      ].find(function (param, i) {
+                                                                                                          return i % 2 === 0;
+                                                                                                        }))
+                                                                                              };
                                                                                             })
                                                                                         ],
                                                                                         tl: {
@@ -835,17 +835,17 @@ const suites_1 = {
                                                                                             "findi - no match",
                                                                                             (function (param) {
                                                                                                 return {
-                                                                                                        TAG: /* Eq */0,
-                                                                                                        _0: undefined,
-                                                                                                        _1: Caml_option.undefined_to_opt([
-                                                                                                                1,
-                                                                                                                2,
-                                                                                                                3,
-                                                                                                                4
-                                                                                                              ].find(function (param, i) {
-                                                                                                                  return i % 2 === 5;
-                                                                                                                }))
-                                                                                                      };
+                                                                                                  TAG: /* Eq */0,
+                                                                                                  _0: undefined,
+                                                                                                  _1: Caml_option.undefined_to_opt([
+                                                                                                          1,
+                                                                                                          2,
+                                                                                                          3,
+                                                                                                          4
+                                                                                                        ].find(function (param, i) {
+                                                                                                            return i % 2 === 5;
+                                                                                                          }))
+                                                                                                };
                                                                                               })
                                                                                           ],
                                                                                           tl: {
@@ -853,17 +853,17 @@ const suites_1 = {
                                                                                               "findIndex",
                                                                                               (function (param) {
                                                                                                   return {
-                                                                                                          TAG: /* Eq */0,
-                                                                                                          _0: 1,
-                                                                                                          _1: [
-                                                                                                              1,
-                                                                                                              2,
-                                                                                                              3,
-                                                                                                              4
-                                                                                                            ].findIndex(function (n) {
-                                                                                                                return n % 2 === 0;
-                                                                                                              })
-                                                                                                        };
+                                                                                                    TAG: /* Eq */0,
+                                                                                                    _0: 1,
+                                                                                                    _1: [
+                                                                                                        1,
+                                                                                                        2,
+                                                                                                        3,
+                                                                                                        4
+                                                                                                      ].findIndex(function (n) {
+                                                                                                          return n % 2 === 0;
+                                                                                                        })
+                                                                                                  };
                                                                                                 })
                                                                                             ],
                                                                                             tl: {
@@ -871,17 +871,17 @@ const suites_1 = {
                                                                                                 "findIndexi",
                                                                                                 (function (param) {
                                                                                                     return {
-                                                                                                            TAG: /* Eq */0,
-                                                                                                            _0: 0,
-                                                                                                            _1: [
-                                                                                                                1,
-                                                                                                                2,
-                                                                                                                3,
-                                                                                                                4
-                                                                                                              ].findIndex(function (param, i) {
-                                                                                                                  return i % 2 === 0;
-                                                                                                                })
-                                                                                                          };
+                                                                                                      TAG: /* Eq */0,
+                                                                                                      _0: 0,
+                                                                                                      _1: [
+                                                                                                          1,
+                                                                                                          2,
+                                                                                                          3,
+                                                                                                          4
+                                                                                                        ].findIndex(function (param, i) {
+                                                                                                            return i % 2 === 0;
+                                                                                                          })
+                                                                                                    };
                                                                                                   })
                                                                                               ],
                                                                                               tl: {
@@ -899,10 +899,10 @@ const suites_1 = {
                                                                                                             sum.contents = sum.contents + n | 0;
                                                                                                           });
                                                                                                       return {
-                                                                                                              TAG: /* Eq */0,
-                                                                                                              _0: 6,
-                                                                                                              _1: sum.contents
-                                                                                                            };
+                                                                                                        TAG: /* Eq */0,
+                                                                                                        _0: 6,
+                                                                                                        _1: sum.contents
+                                                                                                      };
                                                                                                     })
                                                                                                 ],
                                                                                                 tl: {
@@ -920,10 +920,10 @@ const suites_1 = {
                                                                                                               sum.contents = sum.contents + i | 0;
                                                                                                             });
                                                                                                         return {
-                                                                                                                TAG: /* Eq */0,
-                                                                                                                _0: 3,
-                                                                                                                _1: sum.contents
-                                                                                                              };
+                                                                                                          TAG: /* Eq */0,
+                                                                                                          _0: 3,
+                                                                                                          _1: sum.contents
+                                                                                                        };
                                                                                                       })
                                                                                                   ],
                                                                                                   tl: {
@@ -931,22 +931,22 @@ const suites_1 = {
                                                                                                       "map",
                                                                                                       (function (param) {
                                                                                                           return {
-                                                                                                                  TAG: /* Eq */0,
-                                                                                                                  _0: [
-                                                                                                                    2,
-                                                                                                                    4,
-                                                                                                                    6,
-                                                                                                                    8
-                                                                                                                  ],
-                                                                                                                  _1: [
-                                                                                                                      1,
-                                                                                                                      2,
-                                                                                                                      3,
-                                                                                                                      4
-                                                                                                                    ].map(function (n) {
-                                                                                                                        return (n << 1);
-                                                                                                                      })
-                                                                                                                };
+                                                                                                            TAG: /* Eq */0,
+                                                                                                            _0: [
+                                                                                                              2,
+                                                                                                              4,
+                                                                                                              6,
+                                                                                                              8
+                                                                                                            ],
+                                                                                                            _1: [
+                                                                                                                1,
+                                                                                                                2,
+                                                                                                                3,
+                                                                                                                4
+                                                                                                              ].map(function (n) {
+                                                                                                                  return (n << 1);
+                                                                                                                })
+                                                                                                          };
                                                                                                         })
                                                                                                     ],
                                                                                                     tl: {
@@ -954,22 +954,22 @@ const suites_1 = {
                                                                                                         "map",
                                                                                                         (function (param) {
                                                                                                             return {
-                                                                                                                    TAG: /* Eq */0,
-                                                                                                                    _0: [
-                                                                                                                      0,
-                                                                                                                      2,
-                                                                                                                      4,
-                                                                                                                      6
-                                                                                                                    ],
-                                                                                                                    _1: [
-                                                                                                                        1,
-                                                                                                                        2,
-                                                                                                                        3,
-                                                                                                                        4
-                                                                                                                      ].map(function (param, i) {
-                                                                                                                          return (i << 1);
-                                                                                                                        })
-                                                                                                                  };
+                                                                                                              TAG: /* Eq */0,
+                                                                                                              _0: [
+                                                                                                                0,
+                                                                                                                2,
+                                                                                                                4,
+                                                                                                                6
+                                                                                                              ],
+                                                                                                              _1: [
+                                                                                                                  1,
+                                                                                                                  2,
+                                                                                                                  3,
+                                                                                                                  4
+                                                                                                                ].map(function (param, i) {
+                                                                                                                    return (i << 1);
+                                                                                                                  })
+                                                                                                            };
                                                                                                           })
                                                                                                       ],
                                                                                                       tl: {
@@ -977,17 +977,17 @@ const suites_1 = {
                                                                                                           "reduce",
                                                                                                           (function (param) {
                                                                                                               return {
-                                                                                                                      TAG: /* Eq */0,
-                                                                                                                      _0: -10,
-                                                                                                                      _1: [
-                                                                                                                          1,
-                                                                                                                          2,
-                                                                                                                          3,
-                                                                                                                          4
-                                                                                                                        ].reduce((function (acc, n) {
-                                                                                                                              return acc - n | 0;
-                                                                                                                            }), 0)
-                                                                                                                    };
+                                                                                                                TAG: /* Eq */0,
+                                                                                                                _0: -10,
+                                                                                                                _1: [
+                                                                                                                    1,
+                                                                                                                    2,
+                                                                                                                    3,
+                                                                                                                    4
+                                                                                                                  ].reduce((function (acc, n) {
+                                                                                                                        return acc - n | 0;
+                                                                                                                      }), 0)
+                                                                                                              };
                                                                                                             })
                                                                                                         ],
                                                                                                         tl: {
@@ -995,17 +995,17 @@ const suites_1 = {
                                                                                                             "reducei",
                                                                                                             (function (param) {
                                                                                                                 return {
-                                                                                                                        TAG: /* Eq */0,
-                                                                                                                        _0: -6,
-                                                                                                                        _1: [
-                                                                                                                            1,
-                                                                                                                            2,
-                                                                                                                            3,
-                                                                                                                            4
-                                                                                                                          ].reduce((function (acc, param, i) {
-                                                                                                                                return acc - i | 0;
-                                                                                                                              }), 0)
-                                                                                                                      };
+                                                                                                                  TAG: /* Eq */0,
+                                                                                                                  _0: -6,
+                                                                                                                  _1: [
+                                                                                                                      1,
+                                                                                                                      2,
+                                                                                                                      3,
+                                                                                                                      4
+                                                                                                                    ].reduce((function (acc, param, i) {
+                                                                                                                          return acc - i | 0;
+                                                                                                                        }), 0)
+                                                                                                                };
                                                                                                               })
                                                                                                           ],
                                                                                                           tl: {
@@ -1013,17 +1013,17 @@ const suites_1 = {
                                                                                                               "reduceRight",
                                                                                                               (function (param) {
                                                                                                                   return {
-                                                                                                                          TAG: /* Eq */0,
-                                                                                                                          _0: -10,
-                                                                                                                          _1: [
-                                                                                                                              1,
-                                                                                                                              2,
-                                                                                                                              3,
-                                                                                                                              4
-                                                                                                                            ].reduceRight((function (acc, n) {
-                                                                                                                                  return acc - n | 0;
-                                                                                                                                }), 0)
-                                                                                                                        };
+                                                                                                                    TAG: /* Eq */0,
+                                                                                                                    _0: -10,
+                                                                                                                    _1: [
+                                                                                                                        1,
+                                                                                                                        2,
+                                                                                                                        3,
+                                                                                                                        4
+                                                                                                                      ].reduceRight((function (acc, n) {
+                                                                                                                            return acc - n | 0;
+                                                                                                                          }), 0)
+                                                                                                                  };
                                                                                                                 })
                                                                                                             ],
                                                                                                             tl: {
@@ -1031,17 +1031,17 @@ const suites_1 = {
                                                                                                                 "reduceRighti",
                                                                                                                 (function (param) {
                                                                                                                     return {
-                                                                                                                            TAG: /* Eq */0,
-                                                                                                                            _0: -6,
-                                                                                                                            _1: [
-                                                                                                                                1,
-                                                                                                                                2,
-                                                                                                                                3,
-                                                                                                                                4
-                                                                                                                              ].reduceRight((function (acc, param, i) {
-                                                                                                                                    return acc - i | 0;
-                                                                                                                                  }), 0)
-                                                                                                                          };
+                                                                                                                      TAG: /* Eq */0,
+                                                                                                                      _0: -6,
+                                                                                                                      _1: [
+                                                                                                                          1,
+                                                                                                                          2,
+                                                                                                                          3,
+                                                                                                                          4
+                                                                                                                        ].reduceRight((function (acc, param, i) {
+                                                                                                                              return acc - i | 0;
+                                                                                                                            }), 0)
+                                                                                                                    };
                                                                                                                   })
                                                                                                               ],
                                                                                                               tl: {
@@ -1049,17 +1049,17 @@ const suites_1 = {
                                                                                                                   "some",
                                                                                                                   (function (param) {
                                                                                                                       return {
-                                                                                                                              TAG: /* Eq */0,
-                                                                                                                              _0: false,
-                                                                                                                              _1: [
-                                                                                                                                  1,
-                                                                                                                                  2,
-                                                                                                                                  3,
-                                                                                                                                  4
-                                                                                                                                ].some(function (n) {
-                                                                                                                                    return n <= 0;
-                                                                                                                                  })
-                                                                                                                            };
+                                                                                                                        TAG: /* Eq */0,
+                                                                                                                        _0: false,
+                                                                                                                        _1: [
+                                                                                                                            1,
+                                                                                                                            2,
+                                                                                                                            3,
+                                                                                                                            4
+                                                                                                                          ].some(function (n) {
+                                                                                                                              return n <= 0;
+                                                                                                                            })
+                                                                                                                      };
                                                                                                                     })
                                                                                                                 ],
                                                                                                                 tl: {
@@ -1067,17 +1067,17 @@ const suites_1 = {
                                                                                                                     "somei",
                                                                                                                     (function (param) {
                                                                                                                         return {
-                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                _0: true,
-                                                                                                                                _1: [
-                                                                                                                                    1,
-                                                                                                                                    2,
-                                                                                                                                    3,
-                                                                                                                                    4
-                                                                                                                                  ].some(function (param, i) {
-                                                                                                                                      return i <= 0;
-                                                                                                                                    })
-                                                                                                                              };
+                                                                                                                          TAG: /* Eq */0,
+                                                                                                                          _0: true,
+                                                                                                                          _1: [
+                                                                                                                              1,
+                                                                                                                              2,
+                                                                                                                              3,
+                                                                                                                              4
+                                                                                                                            ].some(function (param, i) {
+                                                                                                                                return i <= 0;
+                                                                                                                              })
+                                                                                                                        };
                                                                                                                       })
                                                                                                                   ],
                                                                                                                   tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_blob_test.js b/jscomp/test/dist/jscomp/test/js_blob_test.js
index 25699a0f2..7c900ecae 100644
--- a/jscomp/test/dist/jscomp/test/js_blob_test.js
+++ b/jscomp/test/dist/jscomp/test/js_blob_test.js
@@ -8,10 +8,10 @@ function make_with_options(param) {
         type: "application/json"
       });
   return {
-          TAG: /* Eq */0,
-          _0: blob.type,
-          _1: "application/json"
-        };
+    TAG: /* Eq */0,
+    _0: blob.type,
+    _1: "application/json"
+  };
 }
 
 function decodeUint8Array(b) {
@@ -22,12 +22,12 @@ function decodeUint8Array(b) {
 function blob_bytes(param) {
   const file = new File(["hello"].values(), "foo.txt", undefined);
   return file.bytes().then(function (b) {
-              return Promise.resolve({
-                          TAG: /* Eq */0,
-                          _0: decodeUint8Array(b),
-                          _1: "hello"
-                        });
+        return Promise.resolve({
+              TAG: /* Eq */0,
+              _0: decodeUint8Array(b),
+              _1: "hello"
             });
+      });
 }
 
 Mt.from_pair_suites("Js_blob_test", {
diff --git a/jscomp/test/dist/jscomp/test/js_bool_test.js b/jscomp/test/dist/jscomp/test/js_bool_test.js
index 48343e310..585a4c3d8 100644
--- a/jscomp/test/dist/jscomp/test/js_bool_test.js
+++ b/jscomp/test/dist/jscomp/test/js_bool_test.js
@@ -35,10 +35,10 @@ const suites_0 = [
   "caml_bool_eq_caml_bool",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: u,
-              _1: true
-            };
+        TAG: /* Eq */0,
+        _0: u,
+        _1: true
+      };
     })
 ];
 
@@ -47,10 +47,10 @@ const suites_1 = {
     "js_bool_eq_js_bool",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: v,
-                _1: true
-              };
+          TAG: /* Eq */0,
+          _0: v,
+          _1: true
+        };
       })
   ],
   tl: {
@@ -58,10 +58,10 @@ const suites_1 = {
       "js_bool_neq_acml_bool",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: true,
-                  _1: true === true
-                };
+            TAG: /* Eq */0,
+            _0: true,
+            _1: true === true
+          };
         })
     ],
     tl: /* [] */0
@@ -103,15 +103,15 @@ function ss(x) {
 
 function bb(x) {
   return [
-          true > x,
-          true < x,
-          true >= x,
-          true <= x,
-          false > x,
-          false < x,
-          false >= x,
-          false <= x
-        ];
+    true > x,
+    true < x,
+    true >= x,
+    true <= x,
+    false > x,
+    false < x,
+    false >= x,
+    false <= x
+  ];
 }
 
 const consts = [
diff --git a/jscomp/test/dist/jscomp/test/js_date_test.js b/jscomp/test/dist/jscomp/test/js_date_test.js
index 7ddadfe2b..fa747dc42 100644
--- a/jscomp/test/dist/jscomp/test/js_date_test.js
+++ b/jscomp/test/dist/jscomp/test/js_date_test.js
@@ -14,10 +14,10 @@ const suites_0 = [
   "valueOf",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: 195131516789,
-              _1: new Date("1976-03-08T12:34:56.789+01:23").valueOf()
-            };
+        TAG: /* Eq */0,
+        _0: 195131516789,
+        _1: new Date("1976-03-08T12:34:56.789+01:23").valueOf()
+      };
     })
 ];
 
@@ -26,9 +26,9 @@ const suites_1 = {
     "make",
     (function (param) {
         return {
-                TAG: /* Ok */4,
-                _0: new Date().getTime() > 1487223505382
-              };
+          TAG: /* Ok */4,
+          _0: new Date().getTime() > 1487223505382
+        };
       })
   ],
   tl: {
@@ -36,10 +36,10 @@ const suites_1 = {
       "parseAsFloat",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: Date.parse("1976-03-08T12:34:56.789+01:23"),
-                  _1: 195131516789
-                };
+            TAG: /* Eq */0,
+            _0: Date.parse("1976-03-08T12:34:56.789+01:23"),
+            _1: 195131516789
+          };
         })
     ],
     tl: {
@@ -47,9 +47,9 @@ const suites_1 = {
         "parseAsFloat_invalid",
         (function (param) {
             return {
-                    TAG: /* Ok */4,
-                    _0: Number.isNaN(Date.parse("gibberish"))
-                  };
+              TAG: /* Ok */4,
+              _0: Number.isNaN(Date.parse("gibberish"))
+            };
           })
       ],
       tl: {
@@ -57,10 +57,10 @@ const suites_1 = {
           "fromFloat",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: "1976-03-08T11:11:56.789Z",
-                      _1: new Date(195131516789).toISOString()
-                    };
+                TAG: /* Eq */0,
+                _0: "1976-03-08T11:11:56.789Z",
+                _1: new Date(195131516789).toISOString()
+              };
             })
         ],
         tl: {
@@ -68,10 +68,10 @@ const suites_1 = {
             "fromString_valid",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: 195131516789,
-                        _1: new Date("1976-03-08T12:34:56.789+01:23").getTime()
-                      };
+                  TAG: /* Eq */0,
+                  _0: 195131516789,
+                  _1: new Date("1976-03-08T12:34:56.789+01:23").getTime()
+                };
               })
           ],
           tl: {
@@ -79,9 +79,9 @@ const suites_1 = {
               "fromString_invalid",
               (function (param) {
                   return {
-                          TAG: /* Ok */4,
-                          _0: Number.isNaN(new Date("gibberish").getTime())
-                        };
+                    TAG: /* Ok */4,
+                    _0: Number.isNaN(new Date("gibberish").getTime())
+                  };
                 })
             ],
             tl: {
@@ -90,16 +90,16 @@ const suites_1 = {
                 (function (param) {
                     const d = new Date(1984, 4);
                     return {
-                            TAG: /* Eq */0,
-                            _0: [
-                              1984,
-                              4
-                            ],
-                            _1: [
-                              d.getFullYear(),
-                              d.getMonth()
-                            ]
-                          };
+                      TAG: /* Eq */0,
+                      _0: [
+                        1984,
+                        4
+                      ],
+                      _1: [
+                        d.getFullYear(),
+                        d.getMonth()
+                      ]
+                    };
                   })
               ],
               tl: {
@@ -108,18 +108,18 @@ const suites_1 = {
                   (function (param) {
                       const d = new Date(1984, 4, 6);
                       return {
-                              TAG: /* Eq */0,
-                              _0: [
-                                1984,
-                                4,
-                                6
-                              ],
-                              _1: [
-                                d.getFullYear(),
-                                d.getMonth(),
-                                d.getDate()
-                              ]
-                            };
+                        TAG: /* Eq */0,
+                        _0: [
+                          1984,
+                          4,
+                          6
+                        ],
+                        _1: [
+                          d.getFullYear(),
+                          d.getMonth(),
+                          d.getDate()
+                        ]
+                      };
                     })
                 ],
                 tl: {
@@ -128,20 +128,20 @@ const suites_1 = {
                     (function (param) {
                         const d = new Date(1984, 4, 6, 3);
                         return {
-                                TAG: /* Eq */0,
-                                _0: [
-                                  1984,
-                                  4,
-                                  6,
-                                  3
-                                ],
-                                _1: [
-                                  d.getFullYear(),
-                                  d.getMonth(),
-                                  d.getDate(),
-                                  d.getHours()
-                                ]
-                              };
+                          TAG: /* Eq */0,
+                          _0: [
+                            1984,
+                            4,
+                            6,
+                            3
+                          ],
+                          _1: [
+                            d.getFullYear(),
+                            d.getMonth(),
+                            d.getDate(),
+                            d.getHours()
+                          ]
+                        };
                       })
                   ],
                   tl: {
@@ -150,22 +150,22 @@ const suites_1 = {
                       (function (param) {
                           const d = new Date(1984, 4, 6, 3, 59);
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: [
-                                    1984,
-                                    4,
-                                    6,
-                                    3,
-                                    59
-                                  ],
-                                  _1: [
-                                    d.getFullYear(),
-                                    d.getMonth(),
-                                    d.getDate(),
-                                    d.getHours(),
-                                    d.getMinutes()
-                                  ]
-                                };
+                            TAG: /* Eq */0,
+                            _0: [
+                              1984,
+                              4,
+                              6,
+                              3,
+                              59
+                            ],
+                            _1: [
+                              d.getFullYear(),
+                              d.getMonth(),
+                              d.getDate(),
+                              d.getHours(),
+                              d.getMinutes()
+                            ]
+                          };
                         })
                     ],
                     tl: {
@@ -174,24 +174,24 @@ const suites_1 = {
                         (function (param) {
                             const d = new Date(1984, 4, 6, 3, 59, 27);
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: [
-                                      1984,
-                                      4,
-                                      6,
-                                      3,
-                                      59,
-                                      27
-                                    ],
-                                    _1: [
-                                      d.getFullYear(),
-                                      d.getMonth(),
-                                      d.getDate(),
-                                      d.getHours(),
-                                      d.getMinutes(),
-                                      d.getSeconds()
-                                    ]
-                                  };
+                              TAG: /* Eq */0,
+                              _0: [
+                                1984,
+                                4,
+                                6,
+                                3,
+                                59,
+                                27
+                              ],
+                              _1: [
+                                d.getFullYear(),
+                                d.getMonth(),
+                                d.getDate(),
+                                d.getHours(),
+                                d.getMinutes(),
+                                d.getSeconds()
+                              ]
+                            };
                           })
                       ],
                       tl: {
@@ -201,16 +201,16 @@ const suites_1 = {
                               const d = Date.UTC(1984, 4);
                               const d$1 = new Date(d);
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: [
-                                        1984,
-                                        4
-                                      ],
-                                      _1: [
-                                        d$1.getUTCFullYear(),
-                                        d$1.getUTCMonth()
-                                      ]
-                                    };
+                                TAG: /* Eq */0,
+                                _0: [
+                                  1984,
+                                  4
+                                ],
+                                _1: [
+                                  d$1.getUTCFullYear(),
+                                  d$1.getUTCMonth()
+                                ]
+                              };
                             })
                         ],
                         tl: {
@@ -220,18 +220,18 @@ const suites_1 = {
                                 const d = Date.UTC(1984, 4, 6);
                                 const d$1 = new Date(d);
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: [
-                                          1984,
-                                          4,
-                                          6
-                                        ],
-                                        _1: [
-                                          d$1.getUTCFullYear(),
-                                          d$1.getUTCMonth(),
-                                          d$1.getUTCDate()
-                                        ]
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: [
+                                    1984,
+                                    4,
+                                    6
+                                  ],
+                                  _1: [
+                                    d$1.getUTCFullYear(),
+                                    d$1.getUTCMonth(),
+                                    d$1.getUTCDate()
+                                  ]
+                                };
                               })
                           ],
                           tl: {
@@ -241,20 +241,20 @@ const suites_1 = {
                                   const d = Date.UTC(1984, 4, 6, 3);
                                   const d$1 = new Date(d);
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: [
-                                            1984,
-                                            4,
-                                            6,
-                                            3
-                                          ],
-                                          _1: [
-                                            d$1.getUTCFullYear(),
-                                            d$1.getUTCMonth(),
-                                            d$1.getUTCDate(),
-                                            d$1.getUTCHours()
-                                          ]
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: [
+                                      1984,
+                                      4,
+                                      6,
+                                      3
+                                    ],
+                                    _1: [
+                                      d$1.getUTCFullYear(),
+                                      d$1.getUTCMonth(),
+                                      d$1.getUTCDate(),
+                                      d$1.getUTCHours()
+                                    ]
+                                  };
                                 })
                             ],
                             tl: {
@@ -264,22 +264,22 @@ const suites_1 = {
                                     const d = Date.UTC(1984, 4, 6, 3, 59);
                                     const d$1 = new Date(d);
                                     return {
-                                            TAG: /* Eq */0,
-                                            _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,
+                                      _0: [
+                                        1984,
+                                        4,
+                                        6,
+                                        3,
+                                        59
+                                      ],
+                                      _1: [
+                                        d$1.getUTCFullYear(),
+                                        d$1.getUTCMonth(),
+                                        d$1.getUTCDate(),
+                                        d$1.getUTCHours(),
+                                        d$1.getUTCMinutes()
+                                      ]
+                                    };
                                   })
                               ],
                               tl: {
@@ -289,24 +289,24 @@ const suites_1 = {
                                       const d = Date.UTC(1984, 4, 6, 3, 59, 27);
                                       const d$1 = new Date(d);
                                       return {
-                                              TAG: /* Eq */0,
-                                              _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,
+                                        _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: {
@@ -314,10 +314,10 @@ const suites_1 = {
                                     "getFullYear",
                                     (function (param) {
                                         return {
-                                                TAG: /* Eq */0,
-                                                _0: 1976,
-                                                _1: new Date("1976-03-08T12:34:56.789+01:23").getFullYear()
-                                              };
+                                          TAG: /* Eq */0,
+                                          _0: 1976,
+                                          _1: new Date("1976-03-08T12:34:56.789+01:23").getFullYear()
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -325,10 +325,10 @@ const suites_1 = {
                                       "getMilliseconds",
                                       (function (param) {
                                           return {
-                                                  TAG: /* Eq */0,
-                                                  _0: 789,
-                                                  _1: new Date("1976-03-08T12:34:56.789+01:23").getMilliseconds()
-                                                };
+                                            TAG: /* Eq */0,
+                                            _0: 789,
+                                            _1: new Date("1976-03-08T12:34:56.789+01:23").getMilliseconds()
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -336,10 +336,10 @@ const suites_1 = {
                                         "getSeconds",
                                         (function (param) {
                                             return {
-                                                    TAG: /* Eq */0,
-                                                    _0: 56,
-                                                    _1: new Date("1976-03-08T12:34:56.789+01:23").getSeconds()
-                                                  };
+                                              TAG: /* Eq */0,
+                                              _0: 56,
+                                              _1: new Date("1976-03-08T12:34:56.789+01:23").getSeconds()
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -347,10 +347,10 @@ const suites_1 = {
                                           "getTime",
                                           (function (param) {
                                               return {
-                                                      TAG: /* Eq */0,
-                                                      _0: 195131516789,
-                                                      _1: new Date("1976-03-08T12:34:56.789+01:23").getTime()
-                                                    };
+                                                TAG: /* Eq */0,
+                                                _0: 195131516789,
+                                                _1: new Date("1976-03-08T12:34:56.789+01:23").getTime()
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -358,10 +358,10 @@ const suites_1 = {
                                             "getUTCDate",
                                             (function (param) {
                                                 return {
-                                                        TAG: /* Eq */0,
-                                                        _0: 8,
-                                                        _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCDate()
-                                                      };
+                                                  TAG: /* Eq */0,
+                                                  _0: 8,
+                                                  _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCDate()
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -369,10 +369,10 @@ const suites_1 = {
                                               "getUTCDay",
                                               (function (param) {
                                                   return {
-                                                          TAG: /* Eq */0,
-                                                          _0: 1,
-                                                          _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCDay()
-                                                        };
+                                                    TAG: /* Eq */0,
+                                                    _0: 1,
+                                                    _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCDay()
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -380,10 +380,10 @@ const suites_1 = {
                                                 "getUTCFUllYear",
                                                 (function (param) {
                                                     return {
-                                                            TAG: /* Eq */0,
-                                                            _0: 1976,
-                                                            _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCFullYear()
-                                                          };
+                                                      TAG: /* Eq */0,
+                                                      _0: 1976,
+                                                      _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCFullYear()
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -391,10 +391,10 @@ const suites_1 = {
                                                   "getUTCHours",
                                                   (function (param) {
                                                       return {
-                                                              TAG: /* Eq */0,
-                                                              _0: 11,
-                                                              _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCHours()
-                                                            };
+                                                        TAG: /* Eq */0,
+                                                        _0: 11,
+                                                        _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCHours()
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -402,10 +402,10 @@ const suites_1 = {
                                                     "getUTCMilliseconds",
                                                     (function (param) {
                                                         return {
-                                                                TAG: /* Eq */0,
-                                                                _0: 789,
-                                                                _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMilliseconds()
-                                                              };
+                                                          TAG: /* Eq */0,
+                                                          _0: 789,
+                                                          _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMilliseconds()
+                                                        };
                                                       })
                                                   ],
                                                   tl: {
@@ -413,10 +413,10 @@ const suites_1 = {
                                                       "getUTCMinutes",
                                                       (function (param) {
                                                           return {
-                                                                  TAG: /* Eq */0,
-                                                                  _0: 11,
-                                                                  _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMinutes()
-                                                                };
+                                                            TAG: /* Eq */0,
+                                                            _0: 11,
+                                                            _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMinutes()
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -424,10 +424,10 @@ const suites_1 = {
                                                         "getUTCMonth",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: /* Eq */0,
-                                                                    _0: 2,
-                                                                    _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMonth()
-                                                                  };
+                                                              TAG: /* Eq */0,
+                                                              _0: 2,
+                                                              _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMonth()
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -435,10 +435,10 @@ const suites_1 = {
                                                           "getUTCSeconds",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: /* Eq */0,
-                                                                      _0: 56,
-                                                                      _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCSeconds()
-                                                                    };
+                                                                TAG: /* Eq */0,
+                                                                _0: 56,
+                                                                _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCSeconds()
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -446,10 +446,10 @@ const suites_1 = {
                                                             "getYear",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: /* Eq */0,
-                                                                        _0: 1976,
-                                                                        _1: new Date("1976-03-08T12:34:56.789+01:23").getFullYear()
-                                                                      };
+                                                                  TAG: /* Eq */0,
+                                                                  _0: 1976,
+                                                                  _1: new Date("1976-03-08T12:34:56.789+01:23").getFullYear()
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -459,10 +459,10 @@ const suites_1 = {
                                                                   const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                   d.setDate(12);
                                                                   return {
-                                                                          TAG: /* Eq */0,
-                                                                          _0: 12,
-                                                                          _1: d.getDate()
-                                                                        };
+                                                                    TAG: /* Eq */0,
+                                                                    _0: 12,
+                                                                    _1: d.getDate()
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -472,10 +472,10 @@ const suites_1 = {
                                                                     const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                     d.setFullYear(1986);
                                                                     return {
-                                                                            TAG: /* Eq */0,
-                                                                            _0: 1986,
-                                                                            _1: d.getFullYear()
-                                                                          };
+                                                                      TAG: /* Eq */0,
+                                                                      _0: 1986,
+                                                                      _1: d.getFullYear()
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -485,16 +485,16 @@ const suites_1 = {
                                                                       const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                       d.setFullYear(1986, 7);
                                                                       return {
-                                                                              TAG: /* Eq */0,
-                                                                              _0: [
-                                                                                1986,
-                                                                                7
-                                                                              ],
-                                                                              _1: [
-                                                                                d.getFullYear(),
-                                                                                d.getMonth()
-                                                                              ]
-                                                                            };
+                                                                        TAG: /* Eq */0,
+                                                                        _0: [
+                                                                          1986,
+                                                                          7
+                                                                        ],
+                                                                        _1: [
+                                                                          d.getFullYear(),
+                                                                          d.getMonth()
+                                                                        ]
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -504,18 +504,18 @@ const suites_1 = {
                                                                         const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                         d.setFullYear(1986, 7, 23);
                                                                         return {
-                                                                                TAG: /* Eq */0,
-                                                                                _0: [
-                                                                                  1986,
-                                                                                  7,
-                                                                                  23
-                                                                                ],
-                                                                                _1: [
-                                                                                  d.getFullYear(),
-                                                                                  d.getMonth(),
-                                                                                  d.getDate()
-                                                                                ]
-                                                                              };
+                                                                          TAG: /* Eq */0,
+                                                                          _0: [
+                                                                            1986,
+                                                                            7,
+                                                                            23
+                                                                          ],
+                                                                          _1: [
+                                                                            d.getFullYear(),
+                                                                            d.getMonth(),
+                                                                            d.getDate()
+                                                                          ]
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -525,10 +525,10 @@ const suites_1 = {
                                                                           const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                           d.setHours(22);
                                                                           return {
-                                                                                  TAG: /* Eq */0,
-                                                                                  _0: 22,
-                                                                                  _1: d.getHours()
-                                                                                };
+                                                                            TAG: /* Eq */0,
+                                                                            _0: 22,
+                                                                            _1: d.getHours()
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -538,16 +538,16 @@ const suites_1 = {
                                                                             const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                             d.setHours(22, 48);
                                                                             return {
-                                                                                    TAG: /* Eq */0,
-                                                                                    _0: [
-                                                                                      22,
-                                                                                      48
-                                                                                    ],
-                                                                                    _1: [
-                                                                                      d.getHours(),
-                                                                                      d.getMinutes()
-                                                                                    ]
-                                                                                  };
+                                                                              TAG: /* Eq */0,
+                                                                              _0: [
+                                                                                22,
+                                                                                48
+                                                                              ],
+                                                                              _1: [
+                                                                                d.getHours(),
+                                                                                d.getMinutes()
+                                                                              ]
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -557,18 +557,18 @@ const suites_1 = {
                                                                               const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                               d.setHours(22, 48, 54);
                                                                               return {
-                                                                                      TAG: /* Eq */0,
-                                                                                      _0: [
-                                                                                        22,
-                                                                                        48,
-                                                                                        54
-                                                                                      ],
-                                                                                      _1: [
-                                                                                        d.getHours(),
-                                                                                        d.getMinutes(),
-                                                                                        d.getSeconds()
-                                                                                      ]
-                                                                                    };
+                                                                                TAG: /* Eq */0,
+                                                                                _0: [
+                                                                                  22,
+                                                                                  48,
+                                                                                  54
+                                                                                ],
+                                                                                _1: [
+                                                                                  d.getHours(),
+                                                                                  d.getMinutes(),
+                                                                                  d.getSeconds()
+                                                                                ]
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -578,10 +578,10 @@ const suites_1 = {
                                                                                 const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                 d.setMilliseconds(543);
                                                                                 return {
-                                                                                        TAG: /* Eq */0,
-                                                                                        _0: 543,
-                                                                                        _1: d.getMilliseconds()
-                                                                                      };
+                                                                                  TAG: /* Eq */0,
+                                                                                  _0: 543,
+                                                                                  _1: d.getMilliseconds()
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -591,10 +591,10 @@ const suites_1 = {
                                                                                   const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                   d.setMinutes(18);
                                                                                   return {
-                                                                                          TAG: /* Eq */0,
-                                                                                          _0: 18,
-                                                                                          _1: d.getMinutes()
-                                                                                        };
+                                                                                    TAG: /* Eq */0,
+                                                                                    _0: 18,
+                                                                                    _1: d.getMinutes()
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -604,16 +604,16 @@ const suites_1 = {
                                                                                     const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                     d.setMinutes(18, 42);
                                                                                     return {
-                                                                                            TAG: /* Eq */0,
-                                                                                            _0: [
-                                                                                              18,
-                                                                                              42
-                                                                                            ],
-                                                                                            _1: [
-                                                                                              d.getMinutes(),
-                                                                                              d.getSeconds()
-                                                                                            ]
-                                                                                          };
+                                                                                      TAG: /* Eq */0,
+                                                                                      _0: [
+                                                                                        18,
+                                                                                        42
+                                                                                      ],
+                                                                                      _1: [
+                                                                                        d.getMinutes(),
+                                                                                        d.getSeconds()
+                                                                                      ]
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -623,18 +623,18 @@ const suites_1 = {
                                                                                       const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                       d.setMinutes(18, 42, 311);
                                                                                       return {
-                                                                                              TAG: /* Eq */0,
-                                                                                              _0: [
-                                                                                                18,
-                                                                                                42,
-                                                                                                311
-                                                                                              ],
-                                                                                              _1: [
-                                                                                                d.getMinutes(),
-                                                                                                d.getSeconds(),
-                                                                                                d.getMilliseconds()
-                                                                                              ]
-                                                                                            };
+                                                                                        TAG: /* Eq */0,
+                                                                                        _0: [
+                                                                                          18,
+                                                                                          42,
+                                                                                          311
+                                                                                        ],
+                                                                                        _1: [
+                                                                                          d.getMinutes(),
+                                                                                          d.getSeconds(),
+                                                                                          d.getMilliseconds()
+                                                                                        ]
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -644,10 +644,10 @@ const suites_1 = {
                                                                                         const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                         d.setMonth(10);
                                                                                         return {
-                                                                                                TAG: /* Eq */0,
-                                                                                                _0: 10,
-                                                                                                _1: d.getMonth()
-                                                                                              };
+                                                                                          TAG: /* Eq */0,
+                                                                                          _0: 10,
+                                                                                          _1: d.getMonth()
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -657,16 +657,16 @@ const suites_1 = {
                                                                                           const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                           d.setMonth(10, 14);
                                                                                           return {
-                                                                                                  TAG: /* Eq */0,
-                                                                                                  _0: [
-                                                                                                    10,
-                                                                                                    14
-                                                                                                  ],
-                                                                                                  _1: [
-                                                                                                    d.getMonth(),
-                                                                                                    d.getDate()
-                                                                                                  ]
-                                                                                                };
+                                                                                            TAG: /* Eq */0,
+                                                                                            _0: [
+                                                                                              10,
+                                                                                              14
+                                                                                            ],
+                                                                                            _1: [
+                                                                                              d.getMonth(),
+                                                                                              d.getDate()
+                                                                                            ]
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: {
@@ -676,10 +676,10 @@ const suites_1 = {
                                                                                             const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                             d.setSeconds(36);
                                                                                             return {
-                                                                                                    TAG: /* Eq */0,
-                                                                                                    _0: 36,
-                                                                                                    _1: d.getSeconds()
-                                                                                                  };
+                                                                                              TAG: /* Eq */0,
+                                                                                              _0: 36,
+                                                                                              _1: d.getSeconds()
+                                                                                            };
                                                                                           })
                                                                                       ],
                                                                                       tl: {
@@ -689,16 +689,16 @@ const suites_1 = {
                                                                                               const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                               d.setSeconds(36, 420);
                                                                                               return {
-                                                                                                      TAG: /* Eq */0,
-                                                                                                      _0: [
-                                                                                                        36,
-                                                                                                        420
-                                                                                                      ],
-                                                                                                      _1: [
-                                                                                                        d.getSeconds(),
-                                                                                                        d.getMilliseconds()
-                                                                                                      ]
-                                                                                                    };
+                                                                                                TAG: /* Eq */0,
+                                                                                                _0: [
+                                                                                                  36,
+                                                                                                  420
+                                                                                                ],
+                                                                                                _1: [
+                                                                                                  d.getSeconds(),
+                                                                                                  d.getMilliseconds()
+                                                                                                ]
+                                                                                              };
                                                                                             })
                                                                                         ],
                                                                                         tl: {
@@ -708,10 +708,10 @@ const suites_1 = {
                                                                                                 const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                 d.setUTCDate(12);
                                                                                                 return {
-                                                                                                        TAG: /* Eq */0,
-                                                                                                        _0: 12,
-                                                                                                        _1: d.getUTCDate()
-                                                                                                      };
+                                                                                                  TAG: /* Eq */0,
+                                                                                                  _0: 12,
+                                                                                                  _1: d.getUTCDate()
+                                                                                                };
                                                                                               })
                                                                                           ],
                                                                                           tl: {
@@ -721,10 +721,10 @@ const suites_1 = {
                                                                                                   const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                   d.setUTCFullYear(1986);
                                                                                                   return {
-                                                                                                          TAG: /* Eq */0,
-                                                                                                          _0: 1986,
-                                                                                                          _1: d.getUTCFullYear()
-                                                                                                        };
+                                                                                                    TAG: /* Eq */0,
+                                                                                                    _0: 1986,
+                                                                                                    _1: d.getUTCFullYear()
+                                                                                                  };
                                                                                                 })
                                                                                             ],
                                                                                             tl: {
@@ -734,16 +734,16 @@ const suites_1 = {
                                                                                                     const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                     d.setUTCFullYear(1986, 7);
                                                                                                     return {
-                                                                                                            TAG: /* Eq */0,
-                                                                                                            _0: [
-                                                                                                              1986,
-                                                                                                              7
-                                                                                                            ],
-                                                                                                            _1: [
-                                                                                                              d.getUTCFullYear(),
-                                                                                                              d.getUTCMonth()
-                                                                                                            ]
-                                                                                                          };
+                                                                                                      TAG: /* Eq */0,
+                                                                                                      _0: [
+                                                                                                        1986,
+                                                                                                        7
+                                                                                                      ],
+                                                                                                      _1: [
+                                                                                                        d.getUTCFullYear(),
+                                                                                                        d.getUTCMonth()
+                                                                                                      ]
+                                                                                                    };
                                                                                                   })
                                                                                               ],
                                                                                               tl: {
@@ -753,18 +753,18 @@ const suites_1 = {
                                                                                                       const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                       d.setUTCFullYear(1986, 7, 23);
                                                                                                       return {
-                                                                                                              TAG: /* Eq */0,
-                                                                                                              _0: [
-                                                                                                                1986,
-                                                                                                                7,
-                                                                                                                23
-                                                                                                              ],
-                                                                                                              _1: [
-                                                                                                                d.getUTCFullYear(),
-                                                                                                                d.getUTCMonth(),
-                                                                                                                d.getUTCDate()
-                                                                                                              ]
-                                                                                                            };
+                                                                                                        TAG: /* Eq */0,
+                                                                                                        _0: [
+                                                                                                          1986,
+                                                                                                          7,
+                                                                                                          23
+                                                                                                        ],
+                                                                                                        _1: [
+                                                                                                          d.getUTCFullYear(),
+                                                                                                          d.getUTCMonth(),
+                                                                                                          d.getUTCDate()
+                                                                                                        ]
+                                                                                                      };
                                                                                                     })
                                                                                                 ],
                                                                                                 tl: {
@@ -774,10 +774,10 @@ const suites_1 = {
                                                                                                         const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                         d.setUTCHours(22);
                                                                                                         return {
-                                                                                                                TAG: /* Eq */0,
-                                                                                                                _0: 22,
-                                                                                                                _1: d.getUTCHours()
-                                                                                                              };
+                                                                                                          TAG: /* Eq */0,
+                                                                                                          _0: 22,
+                                                                                                          _1: d.getUTCHours()
+                                                                                                        };
                                                                                                       })
                                                                                                   ],
                                                                                                   tl: {
@@ -787,16 +787,16 @@ const suites_1 = {
                                                                                                           const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                           d.setUTCHours(22, 48);
                                                                                                           return {
-                                                                                                                  TAG: /* Eq */0,
-                                                                                                                  _0: [
-                                                                                                                    22,
-                                                                                                                    48
-                                                                                                                  ],
-                                                                                                                  _1: [
-                                                                                                                    d.getUTCHours(),
-                                                                                                                    d.getUTCMinutes()
-                                                                                                                  ]
-                                                                                                                };
+                                                                                                            TAG: /* Eq */0,
+                                                                                                            _0: [
+                                                                                                              22,
+                                                                                                              48
+                                                                                                            ],
+                                                                                                            _1: [
+                                                                                                              d.getUTCHours(),
+                                                                                                              d.getUTCMinutes()
+                                                                                                            ]
+                                                                                                          };
                                                                                                         })
                                                                                                     ],
                                                                                                     tl: {
@@ -806,18 +806,18 @@ const suites_1 = {
                                                                                                             const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                             d.setUTCHours(22, 48, 54);
                                                                                                             return {
-                                                                                                                    TAG: /* Eq */0,
-                                                                                                                    _0: [
-                                                                                                                      22,
-                                                                                                                      48,
-                                                                                                                      54
-                                                                                                                    ],
-                                                                                                                    _1: [
-                                                                                                                      d.getUTCHours(),
-                                                                                                                      d.getUTCMinutes(),
-                                                                                                                      d.getUTCSeconds()
-                                                                                                                    ]
-                                                                                                                  };
+                                                                                                              TAG: /* Eq */0,
+                                                                                                              _0: [
+                                                                                                                22,
+                                                                                                                48,
+                                                                                                                54
+                                                                                                              ],
+                                                                                                              _1: [
+                                                                                                                d.getUTCHours(),
+                                                                                                                d.getUTCMinutes(),
+                                                                                                                d.getUTCSeconds()
+                                                                                                              ]
+                                                                                                            };
                                                                                                           })
                                                                                                       ],
                                                                                                       tl: {
@@ -827,10 +827,10 @@ const suites_1 = {
                                                                                                               const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                               d.setUTCMilliseconds(543);
                                                                                                               return {
-                                                                                                                      TAG: /* Eq */0,
-                                                                                                                      _0: 543,
-                                                                                                                      _1: d.getUTCMilliseconds()
-                                                                                                                    };
+                                                                                                                TAG: /* Eq */0,
+                                                                                                                _0: 543,
+                                                                                                                _1: d.getUTCMilliseconds()
+                                                                                                              };
                                                                                                             })
                                                                                                         ],
                                                                                                         tl: {
@@ -840,10 +840,10 @@ const suites_1 = {
                                                                                                                 const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                                 d.setUTCMinutes(18);
                                                                                                                 return {
-                                                                                                                        TAG: /* Eq */0,
-                                                                                                                        _0: 18,
-                                                                                                                        _1: d.getUTCMinutes()
-                                                                                                                      };
+                                                                                                                  TAG: /* Eq */0,
+                                                                                                                  _0: 18,
+                                                                                                                  _1: d.getUTCMinutes()
+                                                                                                                };
                                                                                                               })
                                                                                                           ],
                                                                                                           tl: {
@@ -853,16 +853,16 @@ const suites_1 = {
                                                                                                                   const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                                   d.setUTCMinutes(18, 42);
                                                                                                                   return {
-                                                                                                                          TAG: /* Eq */0,
-                                                                                                                          _0: [
-                                                                                                                            18,
-                                                                                                                            42
-                                                                                                                          ],
-                                                                                                                          _1: [
-                                                                                                                            d.getUTCMinutes(),
-                                                                                                                            d.getUTCSeconds()
-                                                                                                                          ]
-                                                                                                                        };
+                                                                                                                    TAG: /* Eq */0,
+                                                                                                                    _0: [
+                                                                                                                      18,
+                                                                                                                      42
+                                                                                                                    ],
+                                                                                                                    _1: [
+                                                                                                                      d.getUTCMinutes(),
+                                                                                                                      d.getUTCSeconds()
+                                                                                                                    ]
+                                                                                                                  };
                                                                                                                 })
                                                                                                             ],
                                                                                                             tl: {
@@ -872,18 +872,18 @@ const suites_1 = {
                                                                                                                     const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                                     d.setUTCMinutes(18, 42, 311);
                                                                                                                     return {
-                                                                                                                            TAG: /* Eq */0,
-                                                                                                                            _0: [
-                                                                                                                              18,
-                                                                                                                              42,
-                                                                                                                              311
-                                                                                                                            ],
-                                                                                                                            _1: [
-                                                                                                                              d.getUTCMinutes(),
-                                                                                                                              d.getUTCSeconds(),
-                                                                                                                              d.getUTCMilliseconds()
-                                                                                                                            ]
-                                                                                                                          };
+                                                                                                                      TAG: /* Eq */0,
+                                                                                                                      _0: [
+                                                                                                                        18,
+                                                                                                                        42,
+                                                                                                                        311
+                                                                                                                      ],
+                                                                                                                      _1: [
+                                                                                                                        d.getUTCMinutes(),
+                                                                                                                        d.getUTCSeconds(),
+                                                                                                                        d.getUTCMilliseconds()
+                                                                                                                      ]
+                                                                                                                    };
                                                                                                                   })
                                                                                                               ],
                                                                                                               tl: {
@@ -893,10 +893,10 @@ const suites_1 = {
                                                                                                                       const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                                       d.setUTCMonth(10);
                                                                                                                       return {
-                                                                                                                              TAG: /* Eq */0,
-                                                                                                                              _0: 10,
-                                                                                                                              _1: d.getUTCMonth()
-                                                                                                                            };
+                                                                                                                        TAG: /* Eq */0,
+                                                                                                                        _0: 10,
+                                                                                                                        _1: d.getUTCMonth()
+                                                                                                                      };
                                                                                                                     })
                                                                                                                 ],
                                                                                                                 tl: {
@@ -906,16 +906,16 @@ const suites_1 = {
                                                                                                                         const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                                         d.setUTCMonth(10, 14);
                                                                                                                         return {
-                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                _0: [
-                                                                                                                                  10,
-                                                                                                                                  14
-                                                                                                                                ],
-                                                                                                                                _1: [
-                                                                                                                                  d.getUTCMonth(),
-                                                                                                                                  d.getUTCDate()
-                                                                                                                                ]
-                                                                                                                              };
+                                                                                                                          TAG: /* Eq */0,
+                                                                                                                          _0: [
+                                                                                                                            10,
+                                                                                                                            14
+                                                                                                                          ],
+                                                                                                                          _1: [
+                                                                                                                            d.getUTCMonth(),
+                                                                                                                            d.getUTCDate()
+                                                                                                                          ]
+                                                                                                                        };
                                                                                                                       })
                                                                                                                   ],
                                                                                                                   tl: {
@@ -925,10 +925,10 @@ const suites_1 = {
                                                                                                                           const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                                           d.setUTCSeconds(36);
                                                                                                                           return {
-                                                                                                                                  TAG: /* Eq */0,
-                                                                                                                                  _0: 36,
-                                                                                                                                  _1: d.getUTCSeconds()
-                                                                                                                                };
+                                                                                                                            TAG: /* Eq */0,
+                                                                                                                            _0: 36,
+                                                                                                                            _1: d.getUTCSeconds()
+                                                                                                                          };
                                                                                                                         })
                                                                                                                     ],
                                                                                                                     tl: {
@@ -938,16 +938,16 @@ const suites_1 = {
                                                                                                                             const d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                                             d.setUTCSeconds(36, 420);
                                                                                                                             return {
-                                                                                                                                    TAG: /* Eq */0,
-                                                                                                                                    _0: [
-                                                                                                                                      36,
-                                                                                                                                      420
-                                                                                                                                    ],
-                                                                                                                                    _1: [
-                                                                                                                                      d.getUTCSeconds(),
-                                                                                                                                      d.getUTCMilliseconds()
-                                                                                                                                    ]
-                                                                                                                                  };
+                                                                                                                              TAG: /* Eq */0,
+                                                                                                                              _0: [
+                                                                                                                                36,
+                                                                                                                                420
+                                                                                                                              ],
+                                                                                                                              _1: [
+                                                                                                                                d.getUTCSeconds(),
+                                                                                                                                d.getUTCMilliseconds()
+                                                                                                                              ]
+                                                                                                                            };
                                                                                                                           })
                                                                                                                       ],
                                                                                                                       tl: {
@@ -955,10 +955,10 @@ const suites_1 = {
                                                                                                                           "toDateString",
                                                                                                                           (function (param) {
                                                                                                                               return {
-                                                                                                                                      TAG: /* Eq */0,
-                                                                                                                                      _0: "Mon Mar 08 1976",
-                                                                                                                                      _1: new Date("1976-03-08T12:34:56.789+01:23").toDateString()
-                                                                                                                                    };
+                                                                                                                                TAG: /* Eq */0,
+                                                                                                                                _0: "Mon Mar 08 1976",
+                                                                                                                                _1: new Date("1976-03-08T12:34:56.789+01:23").toDateString()
+                                                                                                                              };
                                                                                                                             })
                                                                                                                         ],
                                                                                                                         tl: {
@@ -966,10 +966,10 @@ const suites_1 = {
                                                                                                                             "toGMTString",
                                                                                                                             (function (param) {
                                                                                                                                 return {
-                                                                                                                                        TAG: /* Eq */0,
-                                                                                                                                        _0: "Mon, 08 Mar 1976 11:11:56 GMT",
-                                                                                                                                        _1: new Date("1976-03-08T12:34:56.789+01:23").toUTCString()
-                                                                                                                                      };
+                                                                                                                                  TAG: /* Eq */0,
+                                                                                                                                  _0: "Mon, 08 Mar 1976 11:11:56 GMT",
+                                                                                                                                  _1: new Date("1976-03-08T12:34:56.789+01:23").toUTCString()
+                                                                                                                                };
                                                                                                                               })
                                                                                                                           ],
                                                                                                                           tl: {
@@ -977,10 +977,10 @@ const suites_1 = {
                                                                                                                               "toISOString",
                                                                                                                               (function (param) {
                                                                                                                                   return {
-                                                                                                                                          TAG: /* Eq */0,
-                                                                                                                                          _0: "1976-03-08T11:11:56.789Z",
-                                                                                                                                          _1: new Date("1976-03-08T12:34:56.789+01:23").toISOString()
-                                                                                                                                        };
+                                                                                                                                    TAG: /* Eq */0,
+                                                                                                                                    _0: "1976-03-08T11:11:56.789Z",
+                                                                                                                                    _1: new Date("1976-03-08T12:34:56.789+01:23").toISOString()
+                                                                                                                                  };
                                                                                                                                 })
                                                                                                                             ],
                                                                                                                             tl: {
@@ -988,10 +988,10 @@ const suites_1 = {
                                                                                                                                 "toJSON",
                                                                                                                                 (function (param) {
                                                                                                                                     return {
-                                                                                                                                            TAG: /* Eq */0,
-                                                                                                                                            _0: "1976-03-08T11:11:56.789Z",
-                                                                                                                                            _1: Stdlib__Option.get(Caml_option.undefined_to_opt(new Date("1976-03-08T12:34:56.789+01:23").toJSON()))
-                                                                                                                                          };
+                                                                                                                                      TAG: /* Eq */0,
+                                                                                                                                      _0: "1976-03-08T11:11:56.789Z",
+                                                                                                                                      _1: Stdlib__Option.get(Caml_option.undefined_to_opt(new Date("1976-03-08T12:34:56.789+01:23").toJSON()))
+                                                                                                                                    };
                                                                                                                                   })
                                                                                                                               ],
                                                                                                                               tl: {
@@ -999,10 +999,10 @@ const suites_1 = {
                                                                                                                                   "toJSONUnsafe",
                                                                                                                                   (function (param) {
                                                                                                                                       return {
-                                                                                                                                              TAG: /* Eq */0,
-                                                                                                                                              _0: "1976-03-08T11:11:56.789Z",
-                                                                                                                                              _1: new Date("1976-03-08T12:34:56.789+01:23").toJSON()
-                                                                                                                                            };
+                                                                                                                                        TAG: /* Eq */0,
+                                                                                                                                        _0: "1976-03-08T11:11:56.789Z",
+                                                                                                                                        _1: new Date("1976-03-08T12:34:56.789+01:23").toJSON()
+                                                                                                                                      };
                                                                                                                                     })
                                                                                                                                 ],
                                                                                                                                 tl: {
@@ -1010,10 +1010,10 @@ const suites_1 = {
                                                                                                                                     "toUTCString",
                                                                                                                                     (function (param) {
                                                                                                                                         return {
-                                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                                _0: "Mon, 08 Mar 1976 11:11:56 GMT",
-                                                                                                                                                _1: new Date("1976-03-08T12:34:56.789+01:23").toUTCString()
-                                                                                                                                              };
+                                                                                                                                          TAG: /* Eq */0,
+                                                                                                                                          _0: "Mon, 08 Mar 1976 11:11:56 GMT",
+                                                                                                                                          _1: new Date("1976-03-08T12:34:56.789+01:23").toUTCString()
+                                                                                                                                        };
                                                                                                                                       })
                                                                                                                                   ],
                                                                                                                                   tl: {
@@ -1024,9 +1024,9 @@ const suites_1 = {
                                                                                                                                           const b = new Date("2013-03-01T01:10:00");
                                                                                                                                           const c = new Date("2013-03-01T01:10:01");
                                                                                                                                           return {
-                                                                                                                                                  TAG: /* Ok */4,
-                                                                                                                                                  _0: Caml_obj.caml_equal(a, b) && Caml_obj.caml_notequal(b, c) && Caml_obj.caml_greaterthan(c, b)
-                                                                                                                                                };
+                                                                                                                                            TAG: /* Ok */4,
+                                                                                                                                            _0: Caml_obj.caml_equal(a, b) && Caml_obj.caml_notequal(b, c) && Caml_obj.caml_greaterthan(c, b)
+                                                                                                                                          };
                                                                                                                                         })
                                                                                                                                     ],
                                                                                                                                     tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_dict_test.js b/jscomp/test/dist/jscomp/test/js_dict_test.js
index e5fe271a0..aa8c1ae70 100644
--- a/jscomp/test/dist/jscomp/test/js_dict_test.js
+++ b/jscomp/test/dist/jscomp/test/js_dict_test.js
@@ -6,19 +6,19 @@ const Mt = require("./mt.js");
 
 function obj(param) {
   return {
-          foo: 43,
-          bar: 86
-        };
+    foo: 43,
+    bar: 86
+  };
 }
 
 const suites_0 = [
   "empty",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: [],
-              _1: Object.keys({})
-            };
+        TAG: /* Eq */0,
+        _0: [],
+        _1: Object.keys({})
+      };
     })
 ];
 
@@ -27,13 +27,13 @@ const suites_1 = {
     "get",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: 43,
-                _1: Js__Js_dict.get({
-                      foo: 43,
-                      bar: 86
-                    }, "foo")
-              };
+          TAG: /* Eq */0,
+          _0: 43,
+          _1: Js__Js_dict.get({
+                foo: 43,
+                bar: 86
+              }, "foo")
+        };
       })
   ],
   tl: {
@@ -41,13 +41,13 @@ const suites_1 = {
       "get - property not in object",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: undefined,
-                  _1: Js__Js_dict.get({
-                        foo: 43,
-                        bar: 86
-                      }, "baz")
-                };
+            TAG: /* Eq */0,
+            _0: undefined,
+            _1: Js__Js_dict.get({
+                  foo: 43,
+                  bar: 86
+                }, "baz")
+          };
         })
     ],
     tl: {
@@ -55,13 +55,13 @@ const suites_1 = {
         "unsafe_get",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: 43,
-                    _1: ({
-                          foo: 43,
-                          bar: 86
-                        })["foo"]
-                  };
+              TAG: /* Eq */0,
+              _0: 43,
+              _1: ({
+                  foo: 43,
+                  bar: 86
+                })["foo"]
+            };
           })
       ],
       tl: {
@@ -74,10 +74,10 @@ const suites_1 = {
               };
               o["foo"] = 36;
               return {
-                      TAG: /* Eq */0,
-                      _0: 36,
-                      _1: Js__Js_dict.get(o, "foo")
-                    };
+                TAG: /* Eq */0,
+                _0: 36,
+                _1: Js__Js_dict.get(o, "foo")
+              };
             })
         ],
         tl: {
@@ -85,16 +85,16 @@ const suites_1 = {
             "keys",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: [
-                          "foo",
-                          "bar"
-                        ],
-                        _1: Object.keys({
-                              foo: 43,
-                              bar: 86
-                            })
-                      };
+                  TAG: /* Eq */0,
+                  _0: [
+                    "foo",
+                    "bar"
+                  ],
+                  _1: Object.keys({
+                        foo: 43,
+                        bar: 86
+                      })
+                };
               })
           ],
           tl: {
@@ -102,22 +102,22 @@ const suites_1 = {
               "entries",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: [
-                            [
-                              "foo",
-                              43
-                            ],
-                            [
-                              "bar",
-                              86
-                            ]
-                          ],
-                          _1: Js__Js_dict.entries({
-                                foo: 43,
-                                bar: 86
-                              })
-                        };
+                    TAG: /* Eq */0,
+                    _0: [
+                      [
+                        "foo",
+                        43
+                      ],
+                      [
+                        "bar",
+                        86
+                      ]
+                    ],
+                    _1: Js__Js_dict.entries({
+                          foo: 43,
+                          bar: 86
+                        })
+                  };
                 })
             ],
             tl: {
@@ -125,16 +125,16 @@ const suites_1 = {
                 "values",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: [
-                              43,
-                              86
-                            ],
-                            _1: Js__Js_dict.values({
-                                  foo: 43,
-                                  bar: 86
-                                })
-                          };
+                      TAG: /* Eq */0,
+                      _0: [
+                        43,
+                        86
+                      ],
+                      _1: Js__Js_dict.values({
+                            foo: 43,
+                            bar: 86
+                          })
+                    };
                   })
               ],
               tl: {
@@ -142,10 +142,10 @@ const suites_1 = {
                   "fromList - []",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: {},
-                              _1: Js__Js_dict.fromList(/* [] */0)
-                            };
+                        TAG: /* Eq */0,
+                        _0: {},
+                        _1: Js__Js_dict.fromList(/* [] */0)
+                      };
                     })
                 ],
                 tl: {
@@ -153,31 +153,31 @@ const suites_1 = {
                     "fromList",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: [
-                                  [
-                                    "x",
-                                    23
-                                  ],
-                                  [
-                                    "y",
-                                    46
-                                  ]
-                                ],
-                                _1: Js__Js_dict.entries(Js__Js_dict.fromList({
-                                          hd: [
-                                            "x",
-                                            23
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "y",
-                                              46
-                                            ],
-                                            tl: /* [] */0
-                                          }
-                                        }))
-                              };
+                          TAG: /* Eq */0,
+                          _0: [
+                            [
+                              "x",
+                              23
+                            ],
+                            [
+                              "y",
+                              46
+                            ]
+                          ],
+                          _1: Js__Js_dict.entries(Js__Js_dict.fromList({
+                                    hd: [
+                                      "x",
+                                      23
+                                    ],
+                                    tl: {
+                                      hd: [
+                                        "y",
+                                        46
+                                      ],
+                                      tl: /* [] */0
+                                    }
+                                  }))
+                        };
                       })
                   ],
                   tl: {
@@ -185,10 +185,10 @@ const suites_1 = {
                       "fromArray - []",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: {},
-                                  _1: Js__Js_dict.fromArray([])
-                                };
+                            TAG: /* Eq */0,
+                            _0: {},
+                            _1: Js__Js_dict.fromArray([])
+                          };
                         })
                     ],
                     tl: {
@@ -196,28 +196,28 @@ const suites_1 = {
                         "fromArray",
                         (function (param) {
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: [
-                                      [
-                                        "x",
-                                        23
-                                      ],
-                                      [
-                                        "y",
-                                        46
-                                      ]
-                                    ],
-                                    _1: Js__Js_dict.entries(Js__Js_dict.fromArray([
-                                              [
-                                                "x",
-                                                23
-                                              ],
-                                              [
-                                                "y",
-                                                46
-                                              ]
-                                            ]))
-                                  };
+                              TAG: /* Eq */0,
+                              _0: [
+                                [
+                                  "x",
+                                  23
+                                ],
+                                [
+                                  "y",
+                                  46
+                                ]
+                              ],
+                              _1: Js__Js_dict.entries(Js__Js_dict.fromArray([
+                                        [
+                                          "x",
+                                          23
+                                        ],
+                                        [
+                                          "y",
+                                          46
+                                        ]
+                                      ]))
+                            };
                           })
                       ],
                       tl: {
@@ -225,18 +225,18 @@ const suites_1 = {
                           "map",
                           (function (param) {
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: {
-                                        foo: "43",
-                                        bar: "86"
-                                      },
-                                      _1: Js__Js_dict.map((function (i) {
-                                              return String(i);
-                                            }), {
-                                            foo: 43,
-                                            bar: 86
-                                          })
-                                    };
+                                TAG: /* Eq */0,
+                                _0: {
+                                  foo: "43",
+                                  bar: "86"
+                                },
+                                _1: Js__Js_dict.map((function (i) {
+                                        return String(i);
+                                      }), {
+                                      foo: 43,
+                                      bar: 86
+                                    })
+                              };
                             })
                         ],
                         tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_exception_catch_test.js b/jscomp/test/dist/jscomp/test/js_exception_catch_test.js
index dd375fd0f..7a843134a 100644
--- a/jscomp/test/dist/jscomp/test/js_exception_catch_test.js
+++ b/jscomp/test/dist/jscomp/test/js_exception_catch_test.js
@@ -31,28 +31,28 @@ function add_test(loc, test) {
 function eq(loc, x, y) {
   add_test(loc, (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         }));
 }
 
 function false_(loc) {
   add_test(loc, (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }));
 }
 
 function true_(loc) {
   add_test(loc, (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: true
-                };
+            TAG: /* Ok */4,
+            _0: true
+          };
         }));
 }
 
@@ -69,9 +69,9 @@ catch (raw_x){
   if (x.MEL_EXN_ID === Js__Js_exn.$$Error) {
     add_test("File \"jscomp/test/js_exception_catch_test.ml\", line 21, characters 10-17", (function (param) {
             return {
-                    TAG: /* Ok */4,
-                    _0: true
-                  };
+              TAG: /* Ok */4,
+              _0: true
+            };
           }));
   } else {
     throw new Caml_js_exceptions.MelangeError(x.MEL_EXN_ID, x);
@@ -81,9 +81,9 @@ catch (raw_x){
 if (exit === 1) {
   add_test("File \"jscomp/test/js_exception_catch_test.ml\", line 22, characters 16-23", (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }));
 }
 
@@ -136,58 +136,58 @@ eq("File \"jscomp/test/js_exception_catch_test.ml\", line 43, characters 5-12",
 
 eq("File \"jscomp/test/js_exception_catch_test.ml\", line 44, characters 5-12", test(function (param) {
           throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                    MEL_EXN_ID: Stdlib.Not_found
-                  });
+                MEL_EXN_ID: Stdlib.Not_found
+              });
         }), "Not_found");
 
 eq("File \"jscomp/test/js_exception_catch_test.ml\", line 45, characters 5-12", test(function (param) {
           throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                    MEL_EXN_ID: "Invalid_argument",
-                    _1: "x"
-                  });
+                MEL_EXN_ID: "Invalid_argument",
+                _1: "x"
+              });
         }), "Invalid_argument");
 
 eq("File \"jscomp/test/js_exception_catch_test.ml\", line 46, characters 5-12", test(function (param) {
           throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                    MEL_EXN_ID: "Invalid_argument",
-                    _1: ""
-                  });
+                MEL_EXN_ID: "Invalid_argument",
+                _1: ""
+              });
         }), "Invalid_any");
 
 eq("File \"jscomp/test/js_exception_catch_test.ml\", line 47, characters 5-12", test(function (param) {
           throw new Caml_js_exceptions.MelangeError(A, {
-                    MEL_EXN_ID: A,
-                    _1: 2
-                  });
+                MEL_EXN_ID: A,
+                _1: 2
+              });
         }), "A2");
 
 eq("File \"jscomp/test/js_exception_catch_test.ml\", line 48, characters 5-12", test(function (param) {
           throw new Caml_js_exceptions.MelangeError(A, {
-                    MEL_EXN_ID: A,
-                    _1: 3
-                  });
+                MEL_EXN_ID: A,
+                _1: 3
+              });
         }), "A_any");
 
 eq("File \"jscomp/test/js_exception_catch_test.ml\", line 49, characters 5-12", test(function (param) {
           throw new Caml_js_exceptions.MelangeError(B, {
-                    MEL_EXN_ID: B
-                  });
+                MEL_EXN_ID: B
+              });
         }), "B");
 
 eq("File \"jscomp/test/js_exception_catch_test.ml\", line 50, characters 5-12", test(function (param) {
           throw new Caml_js_exceptions.MelangeError(C, {
-                    MEL_EXN_ID: C,
-                    _1: 1,
-                    _2: 2
-                  });
+                MEL_EXN_ID: C,
+                _1: 1,
+                _2: 2
+              });
         }), "C");
 
 eq("File \"jscomp/test/js_exception_catch_test.ml\", line 51, characters 5-12", test(function (param) {
           throw new Caml_js_exceptions.MelangeError(C, {
-                    MEL_EXN_ID: C,
-                    _1: 0,
-                    _2: 2
-                  });
+                MEL_EXN_ID: C,
+                _1: 0,
+                _2: 2
+              });
         }), "C_any");
 
 eq("File \"jscomp/test/js_exception_catch_test.ml\", line 52, characters 5-12", test(function (param) {
@@ -196,9 +196,9 @@ eq("File \"jscomp/test/js_exception_catch_test.ml\", line 52, characters 5-12",
 
 eq("File \"jscomp/test/js_exception_catch_test.ml\", line 53, characters 5-12", test(function (param) {
           throw new Caml_js_exceptions.MelangeError("Failure", {
-                    MEL_EXN_ID: "Failure",
-                    _1: "x"
-                  });
+                MEL_EXN_ID: "Failure",
+                _1: "x"
+              });
         }), "Any");
 
 Mt.from_pair_suites("Js_exception_catch_test", suites.contents);
diff --git a/jscomp/test/dist/jscomp/test/js_file_test.js b/jscomp/test/dist/jscomp/test/js_file_test.js
index 7c5bca5e0..5e7f57aa6 100644
--- a/jscomp/test/dist/jscomp/test/js_file_test.js
+++ b/jscomp/test/dist/jscomp/test/js_file_test.js
@@ -8,28 +8,28 @@ function make_with_options(param) {
         lastModified: 0
       });
   return {
-          TAG: /* Eq */0,
-          _0: file.lastModified,
-          _1: 0
-        };
+    TAG: /* Eq */0,
+    _0: file.lastModified,
+    _1: 0
+  };
 }
 
 function file_size(param) {
   const file = new File(["hello"].values(), "foo.txt", undefined);
   return {
-          TAG: /* Eq */0,
-          _0: file.size,
-          _1: 5
-        };
+    TAG: /* Eq */0,
+    _0: file.size,
+    _1: 5
+  };
 }
 
 function file_type(param) {
   const file = new File(["hello"].values(), "foo.txt", undefined);
   return {
-          TAG: /* Eq */0,
-          _0: file.type,
-          _1: ""
-        };
+    TAG: /* Eq */0,
+    _0: file.type,
+    _1: ""
+  };
 }
 
 Mt.from_pair_suites("Js_file_test", {
diff --git a/jscomp/test/dist/jscomp/test/js_float_test.js b/jscomp/test/dist/jscomp/test/js_float_test.js
index 897308436..bbe9f39d2 100644
--- a/jscomp/test/dist/jscomp/test/js_float_test.js
+++ b/jscomp/test/dist/jscomp/test/js_float_test.js
@@ -8,10 +8,10 @@ const suites_0 = [
   "_NaN <> _NaN",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: false,
-              _1: NaN === NaN
-            };
+        TAG: /* Eq */0,
+        _0: false,
+        _1: NaN === NaN
+      };
     })
 ];
 
@@ -20,10 +20,10 @@ const suites_1 = {
     "isNaN - _NaN",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: true,
-                _1: Number.isNaN(NaN)
-              };
+          TAG: /* Eq */0,
+          _0: true,
+          _1: Number.isNaN(NaN)
+        };
       })
   ],
   tl: {
@@ -31,10 +31,10 @@ const suites_1 = {
       "isNaN - 0.",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: false,
-                  _1: Number.isNaN(0)
-                };
+            TAG: /* Eq */0,
+            _0: false,
+            _1: Number.isNaN(0)
+          };
         })
     ],
     tl: {
@@ -42,10 +42,10 @@ const suites_1 = {
         "isFinite - infinity",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: false,
-                    _1: Number.isFinite(Stdlib.infinity)
-                  };
+              TAG: /* Eq */0,
+              _0: false,
+              _1: Number.isFinite(Stdlib.infinity)
+            };
           })
       ],
       tl: {
@@ -53,10 +53,10 @@ const suites_1 = {
           "isFinite - neg_infinity",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: false,
-                      _1: Number.isFinite(Stdlib.neg_infinity)
-                    };
+                TAG: /* Eq */0,
+                _0: false,
+                _1: Number.isFinite(Stdlib.neg_infinity)
+              };
             })
         ],
         tl: {
@@ -64,10 +64,10 @@ const suites_1 = {
             "isFinite - _NaN",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: false,
-                        _1: Number.isFinite(NaN)
-                      };
+                  TAG: /* Eq */0,
+                  _0: false,
+                  _1: Number.isFinite(NaN)
+                };
               })
           ],
           tl: {
@@ -75,10 +75,10 @@ const suites_1 = {
               "isFinite - 0.",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: true,
-                          _1: Number.isFinite(0)
-                        };
+                    TAG: /* Eq */0,
+                    _0: true,
+                    _1: Number.isFinite(0)
+                  };
                 })
             ],
             tl: {
@@ -86,10 +86,10 @@ const suites_1 = {
                 "toExponential",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: "1.23456e+2",
-                            _1: (123.456).toExponential(undefined)
-                          };
+                      TAG: /* Eq */0,
+                      _0: "1.23456e+2",
+                      _1: (123.456).toExponential(undefined)
+                    };
                   })
               ],
               tl: {
@@ -97,10 +97,10 @@ const suites_1 = {
                   "toExponential - large number",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: "1.2e+21",
-                              _1: (1.2e21).toExponential(undefined)
-                            };
+                        TAG: /* Eq */0,
+                        _0: "1.2e+21",
+                        _1: (1.2e21).toExponential(undefined)
+                      };
                     })
                 ],
                 tl: {
@@ -108,10 +108,10 @@ const suites_1 = {
                     "toExponentialWithPrecision - digits:2",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: "1.23e+2",
-                                _1: (123.456).toExponential(2)
-                              };
+                          TAG: /* Eq */0,
+                          _0: "1.23e+2",
+                          _1: (123.456).toExponential(2)
+                        };
                       })
                   ],
                   tl: {
@@ -119,10 +119,10 @@ const suites_1 = {
                       "toExponentialWithPrecision - digits:4",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: "1.2346e+2",
-                                  _1: (123.456).toExponential(4)
-                                };
+                            TAG: /* Eq */0,
+                            _0: "1.2346e+2",
+                            _1: (123.456).toExponential(4)
+                          };
                         })
                     ],
                     tl: {
@@ -130,10 +130,10 @@ const suites_1 = {
                         "toExponentialWithPrecision - digits:20",
                         (function (param) {
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: "0.00000000000000000000e+0",
-                                    _1: (0).toExponential(20)
-                                  };
+                              TAG: /* Eq */0,
+                              _0: "0.00000000000000000000e+0",
+                              _1: (0).toExponential(20)
+                            };
                           })
                       ],
                       tl: {
@@ -141,11 +141,11 @@ const suites_1 = {
                           "File \"jscomp/test/js_float_test.ml\", line 31, characters 3-10",
                           (function (param) {
                               return {
-                                      TAG: /* ThrowAny */7,
-                                      _0: (function (param) {
-                                          (0).toExponential(101);
-                                        })
-                                    };
+                                TAG: /* ThrowAny */7,
+                                _0: (function (param) {
+                                    (0).toExponential(101);
+                                  })
+                              };
                             })
                         ],
                         tl: {
@@ -153,11 +153,11 @@ const suites_1 = {
                             "toExponentialWithPrecision - digits:-1",
                             (function (param) {
                                 return {
-                                        TAG: /* ThrowAny */7,
-                                        _0: (function (param) {
-                                            (0).toExponential(-1);
-                                          })
-                                      };
+                                  TAG: /* ThrowAny */7,
+                                  _0: (function (param) {
+                                      (0).toExponential(-1);
+                                    })
+                                };
                               })
                           ],
                           tl: {
@@ -165,10 +165,10 @@ const suites_1 = {
                               "toFixed",
                               (function (param) {
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: "123",
-                                          _1: (123.456).toFixed(undefined)
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: "123",
+                                    _1: (123.456).toFixed(undefined)
+                                  };
                                 })
                             ],
                             tl: {
@@ -176,10 +176,10 @@ const suites_1 = {
                                 "toFixed - large number",
                                 (function (param) {
                                     return {
-                                            TAG: /* Eq */0,
-                                            _0: "1.2e+21",
-                                            _1: (1.2e21).toFixed(undefined)
-                                          };
+                                      TAG: /* Eq */0,
+                                      _0: "1.2e+21",
+                                      _1: (1.2e21).toFixed(undefined)
+                                    };
                                   })
                               ],
                               tl: {
@@ -187,10 +187,10 @@ const suites_1 = {
                                   "toFixedWithPrecision - digits:2",
                                   (function (param) {
                                       return {
-                                              TAG: /* Eq */0,
-                                              _0: "123.46",
-                                              _1: (123.456).toFixed(2)
-                                            };
+                                        TAG: /* Eq */0,
+                                        _0: "123.46",
+                                        _1: (123.456).toFixed(2)
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -198,10 +198,10 @@ const suites_1 = {
                                     "toFixedWithPrecision - digits:4",
                                     (function (param) {
                                         return {
-                                                TAG: /* Eq */0,
-                                                _0: "123.4560",
-                                                _1: (123.456).toFixed(4)
-                                              };
+                                          TAG: /* Eq */0,
+                                          _0: "123.4560",
+                                          _1: (123.456).toFixed(4)
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -209,10 +209,10 @@ const suites_1 = {
                                       "toFixedWithPrecision - digits:20",
                                       (function (param) {
                                           return {
-                                                  TAG: /* Eq */0,
-                                                  _0: "0.00000000000000000000",
-                                                  _1: (0).toFixed(20)
-                                                };
+                                            TAG: /* Eq */0,
+                                            _0: "0.00000000000000000000",
+                                            _1: (0).toFixed(20)
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -220,11 +220,11 @@ const suites_1 = {
                                         "toFixedWithPrecision - digits:101",
                                         (function (param) {
                                             return {
-                                                    TAG: /* ThrowAny */7,
-                                                    _0: (function (param) {
-                                                        (0).toFixed(101);
-                                                      })
-                                                  };
+                                              TAG: /* ThrowAny */7,
+                                              _0: (function (param) {
+                                                  (0).toFixed(101);
+                                                })
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -232,11 +232,11 @@ const suites_1 = {
                                           "toFixedWithPrecision - digits:-1",
                                           (function (param) {
                                               return {
-                                                      TAG: /* ThrowAny */7,
-                                                      _0: (function (param) {
-                                                          (0).toFixed(-1);
-                                                        })
-                                                    };
+                                                TAG: /* ThrowAny */7,
+                                                _0: (function (param) {
+                                                    (0).toFixed(-1);
+                                                  })
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -244,10 +244,10 @@ const suites_1 = {
                                             "toPrecision",
                                             (function (param) {
                                                 return {
-                                                        TAG: /* Eq */0,
-                                                        _0: "123.456",
-                                                        _1: (123.456).toPrecision(undefined)
-                                                      };
+                                                  TAG: /* Eq */0,
+                                                  _0: "123.456",
+                                                  _1: (123.456).toPrecision(undefined)
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -255,10 +255,10 @@ const suites_1 = {
                                               "toPrecision - large number",
                                               (function (param) {
                                                   return {
-                                                          TAG: /* Eq */0,
-                                                          _0: "1.2e+21",
-                                                          _1: (1.2e21).toPrecision(undefined)
-                                                        };
+                                                    TAG: /* Eq */0,
+                                                    _0: "1.2e+21",
+                                                    _1: (1.2e21).toPrecision(undefined)
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -266,10 +266,10 @@ const suites_1 = {
                                                 "toPrecisionWithPrecision - digits:2",
                                                 (function (param) {
                                                     return {
-                                                            TAG: /* Eq */0,
-                                                            _0: "1.2e+2",
-                                                            _1: (123.456).toPrecision(2)
-                                                          };
+                                                      TAG: /* Eq */0,
+                                                      _0: "1.2e+2",
+                                                      _1: (123.456).toPrecision(2)
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -277,10 +277,10 @@ const suites_1 = {
                                                   "toPrecisionWithPrecision - digits:4",
                                                   (function (param) {
                                                       return {
-                                                              TAG: /* Eq */0,
-                                                              _0: "123.5",
-                                                              _1: (123.456).toPrecision(4)
-                                                            };
+                                                        TAG: /* Eq */0,
+                                                        _0: "123.5",
+                                                        _1: (123.456).toPrecision(4)
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -288,10 +288,10 @@ const suites_1 = {
                                                     "toPrecisionWithPrecision - digits:20",
                                                     (function (param) {
                                                         return {
-                                                                TAG: /* Eq */0,
-                                                                _0: "0.0000000000000000000",
-                                                                _1: (0).toPrecision(20)
-                                                              };
+                                                          TAG: /* Eq */0,
+                                                          _0: "0.0000000000000000000",
+                                                          _1: (0).toPrecision(20)
+                                                        };
                                                       })
                                                   ],
                                                   tl: {
@@ -299,11 +299,11 @@ const suites_1 = {
                                                       "File \"jscomp/test/js_float_test.ml\", line 61, characters 3-10",
                                                       (function (param) {
                                                           return {
-                                                                  TAG: /* ThrowAny */7,
-                                                                  _0: (function (param) {
-                                                                      (0).toPrecision(101);
-                                                                    })
-                                                                };
+                                                            TAG: /* ThrowAny */7,
+                                                            _0: (function (param) {
+                                                                (0).toPrecision(101);
+                                                              })
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -311,11 +311,11 @@ const suites_1 = {
                                                         "toPrecisionWithPrecision - digits:-1",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: /* ThrowAny */7,
-                                                                    _0: (function (param) {
-                                                                        (0).toPrecision(-1);
-                                                                      })
-                                                                  };
+                                                              TAG: /* ThrowAny */7,
+                                                              _0: (function (param) {
+                                                                  (0).toPrecision(-1);
+                                                                })
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -323,10 +323,10 @@ const suites_1 = {
                                                           "toString",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: /* Eq */0,
-                                                                      _0: "1.23",
-                                                                      _1: (1.23).toString(undefined)
-                                                                    };
+                                                                TAG: /* Eq */0,
+                                                                _0: "1.23",
+                                                                _1: (1.23).toString(undefined)
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -334,10 +334,10 @@ const suites_1 = {
                                                             "toString - large number",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: /* Eq */0,
-                                                                        _0: "1.2e+21",
-                                                                        _1: (1.2e21).toString(undefined)
-                                                                      };
+                                                                  TAG: /* Eq */0,
+                                                                  _0: "1.2e+21",
+                                                                  _1: (1.2e21).toString(undefined)
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -345,10 +345,10 @@ const suites_1 = {
                                                               "toStringWithRadix - radix:2",
                                                               (function (param) {
                                                                   return {
-                                                                          TAG: /* Eq */0,
-                                                                          _0: "1111011.0111010010111100011010100111111011111001110111",
-                                                                          _1: (123.456).toString(2)
-                                                                        };
+                                                                    TAG: /* Eq */0,
+                                                                    _0: "1111011.0111010010111100011010100111111011111001110111",
+                                                                    _1: (123.456).toString(2)
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -356,10 +356,10 @@ const suites_1 = {
                                                                 "toStringWithRadix - radix:16",
                                                                 (function (param) {
                                                                     return {
-                                                                            TAG: /* Eq */0,
-                                                                            _0: "7b.74bc6a7ef9dc",
-                                                                            _1: (123.456).toString(16)
-                                                                          };
+                                                                      TAG: /* Eq */0,
+                                                                      _0: "7b.74bc6a7ef9dc",
+                                                                      _1: (123.456).toString(16)
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -367,10 +367,10 @@ const suites_1 = {
                                                                   "toStringWithRadix - radix:36",
                                                                   (function (param) {
                                                                       return {
-                                                                              TAG: /* Eq */0,
-                                                                              _0: "3f",
-                                                                              _1: (123).toString(36)
-                                                                            };
+                                                                        TAG: /* Eq */0,
+                                                                        _0: "3f",
+                                                                        _1: (123).toString(36)
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -378,11 +378,11 @@ const suites_1 = {
                                                                     "toStringWithRadix - radix:37",
                                                                     (function (param) {
                                                                         return {
-                                                                                TAG: /* ThrowAny */7,
-                                                                                _0: (function (param) {
-                                                                                    (0).toString(37);
-                                                                                  })
-                                                                              };
+                                                                          TAG: /* ThrowAny */7,
+                                                                          _0: (function (param) {
+                                                                              (0).toString(37);
+                                                                            })
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -390,11 +390,11 @@ const suites_1 = {
                                                                       "toStringWithRadix - radix:1",
                                                                       (function (param) {
                                                                           return {
-                                                                                  TAG: /* ThrowAny */7,
-                                                                                  _0: (function (param) {
-                                                                                      (0).toString(1);
-                                                                                    })
-                                                                                };
+                                                                            TAG: /* ThrowAny */7,
+                                                                            _0: (function (param) {
+                                                                                (0).toString(1);
+                                                                              })
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -402,11 +402,11 @@ const suites_1 = {
                                                                         "toStringWithRadix - radix:-1",
                                                                         (function (param) {
                                                                             return {
-                                                                                    TAG: /* ThrowAny */7,
-                                                                                    _0: (function (param) {
-                                                                                        (0).toString(-1);
-                                                                                      })
-                                                                                  };
+                                                                              TAG: /* ThrowAny */7,
+                                                                              _0: (function (param) {
+                                                                                  (0).toString(-1);
+                                                                                })
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -414,10 +414,10 @@ const suites_1 = {
                                                                           "fromString - 123",
                                                                           (function (param) {
                                                                               return {
-                                                                                      TAG: /* Eq */0,
-                                                                                      _0: 123,
-                                                                                      _1: Number("123")
-                                                                                    };
+                                                                                TAG: /* Eq */0,
+                                                                                _0: 123,
+                                                                                _1: Number("123")
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -425,10 +425,10 @@ const suites_1 = {
                                                                             "fromString - 12.3",
                                                                             (function (param) {
                                                                                 return {
-                                                                                        TAG: /* Eq */0,
-                                                                                        _0: 12.3,
-                                                                                        _1: Number("12.3")
-                                                                                      };
+                                                                                  TAG: /* Eq */0,
+                                                                                  _0: 12.3,
+                                                                                  _1: Number("12.3")
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -436,10 +436,10 @@ const suites_1 = {
                                                                               "fromString - empty string",
                                                                               (function (param) {
                                                                                   return {
-                                                                                          TAG: /* Eq */0,
-                                                                                          _0: 0,
-                                                                                          _1: Number("")
-                                                                                        };
+                                                                                    TAG: /* Eq */0,
+                                                                                    _0: 0,
+                                                                                    _1: Number("")
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -447,10 +447,10 @@ const suites_1 = {
                                                                                 "fromString - 0x11",
                                                                                 (function (param) {
                                                                                     return {
-                                                                                            TAG: /* Eq */0,
-                                                                                            _0: 17,
-                                                                                            _1: Number("0x11")
-                                                                                          };
+                                                                                      TAG: /* Eq */0,
+                                                                                      _0: 17,
+                                                                                      _1: Number("0x11")
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -458,10 +458,10 @@ const suites_1 = {
                                                                                   "fromString - 0b11",
                                                                                   (function (param) {
                                                                                       return {
-                                                                                              TAG: /* Eq */0,
-                                                                                              _0: 3,
-                                                                                              _1: Number("0b11")
-                                                                                            };
+                                                                                        TAG: /* Eq */0,
+                                                                                        _0: 3,
+                                                                                        _1: Number("0b11")
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -469,10 +469,10 @@ const suites_1 = {
                                                                                     "fromString - 0o11",
                                                                                     (function (param) {
                                                                                         return {
-                                                                                                TAG: /* Eq */0,
-                                                                                                _0: 9,
-                                                                                                _1: Number("0o11")
-                                                                                              };
+                                                                                          TAG: /* Eq */0,
+                                                                                          _0: 9,
+                                                                                          _1: Number("0o11")
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -480,10 +480,10 @@ const suites_1 = {
                                                                                       "fromString - invalid string",
                                                                                       (function (param) {
                                                                                           return {
-                                                                                                  TAG: /* Eq */0,
-                                                                                                  _0: true,
-                                                                                                  _1: Number.isNaN(Number("foo"))
-                                                                                                };
+                                                                                            TAG: /* Eq */0,
+                                                                                            _0: true,
+                                                                                            _1: Number.isNaN(Number("foo"))
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_formdata_test.js b/jscomp/test/dist/jscomp/test/js_formdata_test.js
index dc9fd6031..e70898106 100644
--- a/jscomp/test/dist/jscomp/test/js_formdata_test.js
+++ b/jscomp/test/dist/jscomp/test/js_formdata_test.js
@@ -10,19 +10,19 @@ function form_data_append(param) {
   fd.append("a", "foo");
   fd.append("b", "bar");
   return {
-          TAG: /* Eq */0,
-          _0: Stdlib__Option.get(Caml_option.null_to_opt(fd.get("a"))),
-          _1: "foo"
-        };
+    TAG: /* Eq */0,
+    _0: Stdlib__Option.get(Caml_option.null_to_opt(fd.get("a"))),
+    _1: "foo"
+  };
 }
 
 function form_data_not_found(param) {
   const fd = new FormData();
   return {
-          TAG: /* Eq */0,
-          _0: Caml_option.null_to_opt(fd.get("doesn't exist")),
-          _1: undefined
-        };
+    TAG: /* Eq */0,
+    _0: Caml_option.null_to_opt(fd.get("doesn't exist")),
+    _1: undefined
+  };
 }
 
 function form_data_append_blob(param) {
@@ -31,12 +31,12 @@ function form_data_append_blob(param) {
   fd.append("b", blob, "foo.txt");
   const got_blob = Stdlib__Option.get(Caml_option.null_to_opt(fd.get("b")));
   return got_blob.text().then(function (x) {
-              return Promise.resolve({
-                          TAG: /* Eq */0,
-                          _0: x,
-                          _1: "hello"
-                        });
+        return Promise.resolve({
+              TAG: /* Eq */0,
+              _0: x,
+              _1: "hello"
             });
+      });
 }
 
 function form_data_append_file(param) {
@@ -45,12 +45,12 @@ function form_data_append_file(param) {
   fd.append("b", file, "foo.txt");
   const got_file = Stdlib__Option.get(Caml_option.null_to_opt(fd.get("b")));
   return got_file.text().then(function (x) {
-              return Promise.resolve({
-                          TAG: /* Eq */0,
-                          _0: x,
-                          _1: "hello"
-                        });
+        return Promise.resolve({
+              TAG: /* Eq */0,
+              _0: x,
+              _1: "hello"
             });
+      });
 }
 
 Mt.from_pair_suites("Js_formdata_test", {
diff --git a/jscomp/test/dist/jscomp/test/js_global_test.js b/jscomp/test/dist/jscomp/test/js_global_test.js
index 633005961..23dda09d5 100644
--- a/jscomp/test/dist/jscomp/test/js_global_test.js
+++ b/jscomp/test/dist/jscomp/test/js_global_test.js
@@ -11,9 +11,9 @@ const suites_0 = [
             }), 0);
       clearTimeout(handle);
       return {
-              TAG: /* Ok */4,
-              _0: true
-            };
+        TAG: /* Ok */4,
+        _0: true
+      };
     })
 ];
 
@@ -26,9 +26,9 @@ const suites_1 = {
               }), 0);
         clearInterval(handle);
         return {
-                TAG: /* Ok */4,
-                _0: true
-              };
+          TAG: /* Ok */4,
+          _0: true
+        };
       })
   ],
   tl: {
@@ -36,10 +36,10 @@ const suites_1 = {
       "encodeURI",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: encodeURI("[-=-]"),
-                  _1: "%5B-=-%5D"
-                };
+            TAG: /* Eq */0,
+            _0: encodeURI("[-=-]"),
+            _1: "%5B-=-%5D"
+          };
         })
     ],
     tl: {
@@ -47,10 +47,10 @@ const suites_1 = {
         "decodeURI",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: decodeURI("%5B-=-%5D"),
-                    _1: "[-=-]"
-                  };
+              TAG: /* Eq */0,
+              _0: decodeURI("%5B-=-%5D"),
+              _1: "[-=-]"
+            };
           })
       ],
       tl: {
@@ -58,10 +58,10 @@ const suites_1 = {
           "encodeURIComponent",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: encodeURIComponent("[-=-]"),
-                      _1: "%5B-%3D-%5D"
-                    };
+                TAG: /* Eq */0,
+                _0: encodeURIComponent("[-=-]"),
+                _1: "%5B-%3D-%5D"
+              };
             })
         ],
         tl: {
@@ -69,10 +69,10 @@ const suites_1 = {
             "decodeURIComponent",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: decodeURIComponent("%5B-%3D-%5D"),
-                        _1: "[-=-]"
-                      };
+                  TAG: /* Eq */0,
+                  _0: decodeURIComponent("%5B-%3D-%5D"),
+                  _1: "[-=-]"
+                };
               })
           ],
           tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_int_test.js b/jscomp/test/dist/jscomp/test/js_int_test.js
index 3ec83523b..5b9046cf8 100644
--- a/jscomp/test/dist/jscomp/test/js_int_test.js
+++ b/jscomp/test/dist/jscomp/test/js_int_test.js
@@ -7,10 +7,10 @@ const suites_0 = [
   "toExponential",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: "1.23456e+5",
-              _1: (123456).toExponential(undefined)
-            };
+        TAG: /* Eq */0,
+        _0: "1.23456e+5",
+        _1: (123456).toExponential(undefined)
+      };
     })
 ];
 
@@ -19,10 +19,10 @@ const suites_1 = {
     "toExponentialWithPrecision - digits:2",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: "1.23e+5",
-                _1: (123456).toExponential(2)
-              };
+          TAG: /* Eq */0,
+          _0: "1.23e+5",
+          _1: (123456).toExponential(2)
+        };
       })
   ],
   tl: {
@@ -30,10 +30,10 @@ const suites_1 = {
       "toExponentialWithPrecision - digits:4",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: "1.2346e+5",
-                  _1: (123456).toExponential(4)
-                };
+            TAG: /* Eq */0,
+            _0: "1.2346e+5",
+            _1: (123456).toExponential(4)
+          };
         })
     ],
     tl: {
@@ -41,10 +41,10 @@ const suites_1 = {
         "toExponentialWithPrecision - digits:20",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: "0.00000000000000000000e+0",
-                    _1: (0).toExponential(20)
-                  };
+              TAG: /* Eq */0,
+              _0: "0.00000000000000000000e+0",
+              _1: (0).toExponential(20)
+            };
           })
       ],
       tl: {
@@ -52,11 +52,11 @@ const suites_1 = {
           "File \"jscomp/test/js_int_test.ml\", line 12, characters 3-10",
           (function (param) {
               return {
-                      TAG: /* ThrowAny */7,
-                      _0: (function (param) {
-                          (0).toExponential(101);
-                        })
-                    };
+                TAG: /* ThrowAny */7,
+                _0: (function (param) {
+                    (0).toExponential(101);
+                  })
+              };
             })
         ],
         tl: {
@@ -64,11 +64,11 @@ const suites_1 = {
             "toExponentialWithPrecision - digits:-1",
             (function (param) {
                 return {
-                        TAG: /* ThrowAny */7,
-                        _0: (function (param) {
-                            (0).toExponential(-1);
-                          })
-                      };
+                  TAG: /* ThrowAny */7,
+                  _0: (function (param) {
+                      (0).toExponential(-1);
+                    })
+                };
               })
           ],
           tl: {
@@ -76,10 +76,10 @@ const suites_1 = {
               "toPrecision",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: "123456",
-                          _1: (123456).toPrecision(undefined)
-                        };
+                    TAG: /* Eq */0,
+                    _0: "123456",
+                    _1: (123456).toPrecision(undefined)
+                  };
                 })
             ],
             tl: {
@@ -87,10 +87,10 @@ const suites_1 = {
                 "toPrecisionWithPrecision - digits:2",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: "1.2e+5",
-                            _1: (123456).toPrecision(2)
-                          };
+                      TAG: /* Eq */0,
+                      _0: "1.2e+5",
+                      _1: (123456).toPrecision(2)
+                    };
                   })
               ],
               tl: {
@@ -98,10 +98,10 @@ const suites_1 = {
                   "toPrecisionWithPrecision - digits:4",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: "1.235e+5",
-                              _1: (123456).toPrecision(4)
-                            };
+                        TAG: /* Eq */0,
+                        _0: "1.235e+5",
+                        _1: (123456).toPrecision(4)
+                      };
                     })
                 ],
                 tl: {
@@ -109,10 +109,10 @@ const suites_1 = {
                     "toPrecisionWithPrecision - digits:20",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: "0.0000000000000000000",
-                                _1: (0).toPrecision(20)
-                              };
+                          TAG: /* Eq */0,
+                          _0: "0.0000000000000000000",
+                          _1: (0).toPrecision(20)
+                        };
                       })
                   ],
                   tl: {
@@ -120,11 +120,11 @@ const suites_1 = {
                       "File \"jscomp/test/js_int_test.ml\", line 25, characters 3-10",
                       (function (param) {
                           return {
-                                  TAG: /* ThrowAny */7,
-                                  _0: (function (param) {
-                                      (0).toPrecision(101);
-                                    })
-                                };
+                            TAG: /* ThrowAny */7,
+                            _0: (function (param) {
+                                (0).toPrecision(101);
+                              })
+                          };
                         })
                     ],
                     tl: {
@@ -132,11 +132,11 @@ const suites_1 = {
                         "toPrecisionWithPrecision - digits:-1",
                         (function (param) {
                             return {
-                                    TAG: /* ThrowAny */7,
-                                    _0: (function (param) {
-                                        (0).toPrecision(-1);
-                                      })
-                                  };
+                              TAG: /* ThrowAny */7,
+                              _0: (function (param) {
+                                  (0).toPrecision(-1);
+                                })
+                            };
                           })
                       ],
                       tl: {
@@ -144,10 +144,10 @@ const suites_1 = {
                           "toString",
                           (function (param) {
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: "123",
-                                      _1: (123).toString(undefined)
-                                    };
+                                TAG: /* Eq */0,
+                                _0: "123",
+                                _1: (123).toString(undefined)
+                              };
                             })
                         ],
                         tl: {
@@ -155,10 +155,10 @@ const suites_1 = {
                             "toStringWithRadix - radix:2",
                             (function (param) {
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: "11110001001000000",
-                                        _1: (123456).toString(2)
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: "11110001001000000",
+                                  _1: (123456).toString(2)
+                                };
                               })
                           ],
                           tl: {
@@ -166,10 +166,10 @@ const suites_1 = {
                               "toStringWithRadix - radix:16",
                               (function (param) {
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: "1e240",
-                                          _1: (123456).toString(16)
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: "1e240",
+                                    _1: (123456).toString(16)
+                                  };
                                 })
                             ],
                             tl: {
@@ -177,10 +177,10 @@ const suites_1 = {
                                 "toStringWithRadix - radix:36",
                                 (function (param) {
                                     return {
-                                            TAG: /* Eq */0,
-                                            _0: "2n9c",
-                                            _1: (123456).toString(36)
-                                          };
+                                      TAG: /* Eq */0,
+                                      _0: "2n9c",
+                                      _1: (123456).toString(36)
+                                    };
                                   })
                               ],
                               tl: {
@@ -188,11 +188,11 @@ const suites_1 = {
                                   "toStringWithRadix - radix:37",
                                   (function (param) {
                                       return {
-                                              TAG: /* ThrowAny */7,
-                                              _0: (function (param) {
-                                                  (0).toString(37);
-                                                })
-                                            };
+                                        TAG: /* ThrowAny */7,
+                                        _0: (function (param) {
+                                            (0).toString(37);
+                                          })
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -200,11 +200,11 @@ const suites_1 = {
                                     "toStringWithRadix - radix:1",
                                     (function (param) {
                                         return {
-                                                TAG: /* ThrowAny */7,
-                                                _0: (function (param) {
-                                                    (0).toString(1);
-                                                  })
-                                              };
+                                          TAG: /* ThrowAny */7,
+                                          _0: (function (param) {
+                                              (0).toString(1);
+                                            })
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -212,11 +212,11 @@ const suites_1 = {
                                       "toStringWithRadix - radix:-1",
                                       (function (param) {
                                           return {
-                                                  TAG: /* ThrowAny */7,
-                                                  _0: (function (param) {
-                                                      (0).toString(-1);
-                                                    })
-                                                };
+                                            TAG: /* ThrowAny */7,
+                                            _0: (function (param) {
+                                                (0).toString(-1);
+                                              })
+                                          };
                                         })
                                     ],
                                     tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_json_test.js b/jscomp/test/dist/jscomp/test/js_json_test.js
index ca1ed87c3..0f1c1cffa 100644
--- a/jscomp/test/dist/jscomp/test/js_json_test.js
+++ b/jscomp/test/dist/jscomp/test/js_json_test.js
@@ -34,28 +34,28 @@ function add_test(loc, test) {
 function eq(loc, x, y) {
   add_test(loc, (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         }));
 }
 
 function false_(loc) {
   add_test(loc, (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }));
 }
 
 function true_(loc) {
   add_test(loc, (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: true
-                };
+            TAG: /* Ok */4,
+            _0: true
+          };
         }));
 }
 
@@ -65,64 +65,64 @@ add_test("File \"jscomp/test/js_json_test.ml\", line 24, characters 11-18", (fun
         const ty = Js__Js_json.classify(v);
         if (/* tag */typeof ty === "number" || typeof ty === "string") {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }
         if (ty.TAG !== /* JSONObject */2) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }
         const v$1 = Js__Js_dict.get(ty._0, "x");
         if (v$1 === undefined) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }
         const ty2 = Js__Js_json.classify(Caml_option.valFromOption(v$1));
         if (/* tag */typeof ty2 === "number" || typeof ty2 === "string") {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }
         if (ty2.TAG !== /* JSONArray */3) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }
         ty2._0.forEach(function (x) {
               const ty3 = Js__Js_json.classify(x);
               if (/* tag */typeof ty3 === "number" || typeof ty3 === "string") {
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/js_json_test.ml",
-                            38,
-                            21
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/js_json_test.ml",
+                        38,
+                        21
+                      ]
+                    });
               }
               if (ty3.TAG === /* JSONNumber */1) {
                 return ;
               }
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/js_json_test.ml",
-                          38,
-                          21
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/js_json_test.ml",
+                      38,
+                      21
+                    ]
+                  });
             });
         return {
-                TAG: /* Ok */4,
-                _0: true
-              };
+          TAG: /* Ok */4,
+          _0: true
+        };
       }));
 
 eq("File \"jscomp/test/js_json_test.ml\", line 49, characters 5-12", Js__Js_json.test(v, /* Object */2), true);
@@ -135,26 +135,26 @@ if (/* tag */typeof ty === "number" || typeof ty === "string") {
   if (ty === /* JSONNull */2) {
     add_test("File \"jscomp/test/js_json_test.ml\", line 55, characters 24-31", (function (param) {
             return {
-                    TAG: /* Ok */4,
-                    _0: true
-                  };
+              TAG: /* Ok */4,
+              _0: true
+            };
           }));
   } else {
     console.log(ty);
     add_test("File \"jscomp/test/js_json_test.ml\", line 56, characters 27-34", (function (param) {
             return {
-                    TAG: /* Ok */4,
-                    _0: false
-                  };
+              TAG: /* Ok */4,
+              _0: false
+            };
           }));
   }
 } else {
   console.log(ty);
   add_test("File \"jscomp/test/js_json_test.ml\", line 56, characters 27-34", (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }));
 }
 
@@ -165,18 +165,18 @@ const ty$1 = Js__Js_json.classify(json$1);
 if (/* tag */typeof ty$1 === "number" || typeof ty$1 === "string") {
   add_test("File \"jscomp/test/js_json_test.ml\", line 66, characters 16-23", (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }));
 } else if (ty$1.TAG === /* JSONString */0) {
   eq("File \"jscomp/test/js_json_test.ml\", line 65, characters 25-32", ty$1._0, "test string");
 } else {
   add_test("File \"jscomp/test/js_json_test.ml\", line 66, characters 16-23", (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }));
 }
 
@@ -195,9 +195,9 @@ if (/* tag */typeof ty$2 === "number" || typeof ty$2 === "string" || ty$2.TAG !=
 if (exit === 1) {
   add_test("File \"jscomp/test/js_json_test.ml\", line 76, characters 18-25", (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }));
 }
 
@@ -216,9 +216,9 @@ if (/* tag */typeof ty$3 === "number" || typeof ty$3 === "string" || ty$3.TAG !=
 if (exit$1 === 1) {
   add_test("File \"jscomp/test/js_json_test.ml\", line 86, characters 18-25", (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }));
 }
 
@@ -227,11 +227,11 @@ function test(v) {
   const ty = Js__Js_json.classify(json);
   if (!/* tag */(typeof ty === "number" || typeof ty === "string")) {
     return add_test("File \"jscomp/test/js_json_test.ml\", line 97, characters 18-25", (function (param) {
-                  return {
-                          TAG: /* Ok */4,
-                          _0: false
-                        };
-                }));
+            return {
+              TAG: /* Ok */4,
+              _0: false
+            };
+          }));
   }
   switch (ty) {
     case /* JSONFalse */0 :
@@ -240,11 +240,11 @@ function test(v) {
         return eq("File \"jscomp/test/js_json_test.ml\", line 95, characters 24-31", true, v);
     default:
       return add_test("File \"jscomp/test/js_json_test.ml\", line 97, characters 18-25", (function (param) {
-                    return {
-                            TAG: /* Ok */4,
-                            _0: false
-                          };
-                  }));
+              return {
+                TAG: /* Ok */4,
+                _0: false
+              };
+            }));
   }
 }
 
@@ -257,13 +257,13 @@ function option_get(x) {
     return Caml_option.valFromOption(x);
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/js_json_test.ml",
-              103,
-              36
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/js_json_test.ml",
+          103,
+          36
+        ]
+      });
 }
 
 const dict = {};
@@ -279,9 +279,9 @@ const ty$4 = Js__Js_json.classify(json$4);
 if (/* tag */typeof ty$4 === "number" || typeof ty$4 === "string") {
   add_test("File \"jscomp/test/js_json_test.ml\", line 135, characters 16-23", (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }));
 } else if (ty$4.TAG === /* JSONObject */2) {
   const x = ty$4._0;
@@ -289,59 +289,59 @@ if (/* tag */typeof ty$4 === "number" || typeof ty$4 === "string") {
   if (/* tag */typeof ta === "number" || typeof ta === "string") {
     add_test("File \"jscomp/test/js_json_test.ml\", line 133, characters 18-25", (function (param) {
             return {
-                    TAG: /* Ok */4,
-                    _0: false
-                  };
+              TAG: /* Ok */4,
+              _0: false
+            };
           }));
   } else if (ta.TAG === /* JSONString */0) {
     if (ta._0 !== "test string") {
       add_test("File \"jscomp/test/js_json_test.ml\", line 124, characters 18-25", (function (param) {
               return {
-                      TAG: /* Ok */4,
-                      _0: false
-                    };
+                TAG: /* Ok */4,
+                _0: false
+              };
             }));
     } else {
       const ty$5 = Js__Js_json.classify(option_get(Js__Js_dict.get(x, "b")));
       if (/* tag */typeof ty$5 === "number" || typeof ty$5 === "string") {
         add_test("File \"jscomp/test/js_json_test.ml\", line 131, characters 22-29", (function (param) {
                 return {
-                        TAG: /* Ok */4,
-                        _0: false
-                      };
+                  TAG: /* Ok */4,
+                  _0: false
+                };
               }));
       } else if (ty$5.TAG === /* JSONNumber */1) {
         const b = ty$5._0;
         add_test("File \"jscomp/test/js_json_test.ml\", line 130, characters 19-26", (function (param) {
                 return {
-                        TAG: /* Approx */5,
-                        _0: 123.0,
-                        _1: b
-                      };
+                  TAG: /* Approx */5,
+                  _0: 123.0,
+                  _1: b
+                };
               }));
       } else {
         add_test("File \"jscomp/test/js_json_test.ml\", line 131, characters 22-29", (function (param) {
                 return {
-                        TAG: /* Ok */4,
-                        _0: false
-                      };
+                  TAG: /* Ok */4,
+                  _0: false
+                };
               }));
       }
     }
   } else {
     add_test("File \"jscomp/test/js_json_test.ml\", line 133, characters 18-25", (function (param) {
             return {
-                    TAG: /* Ok */4,
-                    _0: false
-                  };
+              TAG: /* Ok */4,
+              _0: false
+            };
           }));
   }
 } else {
   add_test("File \"jscomp/test/js_json_test.ml\", line 135, characters 16-23", (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }));
 }
 
@@ -349,102 +349,102 @@ function eq_at_i(loc, json, i, kind, expected) {
   const ty = Js__Js_json.classify(json);
   if (/* tag */typeof ty === "number" || typeof ty === "string") {
     return add_test(loc, (function (param) {
-                  return {
-                          TAG: /* Ok */4,
-                          _0: false
-                        };
-                }));
+            return {
+              TAG: /* Ok */4,
+              _0: false
+            };
+          }));
   }
   if (ty.TAG !== /* JSONArray */3) {
     return add_test(loc, (function (param) {
-                  return {
-                          TAG: /* Ok */4,
-                          _0: false
-                        };
-                }));
+            return {
+              TAG: /* Ok */4,
+              _0: false
+            };
+          }));
   }
   const ty$1 = Js__Js_json.classify(Caml_array.get(ty._0, i));
   switch (kind) {
     case /* String */0 :
         if (/* tag */typeof ty$1 === "number" || typeof ty$1 === "string") {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: /* Ok */4,
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: /* Ok */4,
+                    _0: false
+                  };
+                }));
         } else if (ty$1.TAG === /* JSONString */0) {
           return eq(loc, ty$1._0, expected);
         } else {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: /* Ok */4,
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: /* Ok */4,
+                    _0: false
+                  };
+                }));
         }
     case /* Number */1 :
         if (/* tag */typeof ty$1 === "number" || typeof ty$1 === "string") {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: /* Ok */4,
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: /* Ok */4,
+                    _0: false
+                  };
+                }));
         } else if (ty$1.TAG === /* JSONNumber */1) {
           return eq(loc, ty$1._0, expected);
         } else {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: /* Ok */4,
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: /* Ok */4,
+                    _0: false
+                  };
+                }));
         }
     case /* Object */2 :
         if (/* tag */typeof ty$1 === "number" || typeof ty$1 === "string") {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: /* Ok */4,
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: /* Ok */4,
+                    _0: false
+                  };
+                }));
         } else if (ty$1.TAG === /* JSONObject */2) {
           return eq(loc, ty$1._0, expected);
         } else {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: /* Ok */4,
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: /* Ok */4,
+                    _0: false
+                  };
+                }));
         }
     case /* Array */3 :
         if (/* tag */typeof ty$1 === "number" || typeof ty$1 === "string") {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: /* Ok */4,
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: /* Ok */4,
+                    _0: false
+                  };
+                }));
         } else if (ty$1.TAG === /* JSONArray */3) {
           return eq(loc, ty$1._0, expected);
         } else {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: /* Ok */4,
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: /* Ok */4,
+                    _0: false
+                  };
+                }));
         }
     case /* Boolean */4 :
         if (!/* tag */(typeof ty$1 === "number" || typeof ty$1 === "string")) {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: /* Ok */4,
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: /* Ok */4,
+                    _0: false
+                  };
+                }));
         }
         switch (ty$1) {
           case /* JSONFalse */0 :
@@ -453,36 +453,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 */4,
-                                  _0: false
-                                };
-                        }));
+                    return {
+                      TAG: /* Ok */4,
+                      _0: false
+                    };
+                  }));
         }
     case /* Null */5 :
         if (/* tag */typeof ty$1 === "number" || typeof ty$1 === "string") {
           if (ty$1 === /* JSONNull */2) {
             return add_test(loc, (function (param) {
-                          return {
-                                  TAG: /* Ok */4,
-                                  _0: true
-                                };
-                        }));
+                    return {
+                      TAG: /* Ok */4,
+                      _0: true
+                    };
+                  }));
           } else {
             return add_test(loc, (function (param) {
-                          return {
-                                  TAG: /* Ok */4,
-                                  _0: false
-                                };
-                        }));
+                    return {
+                      TAG: /* Ok */4,
+                      _0: false
+                    };
+                  }));
           }
         } else {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: /* Ok */4,
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: /* Ok */4,
+                    _0: false
+                  };
+                }));
         }
     
   }
@@ -577,52 +577,52 @@ const ty$6 = Js__Js_json.classify(json$10);
 if (/* tag */typeof ty$6 === "number" || typeof ty$6 === "string") {
   add_test("File \"jscomp/test/js_json_test.ml\", line 283, characters 16-23", (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }));
 } else if (ty$6.TAG === /* JSONArray */3) {
   const ty$7 = Js__Js_json.classify(Caml_array.get(ty$6._0, 1));
   if (/* tag */typeof ty$7 === "number" || typeof ty$7 === "string") {
     add_test("File \"jscomp/test/js_json_test.ml\", line 281, characters 18-25", (function (param) {
             return {
-                    TAG: /* Ok */4,
-                    _0: false
-                  };
+              TAG: /* Ok */4,
+              _0: false
+            };
           }));
   } else if (ty$7.TAG === /* JSONObject */2) {
     const ty$8 = Js__Js_json.classify(option_get(Js__Js_dict.get(ty$7._0, "a")));
     if (/* tag */typeof ty$8 === "number" || typeof ty$8 === "string") {
       add_test("File \"jscomp/test/js_json_test.ml\", line 279, characters 20-27", (function (param) {
               return {
-                      TAG: /* Ok */4,
-                      _0: false
-                    };
+                TAG: /* Ok */4,
+                _0: false
+              };
             }));
     } else if (ty$8.TAG === /* JSONString */0) {
       eq("File \"jscomp/test/js_json_test.ml\", line 278, characters 34-41", ty$8._0, "bbb");
     } else {
       add_test("File \"jscomp/test/js_json_test.ml\", line 279, characters 20-27", (function (param) {
               return {
-                      TAG: /* Ok */4,
-                      _0: false
-                    };
+                TAG: /* Ok */4,
+                _0: false
+              };
             }));
     }
   } else {
     add_test("File \"jscomp/test/js_json_test.ml\", line 281, characters 18-25", (function (param) {
             return {
-                    TAG: /* Ok */4,
-                    _0: false
-                  };
+              TAG: /* Ok */4,
+              _0: false
+            };
           }));
   }
 } else {
   add_test("File \"jscomp/test/js_json_test.ml\", line 283, characters 16-23", (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }));
 }
 
@@ -630,17 +630,17 @@ try {
   JSON.parse("{{ A}");
   add_test("File \"jscomp/test/js_json_test.ml\", line 289, characters 11-18", (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: false
-                };
+            TAG: /* Ok */4,
+            _0: false
+          };
         }));
 }
 catch (exn){
   add_test("File \"jscomp/test/js_json_test.ml\", line 292, characters 10-17", (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: true
-                };
+            TAG: /* Ok */4,
+            _0: true
+          };
         }));
 }
 
diff --git a/jscomp/test/dist/jscomp/test/js_map_test.js b/jscomp/test/dist/jscomp/test/js_map_test.js
index 677b604f9..167edc24a 100644
--- a/jscomp/test/dist/jscomp/test/js_map_test.js
+++ b/jscomp/test/dist/jscomp/test/js_map_test.js
@@ -23,10 +23,10 @@ const suites_0 = [
       ];
       const map = new Map(array);
       return {
-              TAG: /* Eq */0,
-              _0: array,
-              _1: Array.from(map)
-            };
+        TAG: /* Eq */0,
+        _0: array,
+        _1: Array.from(map)
+      };
     })
 ];
 
@@ -36,10 +36,10 @@ const suites_1 = {
     (function (param) {
         const map = new Map();
         return {
-                TAG: /* Eq */0,
-                _0: 0,
-                _1: map.size
-              };
+          TAG: /* Eq */0,
+          _0: 0,
+          _1: map.size
+        };
       })
   ],
   tl: {
@@ -61,10 +61,10 @@ const suites_1 = {
                 ]
               ]);
           return {
-                  TAG: /* Eq */0,
-                  _0: 2,
-                  _1: map.size
-                };
+            TAG: /* Eq */0,
+            _0: 2,
+            _1: map.size
+          };
         })
     ],
     tl: {
@@ -82,10 +82,10 @@ const suites_1 = {
                   ]
                 ]);
             return {
-                    TAG: /* Eq */0,
-                    _0: 1,
-                    _1: map.size
-                  };
+              TAG: /* Eq */0,
+              _0: 1,
+              _1: map.size
+            };
           })
       ],
       tl: {
@@ -103,10 +103,10 @@ const suites_1 = {
                     ]
                   ]);
               return {
-                      TAG: /* Eq */0,
-                      _0: true,
-                      _1: map.has(1)
-                    };
+                TAG: /* Eq */0,
+                _0: true,
+                _1: map.has(1)
+              };
             })
         ],
         tl: {
@@ -124,10 +124,10 @@ const suites_1 = {
                       ]
                     ]);
                 return {
-                        TAG: /* Eq */0,
-                        _0: false,
-                        _1: map.has(3)
-                      };
+                  TAG: /* Eq */0,
+                  _0: false,
+                  _1: map.has(3)
+                };
               })
           ],
           tl: {
@@ -148,18 +148,18 @@ const suites_1 = {
                   const two = map.get(2);
                   const three = map.get(3);
                   return {
-                          TAG: /* Eq */0,
-                          _0: [
-                            "one",
-                            "two",
-                            undefined
-                          ],
-                          _1: [
-                            one === undefined ? undefined : Caml_option.some(one),
-                            two === undefined ? undefined : Caml_option.some(two),
-                            three === undefined ? undefined : Caml_option.some(three)
-                          ]
-                        };
+                    TAG: /* Eq */0,
+                    _0: [
+                      "one",
+                      "two",
+                      undefined
+                    ],
+                    _1: [
+                      one === undefined ? undefined : Caml_option.some(one),
+                      two === undefined ? undefined : Caml_option.some(two),
+                      three === undefined ? undefined : Caml_option.some(three)
+                    ]
+                  };
                 })
             ],
             tl: {
@@ -168,19 +168,19 @@ const suites_1 = {
                 (function (param) {
                     const map = new Map().set(1, "one").set(2, "two");
                     return {
-                            TAG: /* Eq */0,
-                            _0: [
-                              [
-                                1,
-                                "one"
-                              ],
-                              [
-                                2,
-                                "two"
-                              ]
-                            ],
-                            _1: Array.from(map)
-                          };
+                      TAG: /* Eq */0,
+                      _0: [
+                        [
+                          1,
+                          "one"
+                        ],
+                        [
+                          2,
+                          "two"
+                        ]
+                      ],
+                      _1: Array.from(map)
+                    };
                   })
               ],
               tl: {
@@ -199,16 +199,16 @@ const suites_1 = {
                           ]);
                       const deleted = map.delete(2);
                       return {
-                              TAG: /* Eq */0,
-                              _0: [
-                                true,
-                                false
-                              ],
-                              _1: [
-                                deleted,
-                                map.has(2)
-                              ]
-                            };
+                        TAG: /* Eq */0,
+                        _0: [
+                          true,
+                          false
+                        ],
+                        _1: [
+                          deleted,
+                          map.has(2)
+                        ]
+                      };
                     })
                 ],
                 tl: {
@@ -227,10 +227,10 @@ const suites_1 = {
                             ]);
                         map.clear();
                         return {
-                                TAG: /* Eq */0,
-                                _0: 0,
-                                _1: map.size
-                              };
+                          TAG: /* Eq */0,
+                          _0: 0,
+                          _1: map.size
+                        };
                       })
                   ],
                   tl: {
@@ -243,16 +243,16 @@ const suites_1 = {
                           const all_same_size = map_1.size === 2 && map_2.size === 2 && map_3.size === 2;
                           const all_same_ref = map_1 === map_2 && map_2 === map_3;
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: [
-                                    true,
-                                    true
-                                  ],
-                                  _1: [
-                                    all_same_size,
-                                    all_same_ref
-                                  ]
-                                };
+                            TAG: /* Eq */0,
+                            _0: [
+                              true,
+                              true
+                            ],
+                            _1: [
+                              all_same_size,
+                              all_same_ref
+                            ]
+                          };
                         })
                     ],
                     tl: {
@@ -279,19 +279,19 @@ const suites_1 = {
                                       ]);
                                 });
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: [
-                                      [
-                                        1,
-                                        "one"
-                                      ],
-                                      [
-                                        2,
-                                        "two"
-                                      ]
-                                    ],
-                                    _1: arr.contents
-                                  };
+                              TAG: /* Eq */0,
+                              _0: [
+                                [
+                                  1,
+                                  "one"
+                                ],
+                                [
+                                  2,
+                                  "two"
+                                ]
+                              ],
+                              _1: arr.contents
+                            };
                           })
                       ],
                       tl: {
@@ -309,13 +309,13 @@ const suites_1 = {
                                           ]
                                         ]).keys());
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: [
-                                        1,
-                                        2
-                                      ],
-                                      _1: keys
-                                    };
+                                TAG: /* Eq */0,
+                                _0: [
+                                  1,
+                                  2
+                                ],
+                                _1: keys
+                              };
                             })
                         ],
                         tl: {
@@ -333,13 +333,13 @@ const suites_1 = {
                                             ]
                                           ]).values());
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: [
-                                          "one",
-                                          "two"
-                                        ],
-                                        _1: values
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: [
+                                    "one",
+                                    "two"
+                                  ],
+                                  _1: values
+                                };
                               })
                           ],
                           tl: {
@@ -358,10 +358,10 @@ const suites_1 = {
                                   ];
                                   const entries = Array.from(new Map(array).entries());
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: array,
-                                          _1: entries
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: array,
+                                    _1: entries
+                                  };
                                 })
                             ],
                             tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_math_test.js b/jscomp/test/dist/jscomp/test/js_math_test.js
index 275ecae96..7bcc9133c 100644
--- a/jscomp/test/dist/jscomp/test/js_math_test.js
+++ b/jscomp/test/dist/jscomp/test/js_math_test.js
@@ -8,11 +8,11 @@ const suites_0 = [
   "_E",
   (function (param) {
       return {
-              TAG: /* ApproxThreshold */6,
-              _0: 0.001,
-              _1: 2.718,
-              _2: Math.E
-            };
+        TAG: /* ApproxThreshold */6,
+        _0: 0.001,
+        _1: 2.718,
+        _2: Math.E
+      };
     })
 ];
 
@@ -21,11 +21,11 @@ const suites_1 = {
     "_LN2",
     (function (param) {
         return {
-                TAG: /* ApproxThreshold */6,
-                _0: 0.001,
-                _1: 0.693,
-                _2: Math.LN2
-              };
+          TAG: /* ApproxThreshold */6,
+          _0: 0.001,
+          _1: 0.693,
+          _2: Math.LN2
+        };
       })
   ],
   tl: {
@@ -33,11 +33,11 @@ const suites_1 = {
       "_LN10",
       (function (param) {
           return {
-                  TAG: /* ApproxThreshold */6,
-                  _0: 0.001,
-                  _1: 2.303,
-                  _2: Math.LN10
-                };
+            TAG: /* ApproxThreshold */6,
+            _0: 0.001,
+            _1: 2.303,
+            _2: Math.LN10
+          };
         })
     ],
     tl: {
@@ -45,11 +45,11 @@ const suites_1 = {
         "_LOG2E",
         (function (param) {
             return {
-                    TAG: /* ApproxThreshold */6,
-                    _0: 0.001,
-                    _1: 1.443,
-                    _2: Math.LOG2E
-                  };
+              TAG: /* ApproxThreshold */6,
+              _0: 0.001,
+              _1: 1.443,
+              _2: Math.LOG2E
+            };
           })
       ],
       tl: {
@@ -57,11 +57,11 @@ const suites_1 = {
           "_LOG10E",
           (function (param) {
               return {
-                      TAG: /* ApproxThreshold */6,
-                      _0: 0.001,
-                      _1: 0.434,
-                      _2: Math.LOG10E
-                    };
+                TAG: /* ApproxThreshold */6,
+                _0: 0.001,
+                _1: 0.434,
+                _2: Math.LOG10E
+              };
             })
         ],
         tl: {
@@ -69,11 +69,11 @@ const suites_1 = {
             "_PI",
             (function (param) {
                 return {
-                        TAG: /* ApproxThreshold */6,
-                        _0: 0.00001,
-                        _1: 3.14159,
-                        _2: Math.PI
-                      };
+                  TAG: /* ApproxThreshold */6,
+                  _0: 0.00001,
+                  _1: 3.14159,
+                  _2: Math.PI
+                };
               })
           ],
           tl: {
@@ -81,11 +81,11 @@ const suites_1 = {
               "_SQRT1_2",
               (function (param) {
                   return {
-                          TAG: /* ApproxThreshold */6,
-                          _0: 0.001,
-                          _1: 0.707,
-                          _2: Math.SQRT1_2
-                        };
+                    TAG: /* ApproxThreshold */6,
+                    _0: 0.001,
+                    _1: 0.707,
+                    _2: Math.SQRT1_2
+                  };
                 })
             ],
             tl: {
@@ -93,11 +93,11 @@ const suites_1 = {
                 "_SQRT2",
                 (function (param) {
                     return {
-                            TAG: /* ApproxThreshold */6,
-                            _0: 0.001,
-                            _1: 1.414,
-                            _2: Math.SQRT2
-                          };
+                      TAG: /* ApproxThreshold */6,
+                      _0: 0.001,
+                      _1: 1.414,
+                      _2: Math.SQRT2
+                    };
                   })
               ],
               tl: {
@@ -105,10 +105,10 @@ const suites_1 = {
                   "abs_int",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: 4,
-                              _1: Math.abs(-4)
-                            };
+                        TAG: /* Eq */0,
+                        _0: 4,
+                        _1: Math.abs(-4)
+                      };
                     })
                 ],
                 tl: {
@@ -116,10 +116,10 @@ const suites_1 = {
                     "abs_float",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: 1.2,
-                                _1: Math.abs(-1.2)
-                              };
+                          TAG: /* Eq */0,
+                          _0: 1.2,
+                          _1: Math.abs(-1.2)
+                        };
                       })
                   ],
                   tl: {
@@ -127,11 +127,11 @@ const suites_1 = {
                       "acos",
                       (function (param) {
                           return {
-                                  TAG: /* ApproxThreshold */6,
-                                  _0: 0.001,
-                                  _1: 1.159,
-                                  _2: Math.acos(0.4)
-                                };
+                            TAG: /* ApproxThreshold */6,
+                            _0: 0.001,
+                            _1: 1.159,
+                            _2: Math.acos(0.4)
+                          };
                         })
                     ],
                     tl: {
@@ -139,11 +139,11 @@ const suites_1 = {
                         "acosh",
                         (function (param) {
                             return {
-                                    TAG: /* ApproxThreshold */6,
-                                    _0: 0.001,
-                                    _1: 0.622,
-                                    _2: Math.acosh(1.2)
-                                  };
+                              TAG: /* ApproxThreshold */6,
+                              _0: 0.001,
+                              _1: 0.622,
+                              _2: Math.acosh(1.2)
+                            };
                           })
                       ],
                       tl: {
@@ -151,11 +151,11 @@ const suites_1 = {
                           "asin",
                           (function (param) {
                               return {
-                                      TAG: /* ApproxThreshold */6,
-                                      _0: 0.001,
-                                      _1: 0.411,
-                                      _2: Math.asin(0.4)
-                                    };
+                                TAG: /* ApproxThreshold */6,
+                                _0: 0.001,
+                                _1: 0.411,
+                                _2: Math.asin(0.4)
+                              };
                             })
                         ],
                         tl: {
@@ -163,11 +163,11 @@ const suites_1 = {
                             "asinh",
                             (function (param) {
                                 return {
-                                        TAG: /* ApproxThreshold */6,
-                                        _0: 0.001,
-                                        _1: 0.390,
-                                        _2: Math.asinh(0.4)
-                                      };
+                                  TAG: /* ApproxThreshold */6,
+                                  _0: 0.001,
+                                  _1: 0.390,
+                                  _2: Math.asinh(0.4)
+                                };
                               })
                           ],
                           tl: {
@@ -175,11 +175,11 @@ const suites_1 = {
                               "atan",
                               (function (param) {
                                   return {
-                                          TAG: /* ApproxThreshold */6,
-                                          _0: 0.001,
-                                          _1: 0.380,
-                                          _2: Math.atan(0.4)
-                                        };
+                                    TAG: /* ApproxThreshold */6,
+                                    _0: 0.001,
+                                    _1: 0.380,
+                                    _2: Math.atan(0.4)
+                                  };
                                 })
                             ],
                             tl: {
@@ -187,11 +187,11 @@ const suites_1 = {
                                 "atanh",
                                 (function (param) {
                                     return {
-                                            TAG: /* ApproxThreshold */6,
-                                            _0: 0.001,
-                                            _1: 0.423,
-                                            _2: Math.atanh(0.4)
-                                          };
+                                      TAG: /* ApproxThreshold */6,
+                                      _0: 0.001,
+                                      _1: 0.423,
+                                      _2: Math.atanh(0.4)
+                                    };
                                   })
                               ],
                               tl: {
@@ -199,11 +199,11 @@ const suites_1 = {
                                   "atan2",
                                   (function (param) {
                                       return {
-                                              TAG: /* ApproxThreshold */6,
-                                              _0: 0.001,
-                                              _1: 0.588,
-                                              _2: Math.atan2(0.4, 0.6)
-                                            };
+                                        TAG: /* ApproxThreshold */6,
+                                        _0: 0.001,
+                                        _1: 0.588,
+                                        _2: Math.atan2(0.4, 0.6)
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -211,10 +211,10 @@ const suites_1 = {
                                     "cbrt",
                                     (function (param) {
                                         return {
-                                                TAG: /* Eq */0,
-                                                _0: 2,
-                                                _1: Math.cbrt(8)
-                                              };
+                                          TAG: /* Eq */0,
+                                          _0: 2,
+                                          _1: Math.cbrt(8)
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -222,10 +222,10 @@ const suites_1 = {
                                       "unsafe_ceil_int",
                                       (function (param) {
                                           return {
-                                                  TAG: /* Eq */0,
-                                                  _0: 4,
-                                                  _1: Math.ceil(3.2)
-                                                };
+                                            TAG: /* Eq */0,
+                                            _0: 4,
+                                            _1: Math.ceil(3.2)
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -233,10 +233,10 @@ const suites_1 = {
                                         "ceil_int",
                                         (function (param) {
                                             return {
-                                                    TAG: /* Eq */0,
-                                                    _0: 4,
-                                                    _1: Js__Js_math.ceil_int(3.2)
-                                                  };
+                                              TAG: /* Eq */0,
+                                              _0: 4,
+                                              _1: Js__Js_math.ceil_int(3.2)
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -244,10 +244,10 @@ const suites_1 = {
                                           "ceil_float",
                                           (function (param) {
                                               return {
-                                                      TAG: /* Eq */0,
-                                                      _0: 4,
-                                                      _1: Math.ceil(3.2)
-                                                    };
+                                                TAG: /* Eq */0,
+                                                _0: 4,
+                                                _1: Math.ceil(3.2)
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -255,11 +255,11 @@ const suites_1 = {
                                             "cos",
                                             (function (param) {
                                                 return {
-                                                        TAG: /* ApproxThreshold */6,
-                                                        _0: 0.001,
-                                                        _1: 0.921,
-                                                        _2: Math.cos(0.4)
-                                                      };
+                                                  TAG: /* ApproxThreshold */6,
+                                                  _0: 0.001,
+                                                  _1: 0.921,
+                                                  _2: Math.cos(0.4)
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -267,11 +267,11 @@ const suites_1 = {
                                               "cosh",
                                               (function (param) {
                                                   return {
-                                                          TAG: /* ApproxThreshold */6,
-                                                          _0: 0.001,
-                                                          _1: 1.081,
-                                                          _2: Math.cosh(0.4)
-                                                        };
+                                                    TAG: /* ApproxThreshold */6,
+                                                    _0: 0.001,
+                                                    _1: 1.081,
+                                                    _2: Math.cosh(0.4)
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -279,11 +279,11 @@ const suites_1 = {
                                                 "exp",
                                                 (function (param) {
                                                     return {
-                                                            TAG: /* ApproxThreshold */6,
-                                                            _0: 0.001,
-                                                            _1: 1.491,
-                                                            _2: Math.exp(0.4)
-                                                          };
+                                                      TAG: /* ApproxThreshold */6,
+                                                      _0: 0.001,
+                                                      _1: 1.491,
+                                                      _2: Math.exp(0.4)
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -291,11 +291,11 @@ const suites_1 = {
                                                   "expm1",
                                                   (function (param) {
                                                       return {
-                                                              TAG: /* ApproxThreshold */6,
-                                                              _0: 0.001,
-                                                              _1: 0.491,
-                                                              _2: Math.expm1(0.4)
-                                                            };
+                                                        TAG: /* ApproxThreshold */6,
+                                                        _0: 0.001,
+                                                        _1: 0.491,
+                                                        _2: Math.expm1(0.4)
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -303,10 +303,10 @@ const suites_1 = {
                                                     "unsafe_floor_int",
                                                     (function (param) {
                                                         return {
-                                                                TAG: /* Eq */0,
-                                                                _0: 3,
-                                                                _1: Math.floor(3.2)
-                                                              };
+                                                          TAG: /* Eq */0,
+                                                          _0: 3,
+                                                          _1: Math.floor(3.2)
+                                                        };
                                                       })
                                                   ],
                                                   tl: {
@@ -314,10 +314,10 @@ const suites_1 = {
                                                       "floor_int",
                                                       (function (param) {
                                                           return {
-                                                                  TAG: /* Eq */0,
-                                                                  _0: 3,
-                                                                  _1: Js__Js_math.floor_int(3.2)
-                                                                };
+                                                            TAG: /* Eq */0,
+                                                            _0: 3,
+                                                            _1: Js__Js_math.floor_int(3.2)
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -325,10 +325,10 @@ const suites_1 = {
                                                         "floor_float",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: /* Eq */0,
-                                                                    _0: 3,
-                                                                    _1: Math.floor(3.2)
-                                                                  };
+                                                              TAG: /* Eq */0,
+                                                              _0: 3,
+                                                              _1: Math.floor(3.2)
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -336,10 +336,10 @@ const suites_1 = {
                                                           "fround",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: /* Approx */5,
-                                                                      _0: 3.2,
-                                                                      _1: Math.fround(3.2)
-                                                                    };
+                                                                TAG: /* Approx */5,
+                                                                _0: 3.2,
+                                                                _1: Math.fround(3.2)
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -347,11 +347,11 @@ const suites_1 = {
                                                             "hypot",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: /* ApproxThreshold */6,
-                                                                        _0: 0.001,
-                                                                        _1: 0.721,
-                                                                        _2: Math.hypot(0.4, 0.6)
-                                                                      };
+                                                                  TAG: /* ApproxThreshold */6,
+                                                                  _0: 0.001,
+                                                                  _1: 0.721,
+                                                                  _2: Math.hypot(0.4, 0.6)
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -359,11 +359,11 @@ const suites_1 = {
                                                               "hypotMany",
                                                               (function (param) {
                                                                   return {
-                                                                          TAG: /* ApproxThreshold */6,
-                                                                          _0: 0.001,
-                                                                          _1: 1.077,
-                                                                          _2: Math.hypot(0.4, 0.6, 0.8)
-                                                                        };
+                                                                    TAG: /* ApproxThreshold */6,
+                                                                    _0: 0.001,
+                                                                    _1: 1.077,
+                                                                    _2: Math.hypot(0.4, 0.6, 0.8)
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -371,10 +371,10 @@ const suites_1 = {
                                                                 "imul",
                                                                 (function (param) {
                                                                     return {
-                                                                            TAG: /* Eq */0,
-                                                                            _0: 8,
-                                                                            _1: Math.imul(4, 2)
-                                                                          };
+                                                                      TAG: /* Eq */0,
+                                                                      _0: 8,
+                                                                      _1: Math.imul(4, 2)
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -382,11 +382,11 @@ const suites_1 = {
                                                                   "log",
                                                                   (function (param) {
                                                                       return {
-                                                                              TAG: /* ApproxThreshold */6,
-                                                                              _0: 0.001,
-                                                                              _1: -0.916,
-                                                                              _2: Math.log(0.4)
-                                                                            };
+                                                                        TAG: /* ApproxThreshold */6,
+                                                                        _0: 0.001,
+                                                                        _1: -0.916,
+                                                                        _2: Math.log(0.4)
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -394,11 +394,11 @@ const suites_1 = {
                                                                     "log1p",
                                                                     (function (param) {
                                                                         return {
-                                                                                TAG: /* ApproxThreshold */6,
-                                                                                _0: 0.001,
-                                                                                _1: 0.336,
-                                                                                _2: Math.log1p(0.4)
-                                                                              };
+                                                                          TAG: /* ApproxThreshold */6,
+                                                                          _0: 0.001,
+                                                                          _1: 0.336,
+                                                                          _2: Math.log1p(0.4)
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -406,11 +406,11 @@ const suites_1 = {
                                                                       "log10",
                                                                       (function (param) {
                                                                           return {
-                                                                                  TAG: /* ApproxThreshold */6,
-                                                                                  _0: 0.001,
-                                                                                  _1: -0.397,
-                                                                                  _2: Math.log10(0.4)
-                                                                                };
+                                                                            TAG: /* ApproxThreshold */6,
+                                                                            _0: 0.001,
+                                                                            _1: -0.397,
+                                                                            _2: Math.log10(0.4)
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -418,11 +418,11 @@ const suites_1 = {
                                                                         "log2",
                                                                         (function (param) {
                                                                             return {
-                                                                                    TAG: /* ApproxThreshold */6,
-                                                                                    _0: 0.001,
-                                                                                    _1: -1.321,
-                                                                                    _2: Math.log2(0.4)
-                                                                                  };
+                                                                              TAG: /* ApproxThreshold */6,
+                                                                              _0: 0.001,
+                                                                              _1: -1.321,
+                                                                              _2: Math.log2(0.4)
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -430,10 +430,10 @@ const suites_1 = {
                                                                           "max_int",
                                                                           (function (param) {
                                                                               return {
-                                                                                      TAG: /* Eq */0,
-                                                                                      _0: 4,
-                                                                                      _1: Math.max(2, 4)
-                                                                                    };
+                                                                                TAG: /* Eq */0,
+                                                                                _0: 4,
+                                                                                _1: Math.max(2, 4)
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -441,10 +441,10 @@ const suites_1 = {
                                                                             "maxMany_int",
                                                                             (function (param) {
                                                                                 return {
-                                                                                        TAG: /* Eq */0,
-                                                                                        _0: 4,
-                                                                                        _1: Math.max(2, 4, 3)
-                                                                                      };
+                                                                                  TAG: /* Eq */0,
+                                                                                  _0: 4,
+                                                                                  _1: Math.max(2, 4, 3)
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -452,10 +452,10 @@ const suites_1 = {
                                                                               "max_float",
                                                                               (function (param) {
                                                                                   return {
-                                                                                          TAG: /* Eq */0,
-                                                                                          _0: 4.2,
-                                                                                          _1: Math.max(2.7, 4.2)
-                                                                                        };
+                                                                                    TAG: /* Eq */0,
+                                                                                    _0: 4.2,
+                                                                                    _1: Math.max(2.7, 4.2)
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -463,10 +463,10 @@ const suites_1 = {
                                                                                 "maxMany_float",
                                                                                 (function (param) {
                                                                                     return {
-                                                                                            TAG: /* Eq */0,
-                                                                                            _0: 4.2,
-                                                                                            _1: Math.max(2.7, 4.2, 3.9)
-                                                                                          };
+                                                                                      TAG: /* Eq */0,
+                                                                                      _0: 4.2,
+                                                                                      _1: Math.max(2.7, 4.2, 3.9)
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -474,10 +474,10 @@ const suites_1 = {
                                                                                   "min_int",
                                                                                   (function (param) {
                                                                                       return {
-                                                                                              TAG: /* Eq */0,
-                                                                                              _0: 2,
-                                                                                              _1: Math.min(2, 4)
-                                                                                            };
+                                                                                        TAG: /* Eq */0,
+                                                                                        _0: 2,
+                                                                                        _1: Math.min(2, 4)
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -485,10 +485,10 @@ const suites_1 = {
                                                                                     "minMany_int",
                                                                                     (function (param) {
                                                                                         return {
-                                                                                                TAG: /* Eq */0,
-                                                                                                _0: 2,
-                                                                                                _1: Math.min(2, 4, 3)
-                                                                                              };
+                                                                                          TAG: /* Eq */0,
+                                                                                          _0: 2,
+                                                                                          _1: Math.min(2, 4, 3)
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -496,10 +496,10 @@ const suites_1 = {
                                                                                       "min_float",
                                                                                       (function (param) {
                                                                                           return {
-                                                                                                  TAG: /* Eq */0,
-                                                                                                  _0: 2.7,
-                                                                                                  _1: Math.min(2.7, 4.2)
-                                                                                                };
+                                                                                            TAG: /* Eq */0,
+                                                                                            _0: 2.7,
+                                                                                            _1: Math.min(2.7, 4.2)
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: {
@@ -507,10 +507,10 @@ const suites_1 = {
                                                                                         "minMany_float",
                                                                                         (function (param) {
                                                                                             return {
-                                                                                                    TAG: /* Eq */0,
-                                                                                                    _0: 2.7,
-                                                                                                    _1: Math.min(2.7, 4.2, 3.9)
-                                                                                                  };
+                                                                                              TAG: /* Eq */0,
+                                                                                              _0: 2.7,
+                                                                                              _1: Math.min(2.7, 4.2, 3.9)
+                                                                                            };
                                                                                           })
                                                                                       ],
                                                                                       tl: {
@@ -519,9 +519,9 @@ const suites_1 = {
                                                                                           (function (param) {
                                                                                               const a = Math.random();
                                                                                               return {
-                                                                                                      TAG: /* Ok */4,
-                                                                                                      _0: a >= 0 && a < 1
-                                                                                                    };
+                                                                                                TAG: /* Ok */4,
+                                                                                                _0: a >= 0 && a < 1
+                                                                                              };
                                                                                             })
                                                                                         ],
                                                                                         tl: {
@@ -530,9 +530,9 @@ const suites_1 = {
                                                                                             (function (param) {
                                                                                                 const a = Js__Js_math.random_int(1, 3);
                                                                                                 return {
-                                                                                                        TAG: /* Ok */4,
-                                                                                                        _0: a >= 1 && a < 3
-                                                                                                      };
+                                                                                                  TAG: /* Ok */4,
+                                                                                                  _0: a >= 1 && a < 3
+                                                                                                };
                                                                                               })
                                                                                           ],
                                                                                           tl: {
@@ -540,10 +540,10 @@ const suites_1 = {
                                                                                               "unsafe_round",
                                                                                               (function (param) {
                                                                                                   return {
-                                                                                                          TAG: /* Eq */0,
-                                                                                                          _0: 3,
-                                                                                                          _1: Math.round(3.2)
-                                                                                                        };
+                                                                                                    TAG: /* Eq */0,
+                                                                                                    _0: 3,
+                                                                                                    _1: Math.round(3.2)
+                                                                                                  };
                                                                                                 })
                                                                                             ],
                                                                                             tl: {
@@ -551,10 +551,10 @@ const suites_1 = {
                                                                                                 "round",
                                                                                                 (function (param) {
                                                                                                     return {
-                                                                                                            TAG: /* Eq */0,
-                                                                                                            _0: 3,
-                                                                                                            _1: Math.round(3.2)
-                                                                                                          };
+                                                                                                      TAG: /* Eq */0,
+                                                                                                      _0: 3,
+                                                                                                      _1: Math.round(3.2)
+                                                                                                    };
                                                                                                   })
                                                                                               ],
                                                                                               tl: {
@@ -562,10 +562,10 @@ const suites_1 = {
                                                                                                   "sign_int",
                                                                                                   (function (param) {
                                                                                                       return {
-                                                                                                              TAG: /* Eq */0,
-                                                                                                              _0: -1,
-                                                                                                              _1: Math.sign(-4)
-                                                                                                            };
+                                                                                                        TAG: /* Eq */0,
+                                                                                                        _0: -1,
+                                                                                                        _1: Math.sign(-4)
+                                                                                                      };
                                                                                                     })
                                                                                                 ],
                                                                                                 tl: {
@@ -573,10 +573,10 @@ const suites_1 = {
                                                                                                     "sign_float",
                                                                                                     (function (param) {
                                                                                                         return {
-                                                                                                                TAG: /* Eq */0,
-                                                                                                                _0: -1,
-                                                                                                                _1: Math.sign(-4.2)
-                                                                                                              };
+                                                                                                          TAG: /* Eq */0,
+                                                                                                          _0: -1,
+                                                                                                          _1: Math.sign(-4.2)
+                                                                                                        };
                                                                                                       })
                                                                                                   ],
                                                                                                   tl: {
@@ -584,10 +584,10 @@ const suites_1 = {
                                                                                                       "sign_float -0",
                                                                                                       (function (param) {
                                                                                                           return {
-                                                                                                                  TAG: /* Eq */0,
-                                                                                                                  _0: -0,
-                                                                                                                  _1: Math.sign(-0)
-                                                                                                                };
+                                                                                                            TAG: /* Eq */0,
+                                                                                                            _0: -0,
+                                                                                                            _1: Math.sign(-0)
+                                                                                                          };
                                                                                                         })
                                                                                                     ],
                                                                                                     tl: {
@@ -595,11 +595,11 @@ const suites_1 = {
                                                                                                         "sin",
                                                                                                         (function (param) {
                                                                                                             return {
-                                                                                                                    TAG: /* ApproxThreshold */6,
-                                                                                                                    _0: 0.001,
-                                                                                                                    _1: 0.389,
-                                                                                                                    _2: Math.sin(0.4)
-                                                                                                                  };
+                                                                                                              TAG: /* ApproxThreshold */6,
+                                                                                                              _0: 0.001,
+                                                                                                              _1: 0.389,
+                                                                                                              _2: Math.sin(0.4)
+                                                                                                            };
                                                                                                           })
                                                                                                       ],
                                                                                                       tl: {
@@ -607,11 +607,11 @@ const suites_1 = {
                                                                                                           "sinh",
                                                                                                           (function (param) {
                                                                                                               return {
-                                                                                                                      TAG: /* ApproxThreshold */6,
-                                                                                                                      _0: 0.001,
-                                                                                                                      _1: 0.410,
-                                                                                                                      _2: Math.sinh(0.4)
-                                                                                                                    };
+                                                                                                                TAG: /* ApproxThreshold */6,
+                                                                                                                _0: 0.001,
+                                                                                                                _1: 0.410,
+                                                                                                                _2: Math.sinh(0.4)
+                                                                                                              };
                                                                                                             })
                                                                                                         ],
                                                                                                         tl: {
@@ -619,11 +619,11 @@ const suites_1 = {
                                                                                                             "sqrt",
                                                                                                             (function (param) {
                                                                                                                 return {
-                                                                                                                        TAG: /* ApproxThreshold */6,
-                                                                                                                        _0: 0.001,
-                                                                                                                        _1: 0.632,
-                                                                                                                        _2: Math.sqrt(0.4)
-                                                                                                                      };
+                                                                                                                  TAG: /* ApproxThreshold */6,
+                                                                                                                  _0: 0.001,
+                                                                                                                  _1: 0.632,
+                                                                                                                  _2: Math.sqrt(0.4)
+                                                                                                                };
                                                                                                               })
                                                                                                           ],
                                                                                                           tl: {
@@ -631,11 +631,11 @@ const suites_1 = {
                                                                                                               "tan",
                                                                                                               (function (param) {
                                                                                                                   return {
-                                                                                                                          TAG: /* ApproxThreshold */6,
-                                                                                                                          _0: 0.001,
-                                                                                                                          _1: 0.422,
-                                                                                                                          _2: Math.tan(0.4)
-                                                                                                                        };
+                                                                                                                    TAG: /* ApproxThreshold */6,
+                                                                                                                    _0: 0.001,
+                                                                                                                    _1: 0.422,
+                                                                                                                    _2: Math.tan(0.4)
+                                                                                                                  };
                                                                                                                 })
                                                                                                             ],
                                                                                                             tl: {
@@ -643,11 +643,11 @@ const suites_1 = {
                                                                                                                 "tanh",
                                                                                                                 (function (param) {
                                                                                                                     return {
-                                                                                                                            TAG: /* ApproxThreshold */6,
-                                                                                                                            _0: 0.001,
-                                                                                                                            _1: 0.379,
-                                                                                                                            _2: Math.tanh(0.4)
-                                                                                                                          };
+                                                                                                                      TAG: /* ApproxThreshold */6,
+                                                                                                                      _0: 0.001,
+                                                                                                                      _1: 0.379,
+                                                                                                                      _2: Math.tanh(0.4)
+                                                                                                                    };
                                                                                                                   })
                                                                                                               ],
                                                                                                               tl: {
@@ -655,10 +655,10 @@ const suites_1 = {
                                                                                                                   "unsafe_trunc",
                                                                                                                   (function (param) {
                                                                                                                       return {
-                                                                                                                              TAG: /* Eq */0,
-                                                                                                                              _0: 4,
-                                                                                                                              _1: Math.trunc(4.2156)
-                                                                                                                            };
+                                                                                                                        TAG: /* Eq */0,
+                                                                                                                        _0: 4,
+                                                                                                                        _1: Math.trunc(4.2156)
+                                                                                                                      };
                                                                                                                     })
                                                                                                                 ],
                                                                                                                 tl: {
@@ -666,10 +666,10 @@ const suites_1 = {
                                                                                                                     "trunc",
                                                                                                                     (function (param) {
                                                                                                                         return {
-                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                _0: 4,
-                                                                                                                                _1: Math.trunc(4.2156)
-                                                                                                                              };
+                                                                                                                          TAG: /* Eq */0,
+                                                                                                                          _0: 4,
+                                                                                                                          _1: Math.trunc(4.2156)
+                                                                                                                        };
                                                                                                                       })
                                                                                                                   ],
                                                                                                                   tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_null_test.js b/jscomp/test/dist/jscomp/test/js_null_test.js
index 9958cab60..3bfa7c204 100644
--- a/jscomp/test/dist/jscomp/test/js_null_test.js
+++ b/jscomp/test/dist/jscomp/test/js_null_test.js
@@ -9,10 +9,10 @@ const suites_0 = [
   "toOption - empty",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: undefined,
-              _1: undefined
-            };
+        TAG: /* Eq */0,
+        _0: undefined,
+        _1: undefined
+      };
     })
 ];
 
@@ -21,10 +21,10 @@ const suites_1 = {
     "toOption - 'a",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: Caml_option.some(undefined),
-                _1: Caml_option.some(undefined)
-              };
+          TAG: /* Eq */0,
+          _0: Caml_option.some(undefined),
+          _1: Caml_option.some(undefined)
+        };
       })
   ],
   tl: {
@@ -32,10 +32,10 @@ const suites_1 = {
       "return",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: "something",
-                  _1: Caml_option.null_to_opt("something")
-                };
+            TAG: /* Eq */0,
+            _0: "something",
+            _1: Caml_option.null_to_opt("something")
+          };
         })
     ],
     tl: {
@@ -43,10 +43,10 @@ const suites_1 = {
         "test - empty",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: true,
-                    _1: true
-                  };
+              TAG: /* Eq */0,
+              _0: true,
+              _1: true
+            };
           })
       ],
       tl: {
@@ -54,10 +54,10 @@ const suites_1 = {
           "test - 'a",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: false,
-                      _1: false
-                    };
+                TAG: /* Eq */0,
+                _0: false,
+                _1: false
+              };
             })
         ],
         tl: {
@@ -65,12 +65,12 @@ const suites_1 = {
             "bind - empty",
             (function (param) {
                 return {
-                        TAG: /* StrictEq */2,
-                        _0: null,
-                        _1: Js__Js_null.bind((function (v) {
-                                return v;
-                              }), null)
-                      };
+                  TAG: /* StrictEq */2,
+                  _0: null,
+                  _1: Js__Js_null.bind((function (v) {
+                          return v;
+                        }), null)
+                };
               })
           ],
           tl: {
@@ -78,12 +78,12 @@ const suites_1 = {
               "bind - 'a",
               (function (param) {
                   return {
-                          TAG: /* StrictEq */2,
-                          _0: 4,
-                          _1: Js__Js_null.map((function (n) {
-                                  return (n << 1);
-                                }), 2)
-                        };
+                    TAG: /* StrictEq */2,
+                    _0: 4,
+                    _1: Js__Js_null.map((function (n) {
+                            return (n << 1);
+                          }), 2)
+                  };
                 })
             ],
             tl: {
@@ -97,10 +97,10 @@ const suites_1 = {
                             hit.contents = true;
                           }), null);
                     return {
-                            TAG: /* Eq */0,
-                            _0: false,
-                            _1: hit.contents
-                          };
+                      TAG: /* Eq */0,
+                      _0: false,
+                      _1: hit.contents
+                    };
                   })
               ],
               tl: {
@@ -114,10 +114,10 @@ const suites_1 = {
                               hit.contents = v;
                             }), 2);
                       return {
-                              TAG: /* Eq */0,
-                              _0: 2,
-                              _1: hit.contents
-                            };
+                        TAG: /* Eq */0,
+                        _0: 2,
+                        _1: hit.contents
+                      };
                     })
                 ],
                 tl: {
@@ -125,10 +125,10 @@ const suites_1 = {
                     "fromOption - None",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: null,
-                                _1: Js__Js_null.fromOption(undefined)
-                              };
+                          TAG: /* Eq */0,
+                          _0: null,
+                          _1: Js__Js_null.fromOption(undefined)
+                        };
                       })
                   ],
                   tl: {
@@ -136,10 +136,10 @@ const suites_1 = {
                       "fromOption - Some",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: 2,
-                                  _1: Js__Js_null.fromOption(2)
-                                };
+                            TAG: /* Eq */0,
+                            _0: 2,
+                            _1: Js__Js_null.fromOption(2)
+                          };
                         })
                     ],
                     tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_null_undefined_test.js b/jscomp/test/dist/jscomp/test/js_null_undefined_test.js
index f8ee1db6c..0a67ecb0c 100644
--- a/jscomp/test/dist/jscomp/test/js_null_undefined_test.js
+++ b/jscomp/test/dist/jscomp/test/js_null_undefined_test.js
@@ -9,10 +9,10 @@ const suites_0 = [
   "toOption - null",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: undefined,
-              _1: undefined
-            };
+        TAG: /* Eq */0,
+        _0: undefined,
+        _1: undefined
+      };
     })
 ];
 
@@ -21,10 +21,10 @@ const suites_1 = {
     "toOption - undefined",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: undefined,
-                _1: undefined
-              };
+          TAG: /* Eq */0,
+          _0: undefined,
+          _1: undefined
+        };
       })
   ],
   tl: {
@@ -32,10 +32,10 @@ const suites_1 = {
       "toOption - empty",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: undefined,
-                  _1: undefined
-                };
+            TAG: /* Eq */0,
+            _0: undefined,
+            _1: undefined
+          };
         })
     ],
     tl: {
@@ -43,10 +43,10 @@ const suites_1 = {
         "File \"jscomp/test/js_null_undefined_test.ml\", line 7, characters 2-9",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: "foo",
-                    _1: Caml_option.nullable_to_opt("foo")
-                  };
+              TAG: /* Eq */0,
+              _0: "foo",
+              _1: Caml_option.nullable_to_opt("foo")
+            };
           })
       ],
       tl: {
@@ -54,10 +54,10 @@ const suites_1 = {
           "return",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: "something",
-                      _1: Caml_option.nullable_to_opt("something")
-                    };
+                TAG: /* Eq */0,
+                _0: "something",
+                _1: Caml_option.nullable_to_opt("something")
+              };
             })
         ],
         tl: {
@@ -65,10 +65,10 @@ const suites_1 = {
             "test - null",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: true,
-                        _1: true
-                      };
+                  TAG: /* Eq */0,
+                  _0: true,
+                  _1: true
+                };
               })
           ],
           tl: {
@@ -76,10 +76,10 @@ const suites_1 = {
               "test - undefined",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: true,
-                          _1: true
-                        };
+                    TAG: /* Eq */0,
+                    _0: true,
+                    _1: true
+                  };
                 })
             ],
             tl: {
@@ -87,10 +87,10 @@ const suites_1 = {
                 "test - empty",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: true,
-                            _1: true
-                          };
+                      TAG: /* Eq */0,
+                      _0: true,
+                      _1: true
+                    };
                   })
               ],
               tl: {
@@ -98,10 +98,10 @@ const suites_1 = {
                   "File \"jscomp/test/js_null_undefined_test.ml\", line 12, characters 2-9",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: true,
-                              _1: true
-                            };
+                        TAG: /* Eq */0,
+                        _0: true,
+                        _1: true
+                      };
                     })
                 ],
                 tl: {
@@ -109,12 +109,12 @@ const suites_1 = {
                     "map - null",
                     (function (param) {
                         return {
-                                TAG: /* StrictEq */2,
-                                _0: null,
-                                _1: Js__Js_nullable.map((function (v) {
-                                        return v;
-                                      }), null)
-                              };
+                          TAG: /* StrictEq */2,
+                          _0: null,
+                          _1: Js__Js_nullable.map((function (v) {
+                                  return v;
+                                }), null)
+                        };
                       })
                   ],
                   tl: {
@@ -122,12 +122,12 @@ const suites_1 = {
                       "map - undefined",
                       (function (param) {
                           return {
-                                  TAG: /* StrictEq */2,
-                                  _0: undefined,
-                                  _1: Js__Js_nullable.map((function (v) {
-                                          return v;
-                                        }), undefined)
-                                };
+                            TAG: /* StrictEq */2,
+                            _0: undefined,
+                            _1: Js__Js_nullable.map((function (v) {
+                                    return v;
+                                  }), undefined)
+                          };
                         })
                     ],
                     tl: {
@@ -135,12 +135,12 @@ const suites_1 = {
                         "map - empty",
                         (function (param) {
                             return {
-                                    TAG: /* StrictEq */2,
-                                    _0: undefined,
-                                    _1: Js__Js_nullable.map((function (v) {
-                                            return v;
-                                          }), undefined)
-                                  };
+                              TAG: /* StrictEq */2,
+                              _0: undefined,
+                              _1: Js__Js_nullable.map((function (v) {
+                                      return v;
+                                    }), undefined)
+                            };
                           })
                       ],
                       tl: {
@@ -148,12 +148,12 @@ const suites_1 = {
                           "map - 'a",
                           (function (param) {
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: 4,
-                                      _1: Js__Js_nullable.map((function (n) {
-                                              return (n << 1);
-                                            }), 2)
-                                    };
+                                TAG: /* Eq */0,
+                                _0: 4,
+                                _1: Js__Js_nullable.map((function (n) {
+                                        return (n << 1);
+                                      }), 2)
+                              };
                             })
                         ],
                         tl: {
@@ -167,10 +167,10 @@ const suites_1 = {
                                         hit.contents = true;
                                       }), null);
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: false,
-                                        _1: hit.contents
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: false,
+                                  _1: hit.contents
+                                };
                               })
                           ],
                           tl: {
@@ -184,10 +184,10 @@ const suites_1 = {
                                           hit.contents = true;
                                         }), undefined);
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: false,
-                                          _1: hit.contents
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: false,
+                                    _1: hit.contents
+                                  };
                                 })
                             ],
                             tl: {
@@ -201,10 +201,10 @@ const suites_1 = {
                                             hit.contents = true;
                                           }), undefined);
                                     return {
-                                            TAG: /* Eq */0,
-                                            _0: false,
-                                            _1: hit.contents
-                                          };
+                                      TAG: /* Eq */0,
+                                      _0: false,
+                                      _1: hit.contents
+                                    };
                                   })
                               ],
                               tl: {
@@ -218,10 +218,10 @@ const suites_1 = {
                                               hit.contents = v;
                                             }), 2);
                                       return {
-                                              TAG: /* Eq */0,
-                                              _0: 2,
-                                              _1: hit.contents
-                                            };
+                                        TAG: /* Eq */0,
+                                        _0: 2,
+                                        _1: hit.contents
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -229,10 +229,10 @@ const suites_1 = {
                                     "fromOption - None",
                                     (function (param) {
                                         return {
-                                                TAG: /* Eq */0,
-                                                _0: undefined,
-                                                _1: Js__Js_nullable.fromOption(undefined)
-                                              };
+                                          TAG: /* Eq */0,
+                                          _0: undefined,
+                                          _1: Js__Js_nullable.fromOption(undefined)
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -240,10 +240,10 @@ const suites_1 = {
                                       "fromOption - Some",
                                       (function (param) {
                                           return {
-                                                  TAG: /* Eq */0,
-                                                  _0: 2,
-                                                  _1: Js__Js_nullable.fromOption(2)
-                                                };
+                                            TAG: /* Eq */0,
+                                            _0: 2,
+                                            _1: Js__Js_nullable.fromOption(2)
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -251,9 +251,9 @@ const suites_1 = {
                                         "null <> undefined",
                                         (function (param) {
                                             return {
-                                                    TAG: /* Ok */4,
-                                                    _0: true
-                                                  };
+                                              TAG: /* Ok */4,
+                                              _0: true
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -261,9 +261,9 @@ const suites_1 = {
                                           "null <> empty",
                                           (function (param) {
                                               return {
-                                                      TAG: /* Ok */4,
-                                                      _0: true
-                                                    };
+                                                TAG: /* Ok */4,
+                                                _0: true
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -271,9 +271,9 @@ const suites_1 = {
                                             "undefined = empty",
                                             (function (param) {
                                                 return {
-                                                        TAG: /* Ok */4,
-                                                        _0: true
-                                                      };
+                                                  TAG: /* Ok */4,
+                                                  _0: true
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -281,9 +281,9 @@ const suites_1 = {
                                               "File \"jscomp/test/js_null_undefined_test.ml\", line 42, characters 2-9",
                                               (function (param) {
                                                   return {
-                                                          TAG: /* Ok */4,
-                                                          _0: true
-                                                        };
+                                                    TAG: /* Ok */4,
+                                                    _0: true
+                                                  };
                                                 })
                                             ],
                                             tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_nullable_test.js b/jscomp/test/dist/jscomp/test/js_nullable_test.js
index 29eec3120..a376edc58 100644
--- a/jscomp/test/dist/jscomp/test/js_nullable_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/js_obj_test.js b/jscomp/test/dist/jscomp/test/js_obj_test.js
index 07b93a389..a2da21a60 100644
--- a/jscomp/test/dist/jscomp/test/js_obj_test.js
+++ b/jscomp/test/dist/jscomp/test/js_obj_test.js
@@ -37,10 +37,10 @@ const suites_0 = [
         object_tables.key = env_init;
       }
       return {
-              TAG: /* Eq */0,
-              _0: 33,
-              _1: f(Curry._1(object_tables.key, undefined))
-            };
+        TAG: /* Eq */0,
+        _0: 33,
+        _1: f(Curry._1(object_tables.key, undefined))
+      };
     })
 ];
 
@@ -49,14 +49,14 @@ const suites_1 = {
     "js_obj",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: 34,
-                _1: ({
-                      say: (function (x) {
-                          return x + 2 | 0;
-                        })
-                    }).say(32)
-              };
+          TAG: /* Eq */0,
+          _0: 34,
+          _1: ({
+              say: (function (x) {
+                  return x + 2 | 0;
+                })
+            }).say(32)
+        };
       })
   ],
   tl: {
@@ -64,14 +64,14 @@ const suites_1 = {
       "js_obj2",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: 34,
-                  _1: ({
-                        say: (function (x) {
-                            return x + 2 | 0;
-                          })
-                      }).say(32)
-                };
+            TAG: /* Eq */0,
+            _0: 34,
+            _1: ({
+                say: (function (x) {
+                    return x + 2 | 0;
+                  })
+              }).say(32)
+          };
         })
     ],
     tl: {
@@ -79,10 +79,10 @@ const suites_1 = {
         "empty",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: 0,
-                    _1: Object.keys({}).length
-                  };
+              TAG: /* Eq */0,
+              _0: 0,
+              _1: Object.keys({}).length
+            };
           })
       ],
       tl: {
@@ -90,14 +90,14 @@ const suites_1 = {
           "assign",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: {
-                        a: 1
-                      },
-                      _1: Object.assign({}, {
-                            a: 1
-                          })
-                    };
+                TAG: /* Eq */0,
+                _0: {
+                  a: 1
+                },
+                _1: Object.assign({}, {
+                      a: 1
+                    })
+              };
             })
         ],
         tl: {
@@ -108,14 +108,14 @@ const suites_1 = {
                   a: 1
                 };
                 return {
-                        TAG: /* Eq */0,
-                        _0: {
-                          a: 2
-                        },
-                        _1: Object.assign({}, original, {
-                              a: 2
-                            })
-                      };
+                  TAG: /* Eq */0,
+                  _0: {
+                    a: 2
+                  },
+                  _1: Object.assign({}, original, {
+                        a: 2
+                      })
+                };
               })
           ],
           tl: {
@@ -129,12 +129,12 @@ const suites_1 = {
                         a: 2
                       });
                   return {
-                          TAG: /* Eq */0,
-                          _0: {
-                            a: 1
-                          },
-                          _1: original
-                        };
+                    TAG: /* Eq */0,
+                    _0: {
+                      a: 1
+                    },
+                    _1: original
+                  };
                 })
             ],
             tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_promise_basic_test.js b/jscomp/test/dist/jscomp/test/js_promise_basic_test.js
index fb7d91a2f..6cb60a786 100644
--- a/jscomp/test/dist/jscomp/test/js_promise_basic_test.js
+++ b/jscomp/test/dist/jscomp/test/js_promise_basic_test.js
@@ -24,10 +24,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -39,36 +39,36 @@ function assert_bool(b) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError(Stdlib.Invalid_argument, {
-            MEL_EXN_ID: Stdlib.Invalid_argument,
-            _1: "Assertion Failure."
-          });
+        MEL_EXN_ID: Stdlib.Invalid_argument,
+        _1: "Assertion Failure."
+      });
 }
 
 function fail(param) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/js_promise_basic_test.ml",
-              17,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/js_promise_basic_test.ml",
+          17,
+          2
+        ]
+      });
 }
 
 function thenTest(param) {
   const p = Promise.resolve(4);
   return p.then(function (x) {
-              return Promise.resolve(assert_bool(x === 4));
-            });
+        return Promise.resolve(assert_bool(x === 4));
+      });
 }
 
 function andThenTest(param) {
   const p = Promise.resolve(6);
   return p.then(function (param) {
-                return Promise.resolve(12);
-              }).then(function (y) {
-              return Promise.resolve(assert_bool(y === 12));
-            });
+          return Promise.resolve(12);
+        }).then(function (y) {
+        return Promise.resolve(assert_bool(y === 12));
+      });
 }
 
 const h = Promise.resolve(undefined);
@@ -79,13 +79,13 @@ function assertIsNotFound(x) {
     return h;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/js_promise_basic_test.ml",
-              34,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/js_promise_basic_test.ml",
+          34,
+          9
+        ]
+      });
 }
 
 function catchTest(param) {
@@ -98,10 +98,10 @@ function catchTest(param) {
 function orResolvedTest(param) {
   const p = Promise.resolve(42);
   return p.catch(function (param) {
-                  return Promise.resolve(22);
-                }).then(function (value) {
-                return Promise.resolve(assert_bool(value === 42));
-              }).catch(fail);
+            return Promise.resolve(22);
+          }).then(function (value) {
+          return Promise.resolve(assert_bool(value === 42));
+        }).catch(fail);
 }
 
 function orRejectedTest(param) {
@@ -109,19 +109,19 @@ function orRejectedTest(param) {
         MEL_EXN_ID: Stdlib.Not_found
       });
   return p.catch(function (param) {
-                  return Promise.resolve(22);
-                }).then(function (value) {
-                return Promise.resolve(assert_bool(value === 22));
-              }).catch(fail);
+            return Promise.resolve(22);
+          }).then(function (value) {
+          return Promise.resolve(assert_bool(value === 22));
+        }).catch(fail);
 }
 
 function orElseResolvedTest(param) {
   const p = Promise.resolve(42);
   return p.catch(function (param) {
-                  return Promise.resolve(22);
-                }).then(function (value) {
-                return Promise.resolve(assert_bool(value === 42));
-              }).catch(fail);
+            return Promise.resolve(22);
+          }).then(function (value) {
+          return Promise.resolve(assert_bool(value === 42));
+        }).catch(fail);
 }
 
 function orElseRejectedResolveTest(param) {
@@ -129,10 +129,10 @@ function orElseRejectedResolveTest(param) {
         MEL_EXN_ID: Stdlib.Not_found
       });
   return p.catch(function (param) {
-                  return Promise.resolve(22);
-                }).then(function (value) {
-                return Promise.resolve(assert_bool(value === 22));
-              }).catch(fail);
+            return Promise.resolve(22);
+          }).then(function (value) {
+          return Promise.resolve(assert_bool(value === 22));
+        }).catch(fail);
 }
 
 function orElseRejectedRejectTest(param) {
@@ -140,30 +140,30 @@ function orElseRejectedRejectTest(param) {
         MEL_EXN_ID: Stdlib.Not_found
       });
   return p.catch(function (param) {
-                  return Promise.reject({
-                              MEL_EXN_ID: Stdlib.Stack_overflow
-                            });
-                }).then(fail).catch(function (error) {
-              const match = Caml_exceptions.caml_is_extension(error) && error.MEL_EXN_ID === Stdlib.Stack_overflow ? 0 : undefined;
-              if (match !== undefined) {
-                return h;
-              }
-              throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/js_promise_basic_test.ml",
-                          76,
-                          19
-                        ]
-                      });
+            return Promise.reject({
+                  MEL_EXN_ID: Stdlib.Stack_overflow
+                });
+          }).then(fail).catch(function (error) {
+        const match = Caml_exceptions.caml_is_extension(error) && error.MEL_EXN_ID === Stdlib.Stack_overflow ? 0 : undefined;
+        if (match !== undefined) {
+          return h;
+        }
+        throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/js_promise_basic_test.ml",
+                76,
+                19
+              ]
             });
+      });
 }
 
 function resolveTest(param) {
   const p1 = Promise.resolve(10);
   return p1.then(function (x) {
-              return Promise.resolve(assert_bool(x === 10));
-            });
+        return Promise.resolve(assert_bool(x === 10));
+      });
 }
 
 function rejectTest(param) {
@@ -176,8 +176,8 @@ function rejectTest(param) {
 function thenCatchChainResolvedTest(param) {
   const p = Promise.resolve(20);
   return p.then(function (value) {
-                return Promise.resolve(assert_bool(value === 20));
-              }).catch(fail);
+          return Promise.resolve(assert_bool(value === 20));
+        }).catch(fail);
 }
 
 function thenCatchChainRejectedTest(param) {
@@ -197,11 +197,11 @@ function allResolvedTest(param) {
     p3
   ];
   return Promise.all(promises).then(function (resolved) {
-              assert_bool(Caml_array.get(resolved, 0) === 1);
-              assert_bool(Caml_array.get(resolved, 1) === 2);
-              assert_bool(Caml_array.get(resolved, 2) === 3);
-              return h;
-            });
+        assert_bool(Caml_array.get(resolved, 0) === 1);
+        assert_bool(Caml_array.get(resolved, 1) === 2);
+        assert_bool(Caml_array.get(resolved, 2) === 3);
+        return h;
+      });
 }
 
 function is_not_found(error) {
@@ -220,9 +220,9 @@ function allRejectTest(param) {
     p3
   ];
   return Promise.all(promises).then(fail).catch(function (error) {
-              assert_bool(error.MEL_EXN_ID === Stdlib.Not_found);
-              return h;
-            });
+        assert_bool(error.MEL_EXN_ID === Stdlib.Not_found);
+        return h;
+      });
 }
 
 function raceTest(param) {
@@ -235,28 +235,28 @@ function raceTest(param) {
     p3
   ];
   return Promise.race(promises).then(function (resolved) {
-                return h;
-              }).catch(fail);
+          return h;
+        }).catch(fail);
 }
 
 function createPromiseRejectTest(param) {
   return new Promise((function (resolve, reject) {
-                  reject({
-                        MEL_EXN_ID: Stdlib.Not_found
-                      });
-                })).catch(function (error) {
-              assert_bool(error.MEL_EXN_ID === Stdlib.Not_found);
-              return h;
-            });
+            reject({
+                  MEL_EXN_ID: Stdlib.Not_found
+                });
+          })).catch(function (error) {
+        assert_bool(error.MEL_EXN_ID === Stdlib.Not_found);
+        return h;
+      });
 }
 
 function createPromiseFulfillTest(param) {
   return new Promise((function (resolve, param) {
-                    resolve("success");
-                  })).then(function (resolved) {
-                assert_bool(resolved === "success");
-                return h;
-              }).catch(fail);
+              resolve("success");
+            })).then(function (resolved) {
+          assert_bool(resolved === "success");
+          return h;
+        }).catch(fail);
 }
 
 thenTest(undefined);
@@ -324,10 +324,10 @@ Mt.from_promise_suites("Js_promise_basic_test", {
         "File \"jscomp/test/js_promise_basic_test.ml\", line 188, characters 5-12",
         twop.then(function (x) {
               return Promise.resolve({
-                          TAG: /* Eq */0,
-                          _0: x,
-                          _1: 2
-                        });
+                    TAG: /* Eq */0,
+                    _0: x,
+                    _1: 2
+                  });
             })
       ],
       tl: {
@@ -335,10 +335,10 @@ Mt.from_promise_suites("Js_promise_basic_test", {
           "File \"jscomp/test/js_promise_basic_test.ml\", line 189, characters 5-12",
           twop.then(function (x) {
                 return Promise.resolve({
-                            TAG: /* Neq */1,
-                            _0: x,
-                            _1: 3
-                          });
+                      TAG: /* Neq */1,
+                      _0: x,
+                      _1: 3
+                    });
               })
         ],
         tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_re_test.js b/jscomp/test/dist/jscomp/test/js_re_test.js
index baa7245b3..64b3031b4 100644
--- a/jscomp/test/dist/jscomp/test/js_re_test.js
+++ b/jscomp/test/dist/jscomp/test/js_re_test.js
@@ -12,23 +12,23 @@ const suites_0 = [
       const result = re.exec("3-");
       if (result === null) {
         return {
-                TAG: /* Fail */8,
-                _0: undefined
-              };
+          TAG: /* Fail */8,
+          _0: undefined
+        };
       }
       const defined = Caml_array.get(result, 1);
       const $$undefined = Caml_array.get(result, 2);
       return {
-              TAG: /* Eq */0,
-              _0: [
-                "3",
-                null
-              ],
-              _1: [
-                defined,
-                $$undefined
-              ]
-            };
+        TAG: /* Eq */0,
+        _0: [
+          "3",
+          null
+        ],
+        _1: [
+          defined,
+          $$undefined
+        ]
+      };
     })
 ];
 
@@ -44,10 +44,10 @@ const suites_1 = {
           
         };
         return {
-                TAG: /* Eq */0,
-                _0: contentOf("div", "<div>Hi</div>"),
-                _1: "Hi"
-              };
+          TAG: /* Eq */0,
+          _0: contentOf("div", "<div>Hi</div>"),
+          _1: "Hi"
+        };
       })
   ],
   tl: {
@@ -57,15 +57,15 @@ const suites_1 = {
           const res = /[^.]+/.exec("http://xxx.domain.com");
           if (res !== null) {
             return {
-                    TAG: /* Eq */0,
-                    _0: "http://xxx",
-                    _1: Caml_array.get(res, 0)
-                  };
+              TAG: /* Eq */0,
+              _0: "http://xxx",
+              _1: Caml_array.get(res, 0)
+            };
           } else {
             return {
-                    TAG: /* FailWith */9,
-                    _0: "regex should match"
-                  };
+              TAG: /* FailWith */9,
+              _0: "regex should match"
+            };
           }
         })
     ],
@@ -76,14 +76,14 @@ const suites_1 = {
             const match = /https:\/\/(.*)/.exec("http://xxx.domain.com");
             if (match !== null) {
               return {
-                      TAG: /* FailWith */9,
-                      _0: "regex should not match"
-                    };
+                TAG: /* FailWith */9,
+                _0: "regex should not match"
+              };
             } else {
               return {
-                      TAG: /* Ok */4,
-                      _0: true
-                    };
+                TAG: /* Ok */4,
+                _0: true
+              };
             }
           })
       ],
@@ -93,10 +93,10 @@ const suites_1 = {
           (function (param) {
               const res = new RegExp("foo").test("#foo#");
               return {
-                      TAG: /* Eq */0,
-                      _0: true,
-                      _1: res
-                    };
+                TAG: /* Eq */0,
+                _0: true,
+                _1: res
+              };
             })
         ],
         tl: {
@@ -105,10 +105,10 @@ const suites_1 = {
             (function (param) {
                 const res = new RegExp("foo", "g");
                 return {
-                        TAG: /* Eq */0,
-                        _0: true,
-                        _1: res.global
-                      };
+                  TAG: /* Eq */0,
+                  _0: true,
+                  _1: res.global
+                };
               })
           ],
           tl: {
@@ -118,15 +118,15 @@ const suites_1 = {
                   const res = new RegExp("zbar").exec("foobarbazbar");
                   if (res !== null) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: 8,
-                            _1: res.index
-                          };
+                      TAG: /* Eq */0,
+                      _0: 8,
+                      _1: res.index
+                    };
                   } else {
                     return {
-                            TAG: /* Fail */8,
-                            _0: undefined
-                          };
+                      TAG: /* Fail */8,
+                      _0: undefined
+                    };
                   }
                 })
             ],
@@ -138,15 +138,15 @@ const suites_1 = {
                     const res = /foo/g.exec(input);
                     if (res !== null) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: input,
-                              _1: res.input
-                            };
+                        TAG: /* Eq */0,
+                        _0: input,
+                        _1: res.input
+                      };
                     } else {
                       return {
-                              TAG: /* Fail */8,
-                              _0: undefined
-                            };
+                        TAG: /* Fail */8,
+                        _0: undefined
+                      };
                     }
                   })
               ],
@@ -155,10 +155,10 @@ const suites_1 = {
                   "t_flags",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: "gi",
-                              _1: /./ig.flags
-                            };
+                        TAG: /* Eq */0,
+                        _0: "gi",
+                        _1: /./ig.flags
+                      };
                     })
                 ],
                 tl: {
@@ -166,10 +166,10 @@ const suites_1 = {
                     "t_global",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: true,
-                                _1: /./ig.global
-                              };
+                          TAG: /* Eq */0,
+                          _0: true,
+                          _1: /./ig.global
+                        };
                       })
                   ],
                   tl: {
@@ -177,10 +177,10 @@ const suites_1 = {
                       "t_ignoreCase",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: true,
-                                  _1: /./ig.ignoreCase
-                                };
+                            TAG: /* Eq */0,
+                            _0: true,
+                            _1: /./ig.ignoreCase
+                          };
                         })
                     ],
                     tl: {
@@ -190,10 +190,10 @@ const suites_1 = {
                             const re = /na/g;
                             re.exec("banana");
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: 4,
-                                    _1: re.lastIndex
-                                  };
+                              TAG: /* Eq */0,
+                              _0: 4,
+                              _1: re.lastIndex
+                            };
                           })
                       ],
                       tl: {
@@ -205,16 +205,16 @@ const suites_1 = {
                               re.lastIndex = 42;
                               const after = re.lastIndex;
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: [
-                                        0,
-                                        42
-                                      ],
-                                      _1: [
-                                        before,
-                                        after
-                                      ]
-                                    };
+                                TAG: /* Eq */0,
+                                _0: [
+                                  0,
+                                  42
+                                ],
+                                _1: [
+                                  before,
+                                  after
+                                ]
+                              };
                             })
                         ],
                         tl: {
@@ -222,10 +222,10 @@ const suites_1 = {
                             "t_multiline",
                             (function (param) {
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: false,
-                                        _1: /./ig.multiline
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: false,
+                                  _1: /./ig.multiline
+                                };
                               })
                           ],
                           tl: {
@@ -233,10 +233,10 @@ const suites_1 = {
                               "t_source",
                               (function (param) {
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: "f.+o",
-                                          _1: /f.+o/ig.source
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: "f.+o",
+                                    _1: /f.+o/ig.source
+                                  };
                                 })
                             ],
                             tl: {
@@ -244,10 +244,10 @@ const suites_1 = {
                                 "t_sticky",
                                 (function (param) {
                                     return {
-                                            TAG: /* Eq */0,
-                                            _0: true,
-                                            _1: /./yg.sticky
-                                          };
+                                      TAG: /* Eq */0,
+                                      _0: true,
+                                      _1: /./yg.sticky
+                                    };
                                   })
                               ],
                               tl: {
@@ -255,10 +255,10 @@ const suites_1 = {
                                   "t_unicode",
                                   (function (param) {
                                       return {
-                                              TAG: /* Eq */0,
-                                              _0: false,
-                                              _1: /./yg.unicode
-                                            };
+                                        TAG: /* Eq */0,
+                                        _0: false,
+                                        _1: /./yg.unicode
+                                      };
                                     })
                                 ],
                                 tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_set_test.js b/jscomp/test/dist/jscomp/test/js_set_test.js
index ae9c51585..8f88f14b9 100644
--- a/jscomp/test/dist/jscomp/test/js_set_test.js
+++ b/jscomp/test/dist/jscomp/test/js_set_test.js
@@ -12,14 +12,14 @@ const suites_0 = [
             3
           ]);
       return {
-              TAG: /* Eq */0,
-              _0: [
-                1,
-                2,
-                3
-              ],
-              _1: Array.from(set)
-            };
+        TAG: /* Eq */0,
+        _0: [
+          1,
+          2,
+          3
+        ],
+        _1: Array.from(set)
+      };
     })
 ];
 
@@ -29,10 +29,10 @@ const suites_1 = {
     (function (param) {
         const set = new Set();
         return {
-                TAG: /* Eq */0,
-                _0: 0,
-                _1: set.size
-              };
+          TAG: /* Eq */0,
+          _0: 0,
+          _1: set.size
+        };
       })
   ],
   tl: {
@@ -45,10 +45,10 @@ const suites_1 = {
                 "two"
               ]);
           return {
-                  TAG: /* Eq */0,
-                  _0: 2,
-                  _1: set.size
-                };
+            TAG: /* Eq */0,
+            _0: 2,
+            _1: set.size
+          };
         })
     ],
     tl: {
@@ -60,10 +60,10 @@ const suites_1 = {
                   "one"
                 ]);
             return {
-                    TAG: /* Eq */0,
-                    _0: 1,
-                    _1: set.size
-                  };
+              TAG: /* Eq */0,
+              _0: 1,
+              _1: set.size
+            };
           })
       ],
       tl: {
@@ -75,10 +75,10 @@ const suites_1 = {
                     "two"
                   ]);
               return {
-                      TAG: /* Eq */0,
-                      _0: true,
-                      _1: set.has("two")
-                    };
+                TAG: /* Eq */0,
+                _0: true,
+                _1: set.has("two")
+              };
             })
         ],
         tl: {
@@ -90,10 +90,10 @@ const suites_1 = {
                       "two"
                     ]);
                 return {
-                        TAG: /* Eq */0,
-                        _0: false,
-                        _1: set.has("three")
-                      };
+                  TAG: /* Eq */0,
+                  _0: false,
+                  _1: set.has("three")
+                };
               })
           ],
           tl: {
@@ -106,16 +106,16 @@ const suites_1 = {
                       ]);
                   const deleted = set.delete("two");
                   return {
-                          TAG: /* Eq */0,
-                          _0: [
-                            true,
-                            false
-                          ],
-                          _1: [
-                            deleted,
-                            set.has("two")
-                          ]
-                        };
+                    TAG: /* Eq */0,
+                    _0: [
+                      true,
+                      false
+                    ],
+                    _1: [
+                      deleted,
+                      set.has("two")
+                    ]
+                  };
                 })
             ],
             tl: {
@@ -124,13 +124,13 @@ const suites_1 = {
                 (function (param) {
                     const set = new Set().add("one").add("two");
                     return {
-                            TAG: /* Eq */0,
-                            _0: [
-                              "one",
-                              "two"
-                            ],
-                            _1: Array.from(set)
-                          };
+                      TAG: /* Eq */0,
+                      _0: [
+                        "one",
+                        "two"
+                      ],
+                      _1: Array.from(set)
+                    };
                   })
               ],
               tl: {
@@ -143,10 +143,10 @@ const suites_1 = {
                           ]);
                       set.clear();
                       return {
-                              TAG: /* Eq */0,
-                              _0: 0,
-                              _1: set.size
-                            };
+                        TAG: /* Eq */0,
+                        _0: 0,
+                        _1: set.size
+                      };
                     })
                 ],
                 tl: {
@@ -159,16 +159,16 @@ const suites_1 = {
                         const all_same_size = set_1.size === 2 && set_2.size === 2 && set_3.size === 2;
                         const all_same_ref = set_1 === set_2 && set_2 === set_3;
                         return {
-                                TAG: /* Eq */0,
-                                _0: [
-                                  true,
-                                  true
-                                ],
-                                _1: [
-                                  all_same_size,
-                                  all_same_ref
-                                ]
-                              };
+                          TAG: /* Eq */0,
+                          _0: [
+                            true,
+                            true
+                          ],
+                          _1: [
+                            all_same_size,
+                            all_same_ref
+                          ]
+                        };
                       })
                   ],
                   tl: {
@@ -186,13 +186,13 @@ const suites_1 = {
                                 arr.contents.push(value);
                               });
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: [
-                                    "one",
-                                    "two"
-                                  ],
-                                  _1: arr.contents
-                                };
+                            TAG: /* Eq */0,
+                            _0: [
+                              "one",
+                              "two"
+                            ],
+                            _1: arr.contents
+                          };
                         })
                     ],
                     tl: {
@@ -204,13 +204,13 @@ const suites_1 = {
                                         "two"
                                       ]).values());
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: [
-                                      "one",
-                                      "two"
-                                    ],
-                                    _1: values
-                                  };
+                              TAG: /* Eq */0,
+                              _0: [
+                                "one",
+                                "two"
+                              ],
+                              _1: values
+                            };
                           })
                       ],
                       tl: {
@@ -222,19 +222,19 @@ const suites_1 = {
                                           "two"
                                         ]).entries());
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: [
-                                        [
-                                          "one",
-                                          "one"
-                                        ],
-                                        [
-                                          "two",
-                                          "two"
-                                        ]
-                                      ],
-                                      _1: entries
-                                    };
+                                TAG: /* Eq */0,
+                                _0: [
+                                  [
+                                    "one",
+                                    "one"
+                                  ],
+                                  [
+                                    "two",
+                                    "two"
+                                  ]
+                                ],
+                                _1: entries
+                              };
                             })
                         ],
                         tl: {
@@ -249,36 +249,36 @@ const suites_1 = {
                                 const n2 = iterator.next();
                                 const n3 = iterator.next();
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: [
-                                          [
-                                            n1.done,
-                                            n1.value
-                                          ],
-                                          [
-                                            n2.done,
-                                            n2.value
-                                          ],
-                                          [
-                                            n3.done,
-                                            n3.value
-                                          ]
-                                        ],
-                                        _1: [
-                                          [
-                                            false,
-                                            "one"
-                                          ],
-                                          [
-                                            false,
-                                            "two"
-                                          ],
-                                          [
-                                            true,
-                                            undefined
-                                          ]
-                                        ]
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: [
+                                    [
+                                      n1.done,
+                                      n1.value
+                                    ],
+                                    [
+                                      n2.done,
+                                      n2.value
+                                    ],
+                                    [
+                                      n3.done,
+                                      n3.value
+                                    ]
+                                  ],
+                                  _1: [
+                                    [
+                                      false,
+                                      "one"
+                                    ],
+                                    [
+                                      false,
+                                      "two"
+                                    ],
+                                    [
+                                      true,
+                                      undefined
+                                    ]
+                                  ]
+                                };
                               })
                           ],
                           tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_string_test.js b/jscomp/test/dist/jscomp/test/js_string_test.js
index 1aa1021de..093ac661e 100644
--- a/jscomp/test/dist/jscomp/test/js_string_test.js
+++ b/jscomp/test/dist/jscomp/test/js_string_test.js
@@ -9,10 +9,10 @@ const suites_0 = [
   "make",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: "null",
-              _1: String(null).concat("")
-            };
+        TAG: /* Eq */0,
+        _0: "null",
+        _1: String(null).concat("")
+      };
     })
 ];
 
@@ -21,10 +21,10 @@ const suites_1 = {
     "fromCharCode",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: "a",
-                _1: String.fromCharCode(97)
-              };
+          TAG: /* Eq */0,
+          _0: "a",
+          _1: String.fromCharCode(97)
+        };
       })
   ],
   tl: {
@@ -32,10 +32,10 @@ const suites_1 = {
       "fromCharCodeMany",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: "az",
-                  _1: String.fromCharCode(97, 122)
-                };
+            TAG: /* Eq */0,
+            _0: "az",
+            _1: String.fromCharCode(97, 122)
+          };
         })
     ],
     tl: {
@@ -43,10 +43,10 @@ const suites_1 = {
         "fromCodePoint",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: "a",
-                    _1: String.fromCodePoint(97)
-                  };
+              TAG: /* Eq */0,
+              _0: "a",
+              _1: String.fromCodePoint(97)
+            };
           })
       ],
       tl: {
@@ -54,10 +54,10 @@ const suites_1 = {
           "fromCodePointMany",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: "az",
-                      _1: String.fromCodePoint(97, 122)
-                    };
+                TAG: /* Eq */0,
+                _0: "az",
+                _1: String.fromCodePoint(97, 122)
+              };
             })
         ],
         tl: {
@@ -65,10 +65,10 @@ const suites_1 = {
             "length",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: 3,
-                        _1: "foo".length
-                      };
+                  TAG: /* Eq */0,
+                  _0: 3,
+                  _1: "foo".length
+                };
               })
           ],
           tl: {
@@ -76,10 +76,10 @@ const suites_1 = {
               "get",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: "a",
-                          _1: "foobar"[4]
-                        };
+                    TAG: /* Eq */0,
+                    _0: "a",
+                    _1: "foobar"[4]
+                  };
                 })
             ],
             tl: {
@@ -87,10 +87,10 @@ const suites_1 = {
                 "charAt",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: "a",
-                            _1: "foobar".charAt(4)
-                          };
+                      TAG: /* Eq */0,
+                      _0: "a",
+                      _1: "foobar".charAt(4)
+                    };
                   })
               ],
               tl: {
@@ -98,10 +98,10 @@ const suites_1 = {
                   "charCodeAt",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: 97,
-                              _1: "foobar".charCodeAt(4)
-                            };
+                        TAG: /* Eq */0,
+                        _0: 97,
+                        _1: "foobar".charCodeAt(4)
+                      };
                     })
                 ],
                 tl: {
@@ -109,10 +109,10 @@ const suites_1 = {
                     "codePointAt",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: 97,
-                                _1: "foobar".codePointAt(4)
-                              };
+                          TAG: /* Eq */0,
+                          _0: 97,
+                          _1: "foobar".codePointAt(4)
+                        };
                       })
                   ],
                   tl: {
@@ -120,10 +120,10 @@ const suites_1 = {
                       "codePointAt - out of bounds",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: undefined,
-                                  _1: "foobar".codePointAt(98)
-                                };
+                            TAG: /* Eq */0,
+                            _0: undefined,
+                            _1: "foobar".codePointAt(98)
+                          };
                         })
                     ],
                     tl: {
@@ -131,10 +131,10 @@ const suites_1 = {
                         "concat",
                         (function (param) {
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: "foobar",
-                                    _1: "foo".concat("bar")
-                                  };
+                              TAG: /* Eq */0,
+                              _0: "foobar",
+                              _1: "foo".concat("bar")
+                            };
                           })
                       ],
                       tl: {
@@ -142,10 +142,10 @@ const suites_1 = {
                           "concatMany",
                           (function (param) {
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: "foobarbaz",
-                                      _1: "foo".concat("bar", "baz")
-                                    };
+                                TAG: /* Eq */0,
+                                _0: "foobarbaz",
+                                _1: "foo".concat("bar", "baz")
+                              };
                             })
                         ],
                         tl: {
@@ -153,10 +153,10 @@ const suites_1 = {
                             "endsWith",
                             (function (param) {
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: true,
-                                        _1: "foobar".endsWith("bar", undefined)
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: true,
+                                  _1: "foobar".endsWith("bar", undefined)
+                                };
                               })
                           ],
                           tl: {
@@ -164,10 +164,10 @@ const suites_1 = {
                               "endsWithFrom",
                               (function (param) {
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: false,
-                                          _1: "foobar".endsWith("bar", 1)
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: false,
+                                    _1: "foobar".endsWith("bar", 1)
+                                  };
                                 })
                             ],
                             tl: {
@@ -175,10 +175,10 @@ const suites_1 = {
                                 "includes",
                                 (function (param) {
                                     return {
-                                            TAG: /* Eq */0,
-                                            _0: true,
-                                            _1: "foobarbaz".includes("bar", undefined)
-                                          };
+                                      TAG: /* Eq */0,
+                                      _0: true,
+                                      _1: "foobarbaz".includes("bar", undefined)
+                                    };
                                   })
                               ],
                               tl: {
@@ -186,10 +186,10 @@ const suites_1 = {
                                   "includesFrom",
                                   (function (param) {
                                       return {
-                                              TAG: /* Eq */0,
-                                              _0: false,
-                                              _1: "foobarbaz".includes("bar", 4)
-                                            };
+                                        TAG: /* Eq */0,
+                                        _0: false,
+                                        _1: "foobarbaz".includes("bar", 4)
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -197,10 +197,10 @@ const suites_1 = {
                                     "indexOf",
                                     (function (param) {
                                         return {
-                                                TAG: /* Eq */0,
-                                                _0: 3,
-                                                _1: "foobarbaz".indexOf("bar", undefined)
-                                              };
+                                          TAG: /* Eq */0,
+                                          _0: 3,
+                                          _1: "foobarbaz".indexOf("bar", undefined)
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -208,10 +208,10 @@ const suites_1 = {
                                       "indexOfFrom",
                                       (function (param) {
                                           return {
-                                                  TAG: /* Eq */0,
-                                                  _0: -1,
-                                                  _1: "foobarbaz".indexOf("bar", 4)
-                                                };
+                                            TAG: /* Eq */0,
+                                            _0: -1,
+                                            _1: "foobarbaz".indexOf("bar", 4)
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -219,10 +219,10 @@ const suites_1 = {
                                         "lastIndexOf",
                                         (function (param) {
                                             return {
-                                                    TAG: /* Eq */0,
-                                                    _0: 3,
-                                                    _1: "foobarbaz".lastIndexOf("bar", undefined)
-                                                  };
+                                              TAG: /* Eq */0,
+                                              _0: 3,
+                                              _1: "foobarbaz".lastIndexOf("bar", undefined)
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -230,10 +230,10 @@ const suites_1 = {
                                           "lastIndexOfFrom",
                                           (function (param) {
                                               return {
-                                                      TAG: /* Eq */0,
-                                                      _0: 3,
-                                                      _1: "foobarbaz".lastIndexOf("bar", 4)
-                                                    };
+                                                TAG: /* Eq */0,
+                                                _0: 3,
+                                                _1: "foobarbaz".lastIndexOf("bar", 4)
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -241,10 +241,10 @@ const suites_1 = {
                                             "localeCompare",
                                             (function (param) {
                                                 return {
-                                                        TAG: /* Eq */0,
-                                                        _0: 0,
-                                                        _1: "foo".localeCompare("foo")
-                                                      };
+                                                  TAG: /* Eq */0,
+                                                  _0: 0,
+                                                  _1: "foo".localeCompare("foo")
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -252,13 +252,13 @@ const suites_1 = {
                                               "match",
                                               (function (param) {
                                                   return {
-                                                          TAG: /* Eq */0,
-                                                          _0: [
-                                                            "na",
-                                                            "na"
-                                                          ],
-                                                          _1: Caml_option.null_to_opt("banana".match(/na+/g))
-                                                        };
+                                                    TAG: /* Eq */0,
+                                                    _0: [
+                                                      "na",
+                                                      "na"
+                                                    ],
+                                                    _1: Caml_option.null_to_opt("banana".match(/na+/g))
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -266,10 +266,10 @@ const suites_1 = {
                                                 "match - no match",
                                                 (function (param) {
                                                     return {
-                                                            TAG: /* Eq */0,
-                                                            _0: undefined,
-                                                            _1: Caml_option.null_to_opt("banana".match(/nanana+/g))
-                                                          };
+                                                      TAG: /* Eq */0,
+                                                      _0: undefined,
+                                                      _1: Caml_option.null_to_opt("banana".match(/nanana+/g))
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -277,15 +277,15 @@ const suites_1 = {
                                                   "match - not found capture groups",
                                                   (function (param) {
                                                       return {
-                                                              TAG: /* Eq */0,
-                                                              _0: [
-                                                                "hello ",
-                                                                undefined
-                                                              ],
-                                                              _1: Belt__Belt_Option.map(Caml_option.null_to_opt("hello word".match(/hello (world)?/)), (function (prim) {
-                                                                      return prim.slice();
-                                                                    }))
-                                                            };
+                                                        TAG: /* Eq */0,
+                                                        _0: [
+                                                          "hello ",
+                                                          undefined
+                                                        ],
+                                                        _1: Belt__Belt_Option.map(Caml_option.null_to_opt("hello word".match(/hello (world)?/)), (function (prim) {
+                                                                return prim.slice();
+                                                              }))
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -293,10 +293,10 @@ const suites_1 = {
                                                     "normalize",
                                                     (function (param) {
                                                         return {
-                                                                TAG: /* Eq */0,
-                                                                _0: "foo",
-                                                                _1: "foo".normalize(undefined)
-                                                              };
+                                                          TAG: /* Eq */0,
+                                                          _0: "foo",
+                                                          _1: "foo".normalize(undefined)
+                                                        };
                                                       })
                                                   ],
                                                   tl: {
@@ -304,10 +304,10 @@ const suites_1 = {
                                                       "normalizeByForm",
                                                       (function (param) {
                                                           return {
-                                                                  TAG: /* Eq */0,
-                                                                  _0: "foo",
-                                                                  _1: "foo".normalize("NFKD")
-                                                                };
+                                                            TAG: /* Eq */0,
+                                                            _0: "foo",
+                                                            _1: "foo".normalize("NFKD")
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -315,10 +315,10 @@ const suites_1 = {
                                                         "repeat",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: /* Eq */0,
-                                                                    _0: "foofoofoo",
-                                                                    _1: "foo".repeat(3)
-                                                                  };
+                                                              TAG: /* Eq */0,
+                                                              _0: "foofoofoo",
+                                                              _1: "foo".repeat(3)
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -326,10 +326,10 @@ const suites_1 = {
                                                           "replace",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: /* Eq */0,
-                                                                      _0: "fooBORKbaz",
-                                                                      _1: "foobarbaz".replace("bar", "BORK")
-                                                                    };
+                                                                TAG: /* Eq */0,
+                                                                _0: "fooBORKbaz",
+                                                                _1: "foobarbaz".replace("bar", "BORK")
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -337,10 +337,10 @@ const suites_1 = {
                                                             "replaceByRe",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: /* Eq */0,
-                                                                        _0: "fooBORKBORK",
-                                                                        _1: "foobarbaz".replace(/ba./g, "BORK")
-                                                                      };
+                                                                  TAG: /* Eq */0,
+                                                                  _0: "fooBORKBORK",
+                                                                  _1: "foobarbaz".replace(/ba./g, "BORK")
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -355,10 +355,10 @@ const suites_1 = {
                                                                     }
                                                                   };
                                                                   return {
-                                                                          TAG: /* Eq */0,
-                                                                          _0: "fooBORKDORK",
-                                                                          _1: "foobarbaz".replace(/ba./g, replace)
-                                                                        };
+                                                                    TAG: /* Eq */0,
+                                                                    _0: "fooBORKDORK",
+                                                                    _1: "foobarbaz".replace(/ba./g, replace)
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -373,10 +373,10 @@ const suites_1 = {
                                                                       }
                                                                     };
                                                                     return {
-                                                                            TAG: /* Eq */0,
-                                                                            _0: "fooBORKDORK",
-                                                                            _1: "foobarbaz".replace(/ba./g, replace)
-                                                                          };
+                                                                      TAG: /* Eq */0,
+                                                                      _0: "fooBORKDORK",
+                                                                      _1: "foobarbaz".replace(/ba./g, replace)
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -391,10 +391,10 @@ const suites_1 = {
                                                                         }
                                                                       };
                                                                       return {
-                                                                              TAG: /* Eq */0,
-                                                                              _0: "fooBORKDORK",
-                                                                              _1: "foobarbaz".replace(/ba./g, replace)
-                                                                            };
+                                                                        TAG: /* Eq */0,
+                                                                        _0: "fooBORKDORK",
+                                                                        _1: "foobarbaz".replace(/ba./g, replace)
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -409,10 +409,10 @@ const suites_1 = {
                                                                           }
                                                                         };
                                                                         return {
-                                                                                TAG: /* Eq */0,
-                                                                                _0: "fooBORKDORK",
-                                                                                _1: "foobarbaz".replace(/ba./g, replace)
-                                                                              };
+                                                                          TAG: /* Eq */0,
+                                                                          _0: "fooBORKDORK",
+                                                                          _1: "foobarbaz".replace(/ba./g, replace)
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -420,10 +420,10 @@ const suites_1 = {
                                                                       "search",
                                                                       (function (param) {
                                                                           return {
-                                                                                  TAG: /* Eq */0,
-                                                                                  _0: 3,
-                                                                                  _1: "foobarbaz".search(/ba./g)
-                                                                                };
+                                                                            TAG: /* Eq */0,
+                                                                            _0: 3,
+                                                                            _1: "foobarbaz".search(/ba./g)
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -431,10 +431,10 @@ const suites_1 = {
                                                                         "slice",
                                                                         (function (param) {
                                                                             return {
-                                                                                    TAG: /* Eq */0,
-                                                                                    _0: "bar",
-                                                                                    _1: "foobarbaz".slice(3, 6)
-                                                                                  };
+                                                                              TAG: /* Eq */0,
+                                                                              _0: "bar",
+                                                                              _1: "foobarbaz".slice(3, 6)
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -442,10 +442,10 @@ const suites_1 = {
                                                                           "sliceToEnd",
                                                                           (function (param) {
                                                                               return {
-                                                                                      TAG: /* Eq */0,
-                                                                                      _0: "barbaz",
-                                                                                      _1: "foobarbaz".slice(3, undefined)
-                                                                                    };
+                                                                                TAG: /* Eq */0,
+                                                                                _0: "barbaz",
+                                                                                _1: "foobarbaz".slice(3, undefined)
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -453,14 +453,14 @@ const suites_1 = {
                                                                             "split",
                                                                             (function (param) {
                                                                                 return {
-                                                                                        TAG: /* Eq */0,
-                                                                                        _0: [
-                                                                                          "foo",
-                                                                                          "bar",
-                                                                                          "baz"
-                                                                                        ],
-                                                                                        _1: "foo bar baz".split(" ", undefined)
-                                                                                      };
+                                                                                  TAG: /* Eq */0,
+                                                                                  _0: [
+                                                                                    "foo",
+                                                                                    "bar",
+                                                                                    "baz"
+                                                                                  ],
+                                                                                  _1: "foo bar baz".split(" ", undefined)
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -468,13 +468,13 @@ const suites_1 = {
                                                                               "splitAtMost",
                                                                               (function (param) {
                                                                                   return {
-                                                                                          TAG: /* Eq */0,
-                                                                                          _0: [
-                                                                                            "foo",
-                                                                                            "bar"
-                                                                                          ],
-                                                                                          _1: "foo bar baz".split(" ", 2)
-                                                                                        };
+                                                                                    TAG: /* Eq */0,
+                                                                                    _0: [
+                                                                                      "foo",
+                                                                                      "bar"
+                                                                                    ],
+                                                                                    _1: "foo bar baz".split(" ", 2)
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -482,18 +482,18 @@ const suites_1 = {
                                                                                 "splitByRe",
                                                                                 (function (param) {
                                                                                     return {
-                                                                                            TAG: /* Eq */0,
-                                                                                            _0: [
-                                                                                              "a",
-                                                                                              "#",
-                                                                                              undefined,
-                                                                                              "b",
-                                                                                              "#",
-                                                                                              ":",
-                                                                                              "c"
-                                                                                            ],
-                                                                                            _1: "a#b#:c".split(/(#)(:)?/, undefined)
-                                                                                          };
+                                                                                      TAG: /* Eq */0,
+                                                                                      _0: [
+                                                                                        "a",
+                                                                                        "#",
+                                                                                        undefined,
+                                                                                        "b",
+                                                                                        "#",
+                                                                                        ":",
+                                                                                        "c"
+                                                                                      ],
+                                                                                      _1: "a#b#:c".split(/(#)(:)?/, undefined)
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -501,14 +501,14 @@ const suites_1 = {
                                                                                   "splitByReAtMost",
                                                                                   (function (param) {
                                                                                       return {
-                                                                                              TAG: /* Eq */0,
-                                                                                              _0: [
-                                                                                                "a",
-                                                                                                "#",
-                                                                                                undefined
-                                                                                              ],
-                                                                                              _1: "a#b#:c".split(/(#)(:)?/, 3)
-                                                                                            };
+                                                                                        TAG: /* Eq */0,
+                                                                                        _0: [
+                                                                                          "a",
+                                                                                          "#",
+                                                                                          undefined
+                                                                                        ],
+                                                                                        _1: "a#b#:c".split(/(#)(:)?/, 3)
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -516,10 +516,10 @@ const suites_1 = {
                                                                                     "startsWith",
                                                                                     (function (param) {
                                                                                         return {
-                                                                                                TAG: /* Eq */0,
-                                                                                                _0: true,
-                                                                                                _1: "foobarbaz".startsWith("foo", undefined)
-                                                                                              };
+                                                                                          TAG: /* Eq */0,
+                                                                                          _0: true,
+                                                                                          _1: "foobarbaz".startsWith("foo", undefined)
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -527,10 +527,10 @@ const suites_1 = {
                                                                                       "startsWithFrom",
                                                                                       (function (param) {
                                                                                           return {
-                                                                                                  TAG: /* Eq */0,
-                                                                                                  _0: false,
-                                                                                                  _1: "foobarbaz".startsWith("foo", 1)
-                                                                                                };
+                                                                                            TAG: /* Eq */0,
+                                                                                            _0: false,
+                                                                                            _1: "foobarbaz".startsWith("foo", 1)
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: {
@@ -538,10 +538,10 @@ const suites_1 = {
                                                                                         "substr",
                                                                                         (function (param) {
                                                                                             return {
-                                                                                                    TAG: /* Eq */0,
-                                                                                                    _0: "barbaz",
-                                                                                                    _1: "foobarbaz".substr(3, undefined)
-                                                                                                  };
+                                                                                              TAG: /* Eq */0,
+                                                                                              _0: "barbaz",
+                                                                                              _1: "foobarbaz".substr(3, undefined)
+                                                                                            };
                                                                                           })
                                                                                       ],
                                                                                       tl: {
@@ -549,10 +549,10 @@ const suites_1 = {
                                                                                           "substrAtMost",
                                                                                           (function (param) {
                                                                                               return {
-                                                                                                      TAG: /* Eq */0,
-                                                                                                      _0: "bar",
-                                                                                                      _1: "foobarbaz".substr(3, 3)
-                                                                                                    };
+                                                                                                TAG: /* Eq */0,
+                                                                                                _0: "bar",
+                                                                                                _1: "foobarbaz".substr(3, 3)
+                                                                                              };
                                                                                             })
                                                                                         ],
                                                                                         tl: {
@@ -560,10 +560,10 @@ const suites_1 = {
                                                                                             "substring",
                                                                                             (function (param) {
                                                                                                 return {
-                                                                                                        TAG: /* Eq */0,
-                                                                                                        _0: "bar",
-                                                                                                        _1: "foobarbaz".substring(3, 6)
-                                                                                                      };
+                                                                                                  TAG: /* Eq */0,
+                                                                                                  _0: "bar",
+                                                                                                  _1: "foobarbaz".substring(3, 6)
+                                                                                                };
                                                                                               })
                                                                                           ],
                                                                                           tl: {
@@ -571,10 +571,10 @@ const suites_1 = {
                                                                                               "substringToEnd",
                                                                                               (function (param) {
                                                                                                   return {
-                                                                                                          TAG: /* Eq */0,
-                                                                                                          _0: "barbaz",
-                                                                                                          _1: "foobarbaz".substring(3, undefined)
-                                                                                                        };
+                                                                                                    TAG: /* Eq */0,
+                                                                                                    _0: "barbaz",
+                                                                                                    _1: "foobarbaz".substring(3, undefined)
+                                                                                                  };
                                                                                                 })
                                                                                             ],
                                                                                             tl: {
@@ -582,10 +582,10 @@ const suites_1 = {
                                                                                                 "toLowerCase",
                                                                                                 (function (param) {
                                                                                                     return {
-                                                                                                            TAG: /* Eq */0,
-                                                                                                            _0: "bork",
-                                                                                                            _1: "BORK".toLowerCase()
-                                                                                                          };
+                                                                                                      TAG: /* Eq */0,
+                                                                                                      _0: "bork",
+                                                                                                      _1: "BORK".toLowerCase()
+                                                                                                    };
                                                                                                   })
                                                                                               ],
                                                                                               tl: {
@@ -593,10 +593,10 @@ const suites_1 = {
                                                                                                   "toLocaleLowerCase",
                                                                                                   (function (param) {
                                                                                                       return {
-                                                                                                              TAG: /* Eq */0,
-                                                                                                              _0: "bork",
-                                                                                                              _1: "BORK".toLocaleLowerCase()
-                                                                                                            };
+                                                                                                        TAG: /* Eq */0,
+                                                                                                        _0: "bork",
+                                                                                                        _1: "BORK".toLocaleLowerCase()
+                                                                                                      };
                                                                                                     })
                                                                                                 ],
                                                                                                 tl: {
@@ -604,10 +604,10 @@ const suites_1 = {
                                                                                                     "toUpperCase",
                                                                                                     (function (param) {
                                                                                                         return {
-                                                                                                                TAG: /* Eq */0,
-                                                                                                                _0: "FUBAR",
-                                                                                                                _1: "fubar".toUpperCase()
-                                                                                                              };
+                                                                                                          TAG: /* Eq */0,
+                                                                                                          _0: "FUBAR",
+                                                                                                          _1: "fubar".toUpperCase()
+                                                                                                        };
                                                                                                       })
                                                                                                   ],
                                                                                                   tl: {
@@ -615,10 +615,10 @@ const suites_1 = {
                                                                                                       "toLocaleUpperCase",
                                                                                                       (function (param) {
                                                                                                           return {
-                                                                                                                  TAG: /* Eq */0,
-                                                                                                                  _0: "FUBAR",
-                                                                                                                  _1: "fubar".toLocaleUpperCase()
-                                                                                                                };
+                                                                                                            TAG: /* Eq */0,
+                                                                                                            _0: "FUBAR",
+                                                                                                            _1: "fubar".toLocaleUpperCase()
+                                                                                                          };
                                                                                                         })
                                                                                                     ],
                                                                                                     tl: {
@@ -626,10 +626,10 @@ const suites_1 = {
                                                                                                         "trim",
                                                                                                         (function (param) {
                                                                                                             return {
-                                                                                                                    TAG: /* Eq */0,
-                                                                                                                    _0: "foo",
-                                                                                                                    _1: "  foo  ".trim()
-                                                                                                                  };
+                                                                                                              TAG: /* Eq */0,
+                                                                                                              _0: "foo",
+                                                                                                              _1: "  foo  ".trim()
+                                                                                                            };
                                                                                                           })
                                                                                                       ],
                                                                                                       tl: {
@@ -637,10 +637,10 @@ const suites_1 = {
                                                                                                           "anchor",
                                                                                                           (function (param) {
                                                                                                               return {
-                                                                                                                      TAG: /* Eq */0,
-                                                                                                                      _0: "<a name=\"bar\">foo</a>",
-                                                                                                                      _1: "foo".anchor("bar")
-                                                                                                                    };
+                                                                                                                TAG: /* Eq */0,
+                                                                                                                _0: "<a name=\"bar\">foo</a>",
+                                                                                                                _1: "foo".anchor("bar")
+                                                                                                              };
                                                                                                             })
                                                                                                         ],
                                                                                                         tl: {
@@ -648,10 +648,10 @@ const suites_1 = {
                                                                                                             "link",
                                                                                                             (function (param) {
                                                                                                                 return {
-                                                                                                                        TAG: /* Eq */0,
-                                                                                                                        _0: "<a href=\"https://reason.ml\">foo</a>",
-                                                                                                                        _1: "foo".link("https://reason.ml")
-                                                                                                                      };
+                                                                                                                  TAG: /* Eq */0,
+                                                                                                                  _0: "<a href=\"https://reason.ml\">foo</a>",
+                                                                                                                  _1: "foo".link("https://reason.ml")
+                                                                                                                };
                                                                                                               })
                                                                                                           ],
                                                                                                           tl: {
@@ -659,9 +659,9 @@ const suites_1 = {
                                                                                                               "File \"jscomp/test/js_string_test.ml\", line 222, characters 4-11",
                                                                                                               (function (param) {
                                                                                                                   return {
-                                                                                                                          TAG: /* Ok */4,
-                                                                                                                          _0: "ab".includes("a", undefined)
-                                                                                                                        };
+                                                                                                                    TAG: /* Ok */4,
+                                                                                                                    _0: "ab".includes("a", undefined)
+                                                                                                                  };
                                                                                                                 })
                                                                                                             ],
                                                                                                             tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_typed_array_test.js b/jscomp/test/dist/jscomp/test/js_typed_array_test.js
index c2f8fdb4b..73cf53ddb 100644
--- a/jscomp/test/dist/jscomp/test/js_typed_array_test.js
+++ b/jscomp/test/dist/jscomp/test/js_typed_array_test.js
@@ -29,10 +29,10 @@ const suites_0 = [
   "array_buffer - make",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: 5,
-              _1: new ArrayBuffer(5).byteLength
-            };
+        TAG: /* Eq */0,
+        _0: 5,
+        _1: new ArrayBuffer(5).byteLength
+      };
     })
 ];
 
@@ -41,10 +41,10 @@ const suites_1 = {
     "array_buffer - byteLength",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: 5,
-                _1: new ArrayBuffer(5).byteLength
-              };
+          TAG: /* Eq */0,
+          _0: 5,
+          _1: new ArrayBuffer(5).byteLength
+        };
       })
   ],
   tl: {
@@ -52,10 +52,10 @@ const suites_1 = {
       "array_buffer - slice",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: 2,
-                  _1: new ArrayBuffer(5).slice(2, 4).byteLength
-                };
+            TAG: /* Eq */0,
+            _0: 2,
+            _1: new ArrayBuffer(5).slice(2, 4).byteLength
+          };
         })
     ],
     tl: {
@@ -63,10 +63,10 @@ const suites_1 = {
         "array_buffer - sliceFrom",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: 3,
-                    _1: new ArrayBuffer(5).slice(2, undefined).byteLength
-                  };
+              TAG: /* Eq */0,
+              _0: 3,
+              _1: new ArrayBuffer(5).slice(2, undefined).byteLength
+            };
           })
       ],
       tl: {
@@ -74,16 +74,16 @@ const suites_1 = {
           "typed_array - unsafe_get",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: 4,
-                      _1: new Int8Array([
-                              1,
-                              2,
-                              3,
-                              4,
-                              5
-                            ])[3]
-                    };
+                TAG: /* Eq */0,
+                _0: 4,
+                _1: new Int8Array([
+                        1,
+                        2,
+                        3,
+                        4,
+                        5
+                      ])[3]
+              };
             })
         ],
         tl: {
@@ -99,10 +99,10 @@ const suites_1 = {
                     ]);
                 a[3] = 14;
                 return {
-                        TAG: /* Eq */0,
-                        _0: 14,
-                        _1: a[3]
-                      };
+                  TAG: /* Eq */0,
+                  _0: 14,
+                  _1: a[3]
+                };
               })
           ],
           tl: {
@@ -110,20 +110,20 @@ const suites_1 = {
               "typed_array - buffer",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: new Int8Array([
-                                3,
-                                4,
-                                5
-                              ]),
-                          _1: new Int8Array(new Int8Array([
-                                    1,
-                                    2,
-                                    3,
-                                    4,
-                                    5
-                                  ]).buffer, 2, undefined)
-                        };
+                    TAG: /* Eq */0,
+                    _0: new Int8Array([
+                          3,
+                          4,
+                          5
+                        ]),
+                    _1: new Int8Array(new Int8Array([
+                              1,
+                              2,
+                              3,
+                              4,
+                              5
+                            ]).buffer, 2, undefined)
+                  };
                 })
             ],
             tl: {
@@ -131,16 +131,16 @@ const suites_1 = {
                 "typed_array - byteLength",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: 10,
-                            _1: new Int16Array([
-                                  1,
-                                  2,
-                                  3,
-                                  4,
-                                  5
-                                ]).byteLength
-                          };
+                      TAG: /* Eq */0,
+                      _0: 10,
+                      _1: new Int16Array([
+                            1,
+                            2,
+                            3,
+                            4,
+                            5
+                          ]).byteLength
+                    };
                   })
               ],
               tl: {
@@ -148,16 +148,16 @@ const suites_1 = {
                   "typed_array - byteOffset",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: 0,
-                              _1: new Int8Array([
-                                    1,
-                                    2,
-                                    3,
-                                    4,
-                                    5
-                                  ]).byteOffset
-                            };
+                        TAG: /* Eq */0,
+                        _0: 0,
+                        _1: new Int8Array([
+                              1,
+                              2,
+                              3,
+                              4,
+                              5
+                            ]).byteOffset
+                      };
                     })
                 ],
                 tl: {
@@ -173,22 +173,22 @@ const suites_1 = {
                           return a;
                         };
                         return {
-                                TAG: /* Eq */0,
-                                _0: new Int8Array([
-                                      9,
-                                      8,
-                                      7,
-                                      4,
-                                      5
-                                    ]),
-                                _1: f(new Int8Array([
-                                          1,
-                                          2,
-                                          3,
-                                          4,
-                                          5
-                                        ]))
-                              };
+                          TAG: /* Eq */0,
+                          _0: new Int8Array([
+                                9,
+                                8,
+                                7,
+                                4,
+                                5
+                              ]),
+                          _1: f(new Int8Array([
+                                    1,
+                                    2,
+                                    3,
+                                    4,
+                                    5
+                                  ]))
+                        };
                       })
                   ],
                   tl: {
@@ -204,22 +204,22 @@ const suites_1 = {
                             return a;
                           };
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: new Int8Array([
-                                        1,
-                                        2,
-                                        9,
-                                        8,
-                                        7
-                                      ]),
-                                  _1: f(new Int8Array([
-                                            1,
-                                            2,
-                                            3,
-                                            4,
-                                            5
-                                          ]))
-                                };
+                            TAG: /* Eq */0,
+                            _0: new Int8Array([
+                                  1,
+                                  2,
+                                  9,
+                                  8,
+                                  7
+                                ]),
+                            _1: f(new Int8Array([
+                                      1,
+                                      2,
+                                      3,
+                                      4,
+                                      5
+                                    ]))
+                          };
                         })
                     ],
                     tl: {
@@ -227,16 +227,16 @@ const suites_1 = {
                         "typed_array - length",
                         (function (param) {
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: 5,
-                                    _1: new Int8Array([
-                                          1,
-                                          2,
-                                          3,
-                                          4,
-                                          5
-                                        ]).length
-                                  };
+                              TAG: /* Eq */0,
+                              _0: 5,
+                              _1: new Int8Array([
+                                    1,
+                                    2,
+                                    3,
+                                    4,
+                                    5
+                                  ]).length
+                            };
                           })
                       ],
                       tl: {
@@ -244,22 +244,22 @@ const suites_1 = {
                           "typed_array - copyWithin",
                           (function (param) {
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: new Int8Array([
-                                            1,
-                                            2,
-                                            3,
-                                            1,
-                                            2
-                                          ]),
-                                      _1: new Int8Array([
-                                              1,
-                                              2,
-                                              3,
-                                              4,
-                                              5
-                                            ]).copyWithin(-2, undefined, undefined)
-                                    };
+                                TAG: /* Eq */0,
+                                _0: new Int8Array([
+                                      1,
+                                      2,
+                                      3,
+                                      1,
+                                      2
+                                    ]),
+                                _1: new Int8Array([
+                                        1,
+                                        2,
+                                        3,
+                                        4,
+                                        5
+                                      ]).copyWithin(-2, undefined, undefined)
+                              };
                             })
                         ],
                         tl: {
@@ -267,22 +267,22 @@ const suites_1 = {
                             "typed_array - copyWithinFrom",
                             (function (param) {
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: new Int8Array([
-                                              4,
-                                              5,
-                                              3,
-                                              4,
-                                              5
-                                            ]),
-                                        _1: new Int8Array([
-                                                1,
-                                                2,
-                                                3,
-                                                4,
-                                                5
-                                              ]).copyWithin(0, 3, undefined)
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: new Int8Array([
+                                        4,
+                                        5,
+                                        3,
+                                        4,
+                                        5
+                                      ]),
+                                  _1: new Int8Array([
+                                          1,
+                                          2,
+                                          3,
+                                          4,
+                                          5
+                                        ]).copyWithin(0, 3, undefined)
+                                };
                               })
                           ],
                           tl: {
@@ -290,22 +290,22 @@ const suites_1 = {
                               "typed_array - copyWithinFromRange",
                               (function (param) {
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: new Int8Array([
-                                                4,
-                                                2,
-                                                3,
-                                                4,
-                                                5
-                                              ]),
-                                          _1: new Int8Array([
-                                                  1,
-                                                  2,
-                                                  3,
-                                                  4,
-                                                  5
-                                                ]).copyWithin(0, 3, 4)
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: new Int8Array([
+                                          4,
+                                          2,
+                                          3,
+                                          4,
+                                          5
+                                        ]),
+                                    _1: new Int8Array([
+                                            1,
+                                            2,
+                                            3,
+                                            4,
+                                            5
+                                          ]).copyWithin(0, 3, 4)
+                                  };
                                 })
                             ],
                             tl: {
@@ -313,18 +313,18 @@ const suites_1 = {
                                 "typed_array - fillInPlace",
                                 (function (param) {
                                     return {
-                                            TAG: /* Eq */0,
-                                            _0: new Int8Array([
-                                                  4,
-                                                  4,
-                                                  4
-                                                ]),
-                                            _1: new Int8Array([
-                                                    1,
-                                                    2,
-                                                    3
-                                                  ]).fill(4, undefined, undefined)
-                                          };
+                                      TAG: /* Eq */0,
+                                      _0: new Int8Array([
+                                            4,
+                                            4,
+                                            4
+                                          ]),
+                                      _1: new Int8Array([
+                                              1,
+                                              2,
+                                              3
+                                            ]).fill(4, undefined, undefined)
+                                    };
                                   })
                               ],
                               tl: {
@@ -332,18 +332,18 @@ const suites_1 = {
                                   "typed_array - fillFromInPlace",
                                   (function (param) {
                                       return {
-                                              TAG: /* Eq */0,
-                                              _0: new Int8Array([
-                                                    1,
-                                                    4,
-                                                    4
-                                                  ]),
-                                              _1: new Int8Array([
-                                                      1,
-                                                      2,
-                                                      3
-                                                    ]).fill(4, 1, undefined)
-                                            };
+                                        TAG: /* Eq */0,
+                                        _0: new Int8Array([
+                                              1,
+                                              4,
+                                              4
+                                            ]),
+                                        _1: new Int8Array([
+                                                1,
+                                                2,
+                                                3
+                                              ]).fill(4, 1, undefined)
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -351,18 +351,18 @@ const suites_1 = {
                                     "typed_array - fillRangeInPlace",
                                     (function (param) {
                                         return {
-                                                TAG: /* Eq */0,
-                                                _0: new Int8Array([
-                                                      1,
-                                                      4,
-                                                      3
-                                                    ]),
-                                                _1: new Int8Array([
-                                                        1,
-                                                        2,
-                                                        3
-                                                      ]).fill(4, 1, 2)
-                                              };
+                                          TAG: /* Eq */0,
+                                          _0: new Int8Array([
+                                                1,
+                                                4,
+                                                3
+                                              ]),
+                                          _1: new Int8Array([
+                                                  1,
+                                                  2,
+                                                  3
+                                                ]).fill(4, 1, 2)
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -370,18 +370,18 @@ const suites_1 = {
                                       "typed_array - reverseInPlace",
                                       (function (param) {
                                           return {
-                                                  TAG: /* Eq */0,
-                                                  _0: new Int8Array([
-                                                        3,
-                                                        2,
-                                                        1
-                                                      ]),
-                                                  _1: new Int8Array([
-                                                          1,
-                                                          2,
-                                                          3
-                                                        ]).reverse()
-                                                };
+                                            TAG: /* Eq */0,
+                                            _0: new Int8Array([
+                                                  3,
+                                                  2,
+                                                  1
+                                                ]),
+                                            _1: new Int8Array([
+                                                    1,
+                                                    2,
+                                                    3
+                                                  ]).reverse()
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -389,18 +389,18 @@ const suites_1 = {
                                         "typed_array - sortInPlace",
                                         (function (param) {
                                             return {
-                                                    TAG: /* Eq */0,
-                                                    _0: new Int8Array([
-                                                          1,
-                                                          2,
-                                                          3
-                                                        ]),
-                                                    _1: new Int8Array([
-                                                            3,
-                                                            1,
-                                                            2
-                                                          ]).sort()
-                                                  };
+                                              TAG: /* Eq */0,
+                                              _0: new Int8Array([
+                                                    1,
+                                                    2,
+                                                    3
+                                                  ]),
+                                              _1: new Int8Array([
+                                                      3,
+                                                      1,
+                                                      2
+                                                    ]).sort()
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -408,20 +408,20 @@ const suites_1 = {
                                           "typed_array - sortInPlaceWith",
                                           (function (param) {
                                               return {
-                                                      TAG: /* Eq */0,
-                                                      _0: new Int8Array([
-                                                            3,
-                                                            2,
-                                                            1
-                                                          ]),
-                                                      _1: new Int8Array([
-                                                              3,
-                                                              1,
-                                                              2
-                                                            ]).sort(function (a, b) {
-                                                            return b - a | 0;
-                                                          })
-                                                    };
+                                                TAG: /* Eq */0,
+                                                _0: new Int8Array([
+                                                      3,
+                                                      2,
+                                                      1
+                                                    ]),
+                                                _1: new Int8Array([
+                                                        3,
+                                                        1,
+                                                        2
+                                                      ]).sort(function (a, b) {
+                                                      return b - a | 0;
+                                                    })
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -429,14 +429,14 @@ const suites_1 = {
                                             "typed_array - includes",
                                             (function (param) {
                                                 return {
-                                                        TAG: /* Eq */0,
-                                                        _0: true,
-                                                        _1: new Int8Array([
-                                                                1,
-                                                                2,
-                                                                3
-                                                              ]).includes(3)
-                                                      };
+                                                  TAG: /* Eq */0,
+                                                  _0: true,
+                                                  _1: new Int8Array([
+                                                          1,
+                                                          2,
+                                                          3
+                                                        ]).includes(3)
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -444,14 +444,14 @@ const suites_1 = {
                                               "typed_array - indexOf",
                                               (function (param) {
                                                   return {
-                                                          TAG: /* Eq */0,
-                                                          _0: 1,
-                                                          _1: new Int8Array([
-                                                                  1,
-                                                                  2,
-                                                                  3
-                                                                ]).indexOf(2, undefined)
-                                                        };
+                                                    TAG: /* Eq */0,
+                                                    _0: 1,
+                                                    _1: new Int8Array([
+                                                            1,
+                                                            2,
+                                                            3
+                                                          ]).indexOf(2, undefined)
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -459,15 +459,15 @@ const suites_1 = {
                                                 "typed_array - indexOfFrom",
                                                 (function (param) {
                                                     return {
-                                                            TAG: /* Eq */0,
-                                                            _0: 3,
-                                                            _1: new Int8Array([
-                                                                    1,
-                                                                    2,
-                                                                    3,
-                                                                    2
-                                                                  ]).indexOf(2, 2)
-                                                          };
+                                                      TAG: /* Eq */0,
+                                                      _0: 3,
+                                                      _1: new Int8Array([
+                                                              1,
+                                                              2,
+                                                              3,
+                                                              2
+                                                            ]).indexOf(2, 2)
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -475,14 +475,14 @@ const suites_1 = {
                                                   "typed_array - join",
                                                   (function (param) {
                                                       return {
-                                                              TAG: /* Eq */0,
-                                                              _0: "1,2,3",
-                                                              _1: new Int8Array([
-                                                                      1,
-                                                                      2,
-                                                                      3
-                                                                    ]).join(undefined)
-                                                            };
+                                                        TAG: /* Eq */0,
+                                                        _0: "1,2,3",
+                                                        _1: new Int8Array([
+                                                                1,
+                                                                2,
+                                                                3
+                                                              ]).join(undefined)
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -490,14 +490,14 @@ const suites_1 = {
                                                     "typed_array - joinWith",
                                                     (function (param) {
                                                         return {
-                                                                TAG: /* Eq */0,
-                                                                _0: "1;2;3",
-                                                                _1: new Int8Array([
-                                                                        1,
-                                                                        2,
-                                                                        3
-                                                                      ]).join(";")
-                                                              };
+                                                          TAG: /* Eq */0,
+                                                          _0: "1;2;3",
+                                                          _1: new Int8Array([
+                                                                  1,
+                                                                  2,
+                                                                  3
+                                                                ]).join(";")
+                                                        };
                                                       })
                                                   ],
                                                   tl: {
@@ -505,14 +505,14 @@ const suites_1 = {
                                                       "typed_array - lastIndexOf",
                                                       (function (param) {
                                                           return {
-                                                                  TAG: /* Eq */0,
-                                                                  _0: 1,
-                                                                  _1: new Int8Array([
-                                                                          1,
-                                                                          2,
-                                                                          3
-                                                                        ]).lastIndexOf(2)
-                                                                };
+                                                            TAG: /* Eq */0,
+                                                            _0: 1,
+                                                            _1: new Int8Array([
+                                                                    1,
+                                                                    2,
+                                                                    3
+                                                                  ]).lastIndexOf(2)
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -520,15 +520,15 @@ const suites_1 = {
                                                         "typed_array - lastIndexOfFrom",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: /* Eq */0,
-                                                                    _0: 1,
-                                                                    _1: new Int8Array([
-                                                                            1,
-                                                                            2,
-                                                                            3,
-                                                                            2
-                                                                          ]).lastIndexOf(2, 2)
-                                                                  };
+                                                              TAG: /* Eq */0,
+                                                              _0: 1,
+                                                              _1: new Int8Array([
+                                                                      1,
+                                                                      2,
+                                                                      3,
+                                                                      2
+                                                                    ]).lastIndexOf(2, 2)
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -536,19 +536,19 @@ const suites_1 = {
                                                           "typed_array - slice",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: /* Eq */0,
-                                                                      _0: new Int8Array([
-                                                                            2,
-                                                                            3
-                                                                          ]),
-                                                                      _1: new Int8Array([
-                                                                              1,
-                                                                              2,
-                                                                              3,
-                                                                              4,
-                                                                              5
-                                                                            ]).slice(1, 3)
-                                                                    };
+                                                                TAG: /* Eq */0,
+                                                                _0: new Int8Array([
+                                                                      2,
+                                                                      3
+                                                                    ]),
+                                                                _1: new Int8Array([
+                                                                        1,
+                                                                        2,
+                                                                        3,
+                                                                        4,
+                                                                        5
+                                                                      ]).slice(1, 3)
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -556,22 +556,22 @@ const suites_1 = {
                                                             "typed_array - copy",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: /* Eq */0,
-                                                                        _0: new Int8Array([
-                                                                              1,
-                                                                              2,
-                                                                              3,
-                                                                              4,
-                                                                              5
-                                                                            ]),
-                                                                        _1: new Int8Array([
-                                                                                1,
-                                                                                2,
-                                                                                3,
-                                                                                4,
-                                                                                5
-                                                                              ]).slice()
-                                                                      };
+                                                                  TAG: /* Eq */0,
+                                                                  _0: new Int8Array([
+                                                                        1,
+                                                                        2,
+                                                                        3,
+                                                                        4,
+                                                                        5
+                                                                      ]),
+                                                                  _1: new Int8Array([
+                                                                          1,
+                                                                          2,
+                                                                          3,
+                                                                          4,
+                                                                          5
+                                                                        ]).slice()
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -579,20 +579,20 @@ const suites_1 = {
                                                               "typed_array - sliceFrom",
                                                               (function (param) {
                                                                   return {
-                                                                          TAG: /* Eq */0,
-                                                                          _0: new Int8Array([
-                                                                                3,
-                                                                                4,
-                                                                                5
-                                                                              ]),
-                                                                          _1: new Int8Array([
-                                                                                  1,
-                                                                                  2,
-                                                                                  3,
-                                                                                  4,
-                                                                                  5
-                                                                                ]).slice(2, undefined)
-                                                                        };
+                                                                    TAG: /* Eq */0,
+                                                                    _0: new Int8Array([
+                                                                          3,
+                                                                          4,
+                                                                          5
+                                                                        ]),
+                                                                    _1: new Int8Array([
+                                                                            1,
+                                                                            2,
+                                                                            3,
+                                                                            4,
+                                                                            5
+                                                                          ]).slice(2, undefined)
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -600,19 +600,19 @@ const suites_1 = {
                                                                 "typed_array - subarray",
                                                                 (function (param) {
                                                                     return {
-                                                                            TAG: /* Eq */0,
-                                                                            _0: new Int8Array([
-                                                                                  2,
-                                                                                  3
-                                                                                ]),
-                                                                            _1: new Int8Array([
-                                                                                    1,
-                                                                                    2,
-                                                                                    3,
-                                                                                    4,
-                                                                                    5
-                                                                                  ]).subarray(1, 3)
-                                                                          };
+                                                                      TAG: /* Eq */0,
+                                                                      _0: new Int8Array([
+                                                                            2,
+                                                                            3
+                                                                          ]),
+                                                                      _1: new Int8Array([
+                                                                              1,
+                                                                              2,
+                                                                              3,
+                                                                              4,
+                                                                              5
+                                                                            ]).subarray(1, 3)
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -620,20 +620,20 @@ const suites_1 = {
                                                                   "typed_array - subarrayFrom",
                                                                   (function (param) {
                                                                       return {
-                                                                              TAG: /* Eq */0,
-                                                                              _0: new Int8Array([
-                                                                                    3,
-                                                                                    4,
-                                                                                    5
-                                                                                  ]),
-                                                                              _1: new Int8Array([
-                                                                                      1,
-                                                                                      2,
-                                                                                      3,
-                                                                                      4,
-                                                                                      5
-                                                                                    ]).subarray(2, undefined)
-                                                                            };
+                                                                        TAG: /* Eq */0,
+                                                                        _0: new Int8Array([
+                                                                              3,
+                                                                              4,
+                                                                              5
+                                                                            ]),
+                                                                        _1: new Int8Array([
+                                                                                1,
+                                                                                2,
+                                                                                3,
+                                                                                4,
+                                                                                5
+                                                                              ]).subarray(2, undefined)
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -641,14 +641,14 @@ const suites_1 = {
                                                                     "typed_array - toString",
                                                                     (function (param) {
                                                                         return {
-                                                                                TAG: /* Eq */0,
-                                                                                _0: "1,2,3",
-                                                                                _1: new Int8Array([
-                                                                                        1,
-                                                                                        2,
-                                                                                        3
-                                                                                      ]).toString()
-                                                                              };
+                                                                          TAG: /* Eq */0,
+                                                                          _0: "1,2,3",
+                                                                          _1: new Int8Array([
+                                                                                  1,
+                                                                                  2,
+                                                                                  3
+                                                                                ]).toString()
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -656,14 +656,14 @@ const suites_1 = {
                                                                       "typed_array - toLocaleString",
                                                                       (function (param) {
                                                                           return {
-                                                                                  TAG: /* Eq */0,
-                                                                                  _0: "1,2,3",
-                                                                                  _1: new Int8Array([
-                                                                                          1,
-                                                                                          2,
-                                                                                          3
-                                                                                        ]).toLocaleString()
-                                                                                };
+                                                                            TAG: /* Eq */0,
+                                                                            _0: "1,2,3",
+                                                                            _1: new Int8Array([
+                                                                                    1,
+                                                                                    2,
+                                                                                    3
+                                                                                  ]).toLocaleString()
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -671,16 +671,16 @@ const suites_1 = {
                                                                         "typed_array - every",
                                                                         (function (param) {
                                                                             return {
-                                                                                    TAG: /* Eq */0,
-                                                                                    _0: true,
-                                                                                    _1: new Int8Array([
-                                                                                            1,
-                                                                                            2,
-                                                                                            3
-                                                                                          ]).every(function (n) {
-                                                                                          return n > 0;
-                                                                                        })
-                                                                                  };
+                                                                              TAG: /* Eq */0,
+                                                                              _0: true,
+                                                                              _1: new Int8Array([
+                                                                                      1,
+                                                                                      2,
+                                                                                      3
+                                                                                    ]).every(function (n) {
+                                                                                    return n > 0;
+                                                                                  })
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -688,16 +688,16 @@ const suites_1 = {
                                                                           "typed_array - everyi",
                                                                           (function (param) {
                                                                               return {
-                                                                                      TAG: /* Eq */0,
-                                                                                      _0: false,
-                                                                                      _1: new Int8Array([
-                                                                                              1,
-                                                                                              2,
-                                                                                              3
-                                                                                            ]).every(function (param, i) {
-                                                                                            return i > 0;
-                                                                                          })
-                                                                                    };
+                                                                                TAG: /* Eq */0,
+                                                                                _0: false,
+                                                                                _1: new Int8Array([
+                                                                                        1,
+                                                                                        2,
+                                                                                        3
+                                                                                      ]).every(function (param, i) {
+                                                                                      return i > 0;
+                                                                                    })
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -705,20 +705,20 @@ const suites_1 = {
                                                                             "typed_array - filter",
                                                                             (function (param) {
                                                                                 return {
-                                                                                        TAG: /* Eq */0,
-                                                                                        _0: new Int8Array([
-                                                                                              2,
-                                                                                              4
-                                                                                            ]),
-                                                                                        _1: new Int8Array([
-                                                                                                1,
-                                                                                                2,
-                                                                                                3,
-                                                                                                4
-                                                                                              ]).filter(function (n) {
-                                                                                              return n % 2 === 0;
-                                                                                            })
-                                                                                      };
+                                                                                  TAG: /* Eq */0,
+                                                                                  _0: new Int8Array([
+                                                                                        2,
+                                                                                        4
+                                                                                      ]),
+                                                                                  _1: new Int8Array([
+                                                                                          1,
+                                                                                          2,
+                                                                                          3,
+                                                                                          4
+                                                                                        ]).filter(function (n) {
+                                                                                        return n % 2 === 0;
+                                                                                      })
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -726,20 +726,20 @@ const suites_1 = {
                                                                               "typed_array - filteri",
                                                                               (function (param) {
                                                                                   return {
-                                                                                          TAG: /* Eq */0,
-                                                                                          _0: new Int8Array([
-                                                                                                1,
-                                                                                                3
-                                                                                              ]),
-                                                                                          _1: new Int8Array([
-                                                                                                  1,
-                                                                                                  2,
-                                                                                                  3,
-                                                                                                  4
-                                                                                                ]).filter(function (param, i) {
-                                                                                                return i % 2 === 0;
-                                                                                              })
-                                                                                        };
+                                                                                    TAG: /* Eq */0,
+                                                                                    _0: new Int8Array([
+                                                                                          1,
+                                                                                          3
+                                                                                        ]),
+                                                                                    _1: new Int8Array([
+                                                                                            1,
+                                                                                            2,
+                                                                                            3,
+                                                                                            4
+                                                                                          ]).filter(function (param, i) {
+                                                                                          return i % 2 === 0;
+                                                                                        })
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -747,17 +747,17 @@ const suites_1 = {
                                                                                 "typed_array - find",
                                                                                 (function (param) {
                                                                                     return {
-                                                                                            TAG: /* Eq */0,
-                                                                                            _0: 2,
-                                                                                            _1: new Int8Array([
-                                                                                                    1,
-                                                                                                    2,
-                                                                                                    3,
-                                                                                                    4
-                                                                                                  ]).find(function (n) {
-                                                                                                  return n % 2 === 0;
-                                                                                                })
-                                                                                          };
+                                                                                      TAG: /* Eq */0,
+                                                                                      _0: 2,
+                                                                                      _1: new Int8Array([
+                                                                                              1,
+                                                                                              2,
+                                                                                              3,
+                                                                                              4
+                                                                                            ]).find(function (n) {
+                                                                                            return n % 2 === 0;
+                                                                                          })
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -765,17 +765,17 @@ const suites_1 = {
                                                                                   "typed_array - findi",
                                                                                   (function (param) {
                                                                                       return {
-                                                                                              TAG: /* Eq */0,
-                                                                                              _0: 1,
-                                                                                              _1: new Int8Array([
-                                                                                                      1,
-                                                                                                      2,
-                                                                                                      3,
-                                                                                                      4
-                                                                                                    ]).find(function (param, i) {
-                                                                                                    return i % 2 === 0;
-                                                                                                  })
-                                                                                            };
+                                                                                        TAG: /* Eq */0,
+                                                                                        _0: 1,
+                                                                                        _1: new Int8Array([
+                                                                                                1,
+                                                                                                2,
+                                                                                                3,
+                                                                                                4
+                                                                                              ]).find(function (param, i) {
+                                                                                              return i % 2 === 0;
+                                                                                            })
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -783,17 +783,17 @@ const suites_1 = {
                                                                                     "typed_array - findIndex",
                                                                                     (function (param) {
                                                                                         return {
-                                                                                                TAG: /* Eq */0,
-                                                                                                _0: 1,
-                                                                                                _1: new Int8Array([
-                                                                                                        1,
-                                                                                                        2,
-                                                                                                        3,
-                                                                                                        4
-                                                                                                      ]).findIndex(function (n) {
-                                                                                                      return n % 2 === 0;
-                                                                                                    })
-                                                                                              };
+                                                                                          TAG: /* Eq */0,
+                                                                                          _0: 1,
+                                                                                          _1: new Int8Array([
+                                                                                                  1,
+                                                                                                  2,
+                                                                                                  3,
+                                                                                                  4
+                                                                                                ]).findIndex(function (n) {
+                                                                                                return n % 2 === 0;
+                                                                                              })
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -801,17 +801,17 @@ const suites_1 = {
                                                                                       "typed_array - findIndexi",
                                                                                       (function (param) {
                                                                                           return {
-                                                                                                  TAG: /* Eq */0,
-                                                                                                  _0: 0,
-                                                                                                  _1: new Int8Array([
-                                                                                                          1,
-                                                                                                          2,
-                                                                                                          3,
-                                                                                                          4
-                                                                                                        ]).findIndex(function (param, i) {
-                                                                                                        return i % 2 === 0;
-                                                                                                      })
-                                                                                                };
+                                                                                            TAG: /* Eq */0,
+                                                                                            _0: 0,
+                                                                                            _1: new Int8Array([
+                                                                                                    1,
+                                                                                                    2,
+                                                                                                    3,
+                                                                                                    4
+                                                                                                  ]).findIndex(function (param, i) {
+                                                                                                  return i % 2 === 0;
+                                                                                                })
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: {
@@ -829,10 +829,10 @@ const suites_1 = {
                                                                                                   sum.contents = sum.contents + n | 0;
                                                                                                 });
                                                                                             return {
-                                                                                                    TAG: /* Eq */0,
-                                                                                                    _0: 6,
-                                                                                                    _1: sum.contents
-                                                                                                  };
+                                                                                              TAG: /* Eq */0,
+                                                                                              _0: 6,
+                                                                                              _1: sum.contents
+                                                                                            };
                                                                                           })
                                                                                       ],
                                                                                       tl: {
@@ -850,10 +850,10 @@ const suites_1 = {
                                                                                                     sum.contents = sum.contents + i | 0;
                                                                                                   });
                                                                                               return {
-                                                                                                      TAG: /* Eq */0,
-                                                                                                      _0: 3,
-                                                                                                      _1: sum.contents
-                                                                                                    };
+                                                                                                TAG: /* Eq */0,
+                                                                                                _0: 3,
+                                                                                                _1: sum.contents
+                                                                                              };
                                                                                             })
                                                                                         ],
                                                                                         tl: {
@@ -861,22 +861,22 @@ const suites_1 = {
                                                                                             "typed_array - map",
                                                                                             (function (param) {
                                                                                                 return {
-                                                                                                        TAG: /* Eq */0,
-                                                                                                        _0: new Int8Array([
-                                                                                                              2,
-                                                                                                              4,
-                                                                                                              6,
-                                                                                                              8
-                                                                                                            ]),
-                                                                                                        _1: new Int8Array([
-                                                                                                                1,
-                                                                                                                2,
-                                                                                                                3,
-                                                                                                                4
-                                                                                                              ]).map(function (n) {
-                                                                                                              return (n << 1);
-                                                                                                            })
-                                                                                                      };
+                                                                                                  TAG: /* Eq */0,
+                                                                                                  _0: new Int8Array([
+                                                                                                        2,
+                                                                                                        4,
+                                                                                                        6,
+                                                                                                        8
+                                                                                                      ]),
+                                                                                                  _1: new Int8Array([
+                                                                                                          1,
+                                                                                                          2,
+                                                                                                          3,
+                                                                                                          4
+                                                                                                        ]).map(function (n) {
+                                                                                                        return (n << 1);
+                                                                                                      })
+                                                                                                };
                                                                                               })
                                                                                           ],
                                                                                           tl: {
@@ -884,22 +884,22 @@ const suites_1 = {
                                                                                               "typed_array - map",
                                                                                               (function (param) {
                                                                                                   return {
-                                                                                                          TAG: /* Eq */0,
-                                                                                                          _0: new Int8Array([
-                                                                                                                0,
-                                                                                                                2,
-                                                                                                                4,
-                                                                                                                6
-                                                                                                              ]),
-                                                                                                          _1: new Int8Array([
-                                                                                                                  1,
-                                                                                                                  2,
-                                                                                                                  3,
-                                                                                                                  4
-                                                                                                                ]).map(function (param, i) {
-                                                                                                                return (i << 1);
-                                                                                                              })
-                                                                                                        };
+                                                                                                    TAG: /* Eq */0,
+                                                                                                    _0: new Int8Array([
+                                                                                                          0,
+                                                                                                          2,
+                                                                                                          4,
+                                                                                                          6
+                                                                                                        ]),
+                                                                                                    _1: new Int8Array([
+                                                                                                            1,
+                                                                                                            2,
+                                                                                                            3,
+                                                                                                            4
+                                                                                                          ]).map(function (param, i) {
+                                                                                                          return (i << 1);
+                                                                                                        })
+                                                                                                  };
                                                                                                 })
                                                                                             ],
                                                                                             tl: {
@@ -907,17 +907,17 @@ const suites_1 = {
                                                                                                 "typed_array - reduce",
                                                                                                 (function (param) {
                                                                                                     return {
-                                                                                                            TAG: /* Eq */0,
-                                                                                                            _0: -10,
-                                                                                                            _1: new Int8Array([
-                                                                                                                    1,
-                                                                                                                    2,
-                                                                                                                    3,
-                                                                                                                    4
-                                                                                                                  ]).reduce((function (acc, n) {
-                                                                                                                    return acc - n | 0;
-                                                                                                                  }), 0)
-                                                                                                          };
+                                                                                                      TAG: /* Eq */0,
+                                                                                                      _0: -10,
+                                                                                                      _1: new Int8Array([
+                                                                                                              1,
+                                                                                                              2,
+                                                                                                              3,
+                                                                                                              4
+                                                                                                            ]).reduce((function (acc, n) {
+                                                                                                              return acc - n | 0;
+                                                                                                            }), 0)
+                                                                                                    };
                                                                                                   })
                                                                                               ],
                                                                                               tl: {
@@ -925,17 +925,17 @@ const suites_1 = {
                                                                                                   "typed_array - reducei",
                                                                                                   (function (param) {
                                                                                                       return {
-                                                                                                              TAG: /* Eq */0,
-                                                                                                              _0: -6,
-                                                                                                              _1: new Int8Array([
-                                                                                                                      1,
-                                                                                                                      2,
-                                                                                                                      3,
-                                                                                                                      4
-                                                                                                                    ]).reduce((function (acc, param, i) {
-                                                                                                                      return acc - i | 0;
-                                                                                                                    }), 0)
-                                                                                                            };
+                                                                                                        TAG: /* Eq */0,
+                                                                                                        _0: -6,
+                                                                                                        _1: new Int8Array([
+                                                                                                                1,
+                                                                                                                2,
+                                                                                                                3,
+                                                                                                                4
+                                                                                                              ]).reduce((function (acc, param, i) {
+                                                                                                                return acc - i | 0;
+                                                                                                              }), 0)
+                                                                                                      };
                                                                                                     })
                                                                                                 ],
                                                                                                 tl: {
@@ -943,17 +943,17 @@ const suites_1 = {
                                                                                                     "typed_array - reduceRight",
                                                                                                     (function (param) {
                                                                                                         return {
-                                                                                                                TAG: /* Eq */0,
-                                                                                                                _0: -10,
-                                                                                                                _1: new Int8Array([
-                                                                                                                        1,
-                                                                                                                        2,
-                                                                                                                        3,
-                                                                                                                        4
-                                                                                                                      ]).reduceRight((function (acc, n) {
-                                                                                                                        return acc - n | 0;
-                                                                                                                      }), 0)
-                                                                                                              };
+                                                                                                          TAG: /* Eq */0,
+                                                                                                          _0: -10,
+                                                                                                          _1: new Int8Array([
+                                                                                                                  1,
+                                                                                                                  2,
+                                                                                                                  3,
+                                                                                                                  4
+                                                                                                                ]).reduceRight((function (acc, n) {
+                                                                                                                  return acc - n | 0;
+                                                                                                                }), 0)
+                                                                                                        };
                                                                                                       })
                                                                                                   ],
                                                                                                   tl: {
@@ -961,17 +961,17 @@ const suites_1 = {
                                                                                                       "typed_array - reduceRighti",
                                                                                                       (function (param) {
                                                                                                           return {
-                                                                                                                  TAG: /* Eq */0,
-                                                                                                                  _0: -6,
-                                                                                                                  _1: new Int8Array([
-                                                                                                                          1,
-                                                                                                                          2,
-                                                                                                                          3,
-                                                                                                                          4
-                                                                                                                        ]).reduceRight((function (acc, param, i) {
-                                                                                                                          return acc - i | 0;
-                                                                                                                        }), 0)
-                                                                                                                };
+                                                                                                            TAG: /* Eq */0,
+                                                                                                            _0: -6,
+                                                                                                            _1: new Int8Array([
+                                                                                                                    1,
+                                                                                                                    2,
+                                                                                                                    3,
+                                                                                                                    4
+                                                                                                                  ]).reduceRight((function (acc, param, i) {
+                                                                                                                    return acc - i | 0;
+                                                                                                                  }), 0)
+                                                                                                          };
                                                                                                         })
                                                                                                     ],
                                                                                                     tl: {
@@ -979,17 +979,17 @@ const suites_1 = {
                                                                                                         "typed_array - some",
                                                                                                         (function (param) {
                                                                                                             return {
-                                                                                                                    TAG: /* Eq */0,
-                                                                                                                    _0: false,
-                                                                                                                    _1: new Int8Array([
-                                                                                                                            1,
-                                                                                                                            2,
-                                                                                                                            3,
-                                                                                                                            4
-                                                                                                                          ]).some(function (n) {
-                                                                                                                          return n <= 0;
-                                                                                                                        })
-                                                                                                                  };
+                                                                                                              TAG: /* Eq */0,
+                                                                                                              _0: false,
+                                                                                                              _1: new Int8Array([
+                                                                                                                      1,
+                                                                                                                      2,
+                                                                                                                      3,
+                                                                                                                      4
+                                                                                                                    ]).some(function (n) {
+                                                                                                                    return n <= 0;
+                                                                                                                  })
+                                                                                                            };
                                                                                                           })
                                                                                                       ],
                                                                                                       tl: {
@@ -997,17 +997,17 @@ const suites_1 = {
                                                                                                           "typed_array - somei",
                                                                                                           (function (param) {
                                                                                                               return {
-                                                                                                                      TAG: /* Eq */0,
-                                                                                                                      _0: true,
-                                                                                                                      _1: new Int8Array([
-                                                                                                                              1,
-                                                                                                                              2,
-                                                                                                                              3,
-                                                                                                                              4
-                                                                                                                            ]).some(function (param, i) {
-                                                                                                                            return i <= 0;
-                                                                                                                          })
-                                                                                                                    };
+                                                                                                                TAG: /* Eq */0,
+                                                                                                                _0: true,
+                                                                                                                _1: new Int8Array([
+                                                                                                                        1,
+                                                                                                                        2,
+                                                                                                                        3,
+                                                                                                                        4
+                                                                                                                      ]).some(function (param, i) {
+                                                                                                                      return i <= 0;
+                                                                                                                    })
+                                                                                                              };
                                                                                                             })
                                                                                                         ],
                                                                                                         tl: {
@@ -1015,10 +1015,10 @@ const suites_1 = {
                                                                                                             "int8_array - _BYTES_PER_ELEMENT",
                                                                                                             (function (param) {
                                                                                                                 return {
-                                                                                                                        TAG: /* Eq */0,
-                                                                                                                        _0: 1,
-                                                                                                                        _1: Int8Array.BYTES_PER_ELEMENT
-                                                                                                                      };
+                                                                                                                  TAG: /* Eq */0,
+                                                                                                                  _0: 1,
+                                                                                                                  _1: Int8Array.BYTES_PER_ELEMENT
+                                                                                                                };
                                                                                                               })
                                                                                                           ],
                                                                                                           tl: {
@@ -1026,14 +1026,14 @@ const suites_1 = {
                                                                                                               "int8_array - make",
                                                                                                               (function (param) {
                                                                                                                   return {
-                                                                                                                          TAG: /* Eq */0,
-                                                                                                                          _0: 3,
-                                                                                                                          _1: new Int8Array([
-                                                                                                                                1,
-                                                                                                                                2,
-                                                                                                                                3
-                                                                                                                              ]).byteLength
-                                                                                                                        };
+                                                                                                                    TAG: /* Eq */0,
+                                                                                                                    _0: 3,
+                                                                                                                    _1: new Int8Array([
+                                                                                                                          1,
+                                                                                                                          2,
+                                                                                                                          3
+                                                                                                                        ]).byteLength
+                                                                                                                  };
                                                                                                                 })
                                                                                                             ],
                                                                                                             tl: {
@@ -1041,10 +1041,10 @@ const suites_1 = {
                                                                                                                 "int8_array - fromBuffer",
                                                                                                                 (function (param) {
                                                                                                                     return {
-                                                                                                                            TAG: /* Eq */0,
-                                                                                                                            _0: 32,
-                                                                                                                            _1: new Int8Array(new ArrayBuffer(32), undefined, undefined).byteLength
-                                                                                                                          };
+                                                                                                                      TAG: /* Eq */0,
+                                                                                                                      _0: 32,
+                                                                                                                      _1: new Int8Array(new ArrayBuffer(32), undefined, undefined).byteLength
+                                                                                                                    };
                                                                                                                   })
                                                                                                               ],
                                                                                                               tl: {
@@ -1053,10 +1053,10 @@ const suites_1 = {
                                                                                                                   (function (param) {
                                                                                                                       const buffer = new ArrayBuffer(32);
                                                                                                                       return {
-                                                                                                                              TAG: /* Eq */0,
-                                                                                                                              _0: 24,
-                                                                                                                              _1: new Int8Array(buffer, 8, undefined).byteLength
-                                                                                                                            };
+                                                                                                                        TAG: /* Eq */0,
+                                                                                                                        _0: 24,
+                                                                                                                        _1: new Int8Array(buffer, 8, undefined).byteLength
+                                                                                                                      };
                                                                                                                     })
                                                                                                                 ],
                                                                                                                 tl: {
@@ -1065,10 +1065,10 @@ const suites_1 = {
                                                                                                                     (function (param) {
                                                                                                                         const buffer = new ArrayBuffer(32);
                                                                                                                         return {
-                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                _0: 2,
-                                                                                                                                _1: new Int8Array(buffer, 8, 2).byteLength
-                                                                                                                              };
+                                                                                                                          TAG: /* Eq */0,
+                                                                                                                          _0: 2,
+                                                                                                                          _1: new Int8Array(buffer, 8, 2).byteLength
+                                                                                                                        };
                                                                                                                       })
                                                                                                                   ],
                                                                                                                   tl: {
@@ -1076,10 +1076,10 @@ const suites_1 = {
                                                                                                                       "int8_array - fromLength",
                                                                                                                       (function (param) {
                                                                                                                           return {
-                                                                                                                                  TAG: /* Eq */0,
-                                                                                                                                  _0: 3,
-                                                                                                                                  _1: new Int8Array(3).byteLength
-                                                                                                                                };
+                                                                                                                            TAG: /* Eq */0,
+                                                                                                                            _0: 3,
+                                                                                                                            _1: new Int8Array(3).byteLength
+                                                                                                                          };
                                                                                                                         })
                                                                                                                     ],
                                                                                                                     tl: {
@@ -1095,10 +1095,10 @@ const suites_1 = {
                                                                                                                                 ]);
                                                                                                                             a[3] = 14;
                                                                                                                             return {
-                                                                                                                                    TAG: /* Eq */0,
-                                                                                                                                    _0: 14,
-                                                                                                                                    _1: a[3]
-                                                                                                                                  };
+                                                                                                                              TAG: /* Eq */0,
+                                                                                                                              _0: 14,
+                                                                                                                              _1: a[3]
+                                                                                                                            };
                                                                                                                           })
                                                                                                                       ],
                                                                                                                       tl: {
@@ -1106,10 +1106,10 @@ const suites_1 = {
                                                                                                                           "uint8_array - _BYTES_PER_ELEMENT",
                                                                                                                           (function (param) {
                                                                                                                               return {
-                                                                                                                                      TAG: /* Eq */0,
-                                                                                                                                      _0: 1,
-                                                                                                                                      _1: Uint8Array.BYTES_PER_ELEMENT
-                                                                                                                                    };
+                                                                                                                                TAG: /* Eq */0,
+                                                                                                                                _0: 1,
+                                                                                                                                _1: Uint8Array.BYTES_PER_ELEMENT
+                                                                                                                              };
                                                                                                                             })
                                                                                                                         ],
                                                                                                                         tl: {
@@ -1117,14 +1117,14 @@ const suites_1 = {
                                                                                                                             "uint8_array - make",
                                                                                                                             (function (param) {
                                                                                                                                 return {
-                                                                                                                                        TAG: /* Eq */0,
-                                                                                                                                        _0: 3,
-                                                                                                                                        _1: new Uint8Array([
-                                                                                                                                              1,
-                                                                                                                                              2,
-                                                                                                                                              3
-                                                                                                                                            ]).byteLength
-                                                                                                                                      };
+                                                                                                                                  TAG: /* Eq */0,
+                                                                                                                                  _0: 3,
+                                                                                                                                  _1: new Uint8Array([
+                                                                                                                                        1,
+                                                                                                                                        2,
+                                                                                                                                        3
+                                                                                                                                      ]).byteLength
+                                                                                                                                };
                                                                                                                               })
                                                                                                                           ],
                                                                                                                           tl: {
@@ -1132,10 +1132,10 @@ const suites_1 = {
                                                                                                                               "uint8_array - fromBuffer",
                                                                                                                               (function (param) {
                                                                                                                                   return {
-                                                                                                                                          TAG: /* Eq */0,
-                                                                                                                                          _0: 32,
-                                                                                                                                          _1: new Uint8Array(new ArrayBuffer(32), undefined, undefined).byteLength
-                                                                                                                                        };
+                                                                                                                                    TAG: /* Eq */0,
+                                                                                                                                    _0: 32,
+                                                                                                                                    _1: new Uint8Array(new ArrayBuffer(32), undefined, undefined).byteLength
+                                                                                                                                  };
                                                                                                                                 })
                                                                                                                             ],
                                                                                                                             tl: {
@@ -1144,10 +1144,10 @@ const suites_1 = {
                                                                                                                                 (function (param) {
                                                                                                                                     const buffer = new ArrayBuffer(32);
                                                                                                                                     return {
-                                                                                                                                            TAG: /* Eq */0,
-                                                                                                                                            _0: 24,
-                                                                                                                                            _1: new Uint8Array(buffer, 8, undefined).byteLength
-                                                                                                                                          };
+                                                                                                                                      TAG: /* Eq */0,
+                                                                                                                                      _0: 24,
+                                                                                                                                      _1: new Uint8Array(buffer, 8, undefined).byteLength
+                                                                                                                                    };
                                                                                                                                   })
                                                                                                                               ],
                                                                                                                               tl: {
@@ -1156,10 +1156,10 @@ const suites_1 = {
                                                                                                                                   (function (param) {
                                                                                                                                       const buffer = new ArrayBuffer(32);
                                                                                                                                       return {
-                                                                                                                                              TAG: /* Eq */0,
-                                                                                                                                              _0: 2,
-                                                                                                                                              _1: new Uint8Array(buffer, 8, 2).byteLength
-                                                                                                                                            };
+                                                                                                                                        TAG: /* Eq */0,
+                                                                                                                                        _0: 2,
+                                                                                                                                        _1: new Uint8Array(buffer, 8, 2).byteLength
+                                                                                                                                      };
                                                                                                                                     })
                                                                                                                                 ],
                                                                                                                                 tl: {
@@ -1167,10 +1167,10 @@ const suites_1 = {
                                                                                                                                     "uint8_array - fromLength",
                                                                                                                                     (function (param) {
                                                                                                                                         return {
-                                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                                _0: 3,
-                                                                                                                                                _1: new Uint8Array(3).byteLength
-                                                                                                                                              };
+                                                                                                                                          TAG: /* Eq */0,
+                                                                                                                                          _0: 3,
+                                                                                                                                          _1: new Uint8Array(3).byteLength
+                                                                                                                                        };
                                                                                                                                       })
                                                                                                                                   ],
                                                                                                                                   tl: {
@@ -1186,10 +1186,10 @@ const suites_1 = {
                                                                                                                                               ]);
                                                                                                                                           a[3] = 14;
                                                                                                                                           return {
-                                                                                                                                                  TAG: /* Eq */0,
-                                                                                                                                                  _0: 14,
-                                                                                                                                                  _1: a[3]
-                                                                                                                                                };
+                                                                                                                                            TAG: /* Eq */0,
+                                                                                                                                            _0: 14,
+                                                                                                                                            _1: a[3]
+                                                                                                                                          };
                                                                                                                                         })
                                                                                                                                     ],
                                                                                                                                     tl: {
@@ -1197,10 +1197,10 @@ const suites_1 = {
                                                                                                                                         "uint8clamped_array - _BYTES_PER_ELEMENT",
                                                                                                                                         (function (param) {
                                                                                                                                             return {
-                                                                                                                                                    TAG: /* Eq */0,
-                                                                                                                                                    _0: 1,
-                                                                                                                                                    _1: Uint8ClampedArray.BYTES_PER_ELEMENT
-                                                                                                                                                  };
+                                                                                                                                              TAG: /* Eq */0,
+                                                                                                                                              _0: 1,
+                                                                                                                                              _1: Uint8ClampedArray.BYTES_PER_ELEMENT
+                                                                                                                                            };
                                                                                                                                           })
                                                                                                                                       ],
                                                                                                                                       tl: {
@@ -1208,14 +1208,14 @@ const suites_1 = {
                                                                                                                                           "uint8clamped_array - make",
                                                                                                                                           (function (param) {
                                                                                                                                               return {
-                                                                                                                                                      TAG: /* Eq */0,
-                                                                                                                                                      _0: 3,
-                                                                                                                                                      _1: new Uint8ClampedArray([
-                                                                                                                                                            1,
-                                                                                                                                                            2,
-                                                                                                                                                            3
-                                                                                                                                                          ]).byteLength
-                                                                                                                                                    };
+                                                                                                                                                TAG: /* Eq */0,
+                                                                                                                                                _0: 3,
+                                                                                                                                                _1: new Uint8ClampedArray([
+                                                                                                                                                      1,
+                                                                                                                                                      2,
+                                                                                                                                                      3
+                                                                                                                                                    ]).byteLength
+                                                                                                                                              };
                                                                                                                                             })
                                                                                                                                         ],
                                                                                                                                         tl: {
@@ -1223,10 +1223,10 @@ const suites_1 = {
                                                                                                                                             "uint8clamped_array - fromBuffer",
                                                                                                                                             (function (param) {
                                                                                                                                                 return {
-                                                                                                                                                        TAG: /* Eq */0,
-                                                                                                                                                        _0: 32,
-                                                                                                                                                        _1: new Uint8ClampedArray(new ArrayBuffer(32), undefined, undefined).byteLength
-                                                                                                                                                      };
+                                                                                                                                                  TAG: /* Eq */0,
+                                                                                                                                                  _0: 32,
+                                                                                                                                                  _1: new Uint8ClampedArray(new ArrayBuffer(32), undefined, undefined).byteLength
+                                                                                                                                                };
                                                                                                                                               })
                                                                                                                                           ],
                                                                                                                                           tl: {
@@ -1235,10 +1235,10 @@ const suites_1 = {
                                                                                                                                               (function (param) {
                                                                                                                                                   const buffer = new ArrayBuffer(32);
                                                                                                                                                   return {
-                                                                                                                                                          TAG: /* Eq */0,
-                                                                                                                                                          _0: 24,
-                                                                                                                                                          _1: new Uint8ClampedArray(buffer, 8, undefined).byteLength
-                                                                                                                                                        };
+                                                                                                                                                    TAG: /* Eq */0,
+                                                                                                                                                    _0: 24,
+                                                                                                                                                    _1: new Uint8ClampedArray(buffer, 8, undefined).byteLength
+                                                                                                                                                  };
                                                                                                                                                 })
                                                                                                                                             ],
                                                                                                                                             tl: {
@@ -1247,10 +1247,10 @@ const suites_1 = {
                                                                                                                                                 (function (param) {
                                                                                                                                                     const buffer = new ArrayBuffer(32);
                                                                                                                                                     return {
-                                                                                                                                                            TAG: /* Eq */0,
-                                                                                                                                                            _0: 2,
-                                                                                                                                                            _1: new Uint8ClampedArray(buffer, 8, 2).byteLength
-                                                                                                                                                          };
+                                                                                                                                                      TAG: /* Eq */0,
+                                                                                                                                                      _0: 2,
+                                                                                                                                                      _1: new Uint8ClampedArray(buffer, 8, 2).byteLength
+                                                                                                                                                    };
                                                                                                                                                   })
                                                                                                                                               ],
                                                                                                                                               tl: {
@@ -1258,10 +1258,10 @@ const suites_1 = {
                                                                                                                                                   "uint8clamped_array - fromLength",
                                                                                                                                                   (function (param) {
                                                                                                                                                       return {
-                                                                                                                                                              TAG: /* Eq */0,
-                                                                                                                                                              _0: 3,
-                                                                                                                                                              _1: new Uint8ClampedArray(3).byteLength
-                                                                                                                                                            };
+                                                                                                                                                        TAG: /* Eq */0,
+                                                                                                                                                        _0: 3,
+                                                                                                                                                        _1: new Uint8ClampedArray(3).byteLength
+                                                                                                                                                      };
                                                                                                                                                     })
                                                                                                                                                 ],
                                                                                                                                                 tl: {
@@ -1277,10 +1277,10 @@ const suites_1 = {
                                                                                                                                                             ]);
                                                                                                                                                         a[3] = 14;
                                                                                                                                                         return {
-                                                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                                                _0: 14,
-                                                                                                                                                                _1: a[3]
-                                                                                                                                                              };
+                                                                                                                                                          TAG: /* Eq */0,
+                                                                                                                                                          _0: 14,
+                                                                                                                                                          _1: a[3]
+                                                                                                                                                        };
                                                                                                                                                       })
                                                                                                                                                   ],
                                                                                                                                                   tl: {
@@ -1288,10 +1288,10 @@ const suites_1 = {
                                                                                                                                                       "int16_array - _BYTES_PER_ELEMENT",
                                                                                                                                                       (function (param) {
                                                                                                                                                           return {
-                                                                                                                                                                  TAG: /* Eq */0,
-                                                                                                                                                                  _0: 2,
-                                                                                                                                                                  _1: Int16Array.BYTES_PER_ELEMENT
-                                                                                                                                                                };
+                                                                                                                                                            TAG: /* Eq */0,
+                                                                                                                                                            _0: 2,
+                                                                                                                                                            _1: Int16Array.BYTES_PER_ELEMENT
+                                                                                                                                                          };
                                                                                                                                                         })
                                                                                                                                                     ],
                                                                                                                                                     tl: {
@@ -1299,14 +1299,14 @@ const suites_1 = {
                                                                                                                                                         "int16_array - make",
                                                                                                                                                         (function (param) {
                                                                                                                                                             return {
-                                                                                                                                                                    TAG: /* Eq */0,
-                                                                                                                                                                    _0: 6,
-                                                                                                                                                                    _1: new Int16Array([
-                                                                                                                                                                          1,
-                                                                                                                                                                          2,
-                                                                                                                                                                          3
-                                                                                                                                                                        ]).byteLength
-                                                                                                                                                                  };
+                                                                                                                                                              TAG: /* Eq */0,
+                                                                                                                                                              _0: 6,
+                                                                                                                                                              _1: new Int16Array([
+                                                                                                                                                                    1,
+                                                                                                                                                                    2,
+                                                                                                                                                                    3
+                                                                                                                                                                  ]).byteLength
+                                                                                                                                                            };
                                                                                                                                                           })
                                                                                                                                                       ],
                                                                                                                                                       tl: {
@@ -1314,10 +1314,10 @@ const suites_1 = {
                                                                                                                                                           "int16_array - fromBuffer",
                                                                                                                                                           (function (param) {
                                                                                                                                                               return {
-                                                                                                                                                                      TAG: /* Eq */0,
-                                                                                                                                                                      _0: 32,
-                                                                                                                                                                      _1: new Int16Array(new ArrayBuffer(32), undefined, undefined).byteLength
-                                                                                                                                                                    };
+                                                                                                                                                                TAG: /* Eq */0,
+                                                                                                                                                                _0: 32,
+                                                                                                                                                                _1: new Int16Array(new ArrayBuffer(32), undefined, undefined).byteLength
+                                                                                                                                                              };
                                                                                                                                                             })
                                                                                                                                                         ],
                                                                                                                                                         tl: {
@@ -1326,10 +1326,10 @@ const suites_1 = {
                                                                                                                                                             (function (param) {
                                                                                                                                                                 const buffer = new ArrayBuffer(32);
                                                                                                                                                                 return {
-                                                                                                                                                                        TAG: /* Eq */0,
-                                                                                                                                                                        _0: 24,
-                                                                                                                                                                        _1: new Int16Array(buffer, 8, undefined).byteLength
-                                                                                                                                                                      };
+                                                                                                                                                                  TAG: /* Eq */0,
+                                                                                                                                                                  _0: 24,
+                                                                                                                                                                  _1: new Int16Array(buffer, 8, undefined).byteLength
+                                                                                                                                                                };
                                                                                                                                                               })
                                                                                                                                                           ],
                                                                                                                                                           tl: {
@@ -1338,10 +1338,10 @@ const suites_1 = {
                                                                                                                                                               (function (param) {
                                                                                                                                                                   const buffer = new ArrayBuffer(32);
                                                                                                                                                                   return {
-                                                                                                                                                                          TAG: /* Eq */0,
-                                                                                                                                                                          _0: 4,
-                                                                                                                                                                          _1: new Int16Array(buffer, 8, 2).byteLength
-                                                                                                                                                                        };
+                                                                                                                                                                    TAG: /* Eq */0,
+                                                                                                                                                                    _0: 4,
+                                                                                                                                                                    _1: new Int16Array(buffer, 8, 2).byteLength
+                                                                                                                                                                  };
                                                                                                                                                                 })
                                                                                                                                                             ],
                                                                                                                                                             tl: {
@@ -1349,10 +1349,10 @@ const suites_1 = {
                                                                                                                                                                 "int16_array - fromLength",
                                                                                                                                                                 (function (param) {
                                                                                                                                                                     return {
-                                                                                                                                                                            TAG: /* Eq */0,
-                                                                                                                                                                            _0: 6,
-                                                                                                                                                                            _1: new Int16Array(3).byteLength
-                                                                                                                                                                          };
+                                                                                                                                                                      TAG: /* Eq */0,
+                                                                                                                                                                      _0: 6,
+                                                                                                                                                                      _1: new Int16Array(3).byteLength
+                                                                                                                                                                    };
                                                                                                                                                                   })
                                                                                                                                                               ],
                                                                                                                                                               tl: {
@@ -1367,11 +1367,11 @@ const suites_1 = {
                                                                                                                                                                             5
                                                                                                                                                                           ]);
                                                                                                                                                                       a[3] = 14;
-                                                                                                                                                                      return {
-                                                                                                                                                                              TAG: /* Eq */0,
-                                                                                                                                                                              _0: 14,
-                                                                                                                                                                              _1: a[3]
-                                                                                                                                                                            };
+                                                                                                                                                                      return {
+                                                                                                                                                                        TAG: /* Eq */0,
+                                                                                                                                                                        _0: 14,
+                                                                                                                                                                        _1: a[3]
+                                                                                                                                                                      };
                                                                                                                                                                     })
                                                                                                                                                                 ],
                                                                                                                                                                 tl: {
@@ -1379,10 +1379,10 @@ const suites_1 = {
                                                                                                                                                                     "uint16_array - _BYTES_PER_ELEMENT",
                                                                                                                                                                     (function (param) {
                                                                                                                                                                         return {
-                                                                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                                                                _0: 2,
-                                                                                                                                                                                _1: Uint16Array.BYTES_PER_ELEMENT
-                                                                                                                                                                              };
+                                                                                                                                                                          TAG: /* Eq */0,
+                                                                                                                                                                          _0: 2,
+                                                                                                                                                                          _1: Uint16Array.BYTES_PER_ELEMENT
+                                                                                                                                                                        };
                                                                                                                                                                       })
                                                                                                                                                                   ],
                                                                                                                                                                   tl: {
@@ -1390,14 +1390,14 @@ const suites_1 = {
                                                                                                                                                                       "uint16_array - make",
                                                                                                                                                                       (function (param) {
                                                                                                                                                                           return {
-                                                                                                                                                                                  TAG: /* Eq */0,
-                                                                                                                                                                                  _0: 6,
-                                                                                                                                                                                  _1: new Uint16Array([
-                                                                                                                                                                                        1,
-                                                                                                                                                                                        2,
-                                                                                                                                                                                        3
-                                                                                                                                                                                      ]).byteLength
-                                                                                                                                                                                };
+                                                                                                                                                                            TAG: /* Eq */0,
+                                                                                                                                                                            _0: 6,
+                                                                                                                                                                            _1: new Uint16Array([
+                                                                                                                                                                                  1,
+                                                                                                                                                                                  2,
+                                                                                                                                                                                  3
+                                                                                                                                                                                ]).byteLength
+                                                                                                                                                                          };
                                                                                                                                                                         })
                                                                                                                                                                     ],
                                                                                                                                                                     tl: {
@@ -1405,10 +1405,10 @@ const suites_1 = {
                                                                                                                                                                         "uint16_array - fromBuffer",
                                                                                                                                                                         (function (param) {
                                                                                                                                                                             return {
-                                                                                                                                                                                    TAG: /* Eq */0,
-                                                                                                                                                                                    _0: 32,
-                                                                                                                                                                                    _1: new Uint16Array(new ArrayBuffer(32), undefined, undefined).byteLength
-                                                                                                                                                                                  };
+                                                                                                                                                                              TAG: /* Eq */0,
+                                                                                                                                                                              _0: 32,
+                                                                                                                                                                              _1: new Uint16Array(new ArrayBuffer(32), undefined, undefined).byteLength
+                                                                                                                                                                            };
                                                                                                                                                                           })
                                                                                                                                                                       ],
                                                                                                                                                                       tl: {
@@ -1417,10 +1417,10 @@ const suites_1 = {
                                                                                                                                                                           (function (param) {
                                                                                                                                                                               const buffer = new ArrayBuffer(32);
                                                                                                                                                                               return {
-                                                                                                                                                                                      TAG: /* Eq */0,
-                                                                                                                                                                                      _0: 24,
-                                                                                                                                                                                      _1: new Uint16Array(buffer, 8, undefined).byteLength
-                                                                                                                                                                                    };
+                                                                                                                                                                                TAG: /* Eq */0,
+                                                                                                                                                                                _0: 24,
+                                                                                                                                                                                _1: new Uint16Array(buffer, 8, undefined).byteLength
+                                                                                                                                                                              };
                                                                                                                                                                             })
                                                                                                                                                                         ],
                                                                                                                                                                         tl: {
@@ -1429,10 +1429,10 @@ const suites_1 = {
                                                                                                                                                                             (function (param) {
                                                                                                                                                                                 const buffer = new ArrayBuffer(32);
                                                                                                                                                                                 return {
-                                                                                                                                                                                        TAG: /* Eq */0,
-                                                                                                                                                                                        _0: 4,
-                                                                                                                                                                                        _1: new Uint16Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                      };
+                                                                                                                                                                                  TAG: /* Eq */0,
+                                                                                                                                                                                  _0: 4,
+                                                                                                                                                                                  _1: new Uint16Array(buffer, 8, 2).byteLength
+                                                                                                                                                                                };
                                                                                                                                                                               })
                                                                                                                                                                           ],
                                                                                                                                                                           tl: {
@@ -1440,10 +1440,10 @@ const suites_1 = {
                                                                                                                                                                               "uint16_array - fromLength",
                                                                                                                                                                               (function (param) {
                                                                                                                                                                                   return {
-                                                                                                                                                                                          TAG: /* Eq */0,
-                                                                                                                                                                                          _0: 6,
-                                                                                                                                                                                          _1: new Uint16Array(3).byteLength
-                                                                                                                                                                                        };
+                                                                                                                                                                                    TAG: /* Eq */0,
+                                                                                                                                                                                    _0: 6,
+                                                                                                                                                                                    _1: new Uint16Array(3).byteLength
+                                                                                                                                                                                  };
                                                                                                                                                                                 })
                                                                                                                                                                             ],
                                                                                                                                                                             tl: {
@@ -1459,10 +1459,10 @@ const suites_1 = {
                                                                                                                                                                                         ]);
                                                                                                                                                                                     a[3] = 14;
                                                                                                                                                                                     return {
-                                                                                                                                                                                            TAG: /* Eq */0,
-                                                                                                                                                                                            _0: 14,
-                                                                                                                                                                                            _1: a[3]
-                                                                                                                                                                                          };
+                                                                                                                                                                                      TAG: /* Eq */0,
+                                                                                                                                                                                      _0: 14,
+                                                                                                                                                                                      _1: a[3]
+                                                                                                                                                                                    };
                                                                                                                                                                                   })
                                                                                                                                                                               ],
                                                                                                                                                                               tl: {
@@ -1470,10 +1470,10 @@ const suites_1 = {
                                                                                                                                                                                   "int32_array - _BYTES_PER_ELEMENT",
                                                                                                                                                                                   (function (param) {
                                                                                                                                                                                       return {
-                                                                                                                                                                                              TAG: /* Eq */0,
-                                                                                                                                                                                              _0: 4,
-                                                                                                                                                                                              _1: Int32Array.BYTES_PER_ELEMENT
-                                                                                                                                                                                            };
+                                                                                                                                                                                        TAG: /* Eq */0,
+                                                                                                                                                                                        _0: 4,
+                                                                                                                                                                                        _1: Int32Array.BYTES_PER_ELEMENT
+                                                                                                                                                                                      };
                                                                                                                                                                                     })
                                                                                                                                                                                 ],
                                                                                                                                                                                 tl: {
@@ -1481,16 +1481,16 @@ const suites_1 = {
                                                                                                                                                                                     "int32_array - make",
                                                                                                                                                                                     (function (param) {
                                                                                                                                                                                         return {
-                                                                                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                                                                                _0: 12,
-                                                                                                                                                                                                _1: new Int32Array(Stdlib__Array.map((function (prim) {
-                                                                                                                                                                                                            return prim;
-                                                                                                                                                                                                          }), [
-                                                                                                                                                                                                          1,
-                                                                                                                                                                                                          2,
-                                                                                                                                                                                                          3
-                                                                                                                                                                                                        ])).byteLength
-                                                                                                                                                                                              };
+                                                                                                                                                                                          TAG: /* Eq */0,
+                                                                                                                                                                                          _0: 12,
+                                                                                                                                                                                          _1: new Int32Array(Stdlib__Array.map((function (prim) {
+                                                                                                                                                                                                      return prim;
+                                                                                                                                                                                                    }), [
+                                                                                                                                                                                                    1,
+                                                                                                                                                                                                    2,
+                                                                                                                                                                                                    3
+                                                                                                                                                                                                  ])).byteLength
+                                                                                                                                                                                        };
                                                                                                                                                                                       })
                                                                                                                                                                                   ],
                                                                                                                                                                                   tl: {
@@ -1498,10 +1498,10 @@ const suites_1 = {
                                                                                                                                                                                       "int32_array - fromBuffer",
                                                                                                                                                                                       (function (param) {
                                                                                                                                                                                           return {
-                                                                                                                                                                                                  TAG: /* Eq */0,
-                                                                                                                                                                                                  _0: 32,
-                                                                                                                                                                                                  _1: new Int32Array(new ArrayBuffer(32), undefined, undefined).byteLength
-                                                                                                                                                                                                };
+                                                                                                                                                                                            TAG: /* Eq */0,
+                                                                                                                                                                                            _0: 32,
+                                                                                                                                                                                            _1: new Int32Array(new ArrayBuffer(32), undefined, undefined).byteLength
+                                                                                                                                                                                          };
                                                                                                                                                                                         })
                                                                                                                                                                                     ],
                                                                                                                                                                                     tl: {
@@ -1510,10 +1510,10 @@ const suites_1 = {
                                                                                                                                                                                         (function (param) {
                                                                                                                                                                                             const buffer = new ArrayBuffer(32);
                                                                                                                                                                                             return {
-                                                                                                                                                                                                    TAG: /* Eq */0,
-                                                                                                                                                                                                    _0: 24,
-                                                                                                                                                                                                    _1: new Int32Array(buffer, 8, undefined).byteLength
-                                                                                                                                                                                                  };
+                                                                                                                                                                                              TAG: /* Eq */0,
+                                                                                                                                                                                              _0: 24,
+                                                                                                                                                                                              _1: new Int32Array(buffer, 8, undefined).byteLength
+                                                                                                                                                                                            };
                                                                                                                                                                                           })
                                                                                                                                                                                       ],
                                                                                                                                                                                       tl: {
@@ -1522,10 +1522,10 @@ const suites_1 = {
                                                                                                                                                                                           (function (param) {
                                                                                                                                                                                               const buffer = new ArrayBuffer(32);
                                                                                                                                                                                               return {
-                                                                                                                                                                                                      TAG: /* Eq */0,
-                                                                                                                                                                                                      _0: 8,
-                                                                                                                                                                                                      _1: new Int32Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                                    };
+                                                                                                                                                                                                TAG: /* Eq */0,
+                                                                                                                                                                                                _0: 8,
+                                                                                                                                                                                                _1: new Int32Array(buffer, 8, 2).byteLength
+                                                                                                                                                                                              };
                                                                                                                                                                                             })
                                                                                                                                                                                         ],
                                                                                                                                                                                         tl: {
@@ -1533,10 +1533,10 @@ const suites_1 = {
                                                                                                                                                                                             "int32_array - fromLength",
                                                                                                                                                                                             (function (param) {
                                                                                                                                                                                                 return {
-                                                                                                                                                                                                        TAG: /* Eq */0,
-                                                                                                                                                                                                        _0: 12,
-                                                                                                                                                                                                        _1: new Int32Array(3).byteLength
-                                                                                                                                                                                                      };
+                                                                                                                                                                                                  TAG: /* Eq */0,
+                                                                                                                                                                                                  _0: 12,
+                                                                                                                                                                                                  _1: new Int32Array(3).byteLength
+                                                                                                                                                                                                };
                                                                                                                                                                                               })
                                                                                                                                                                                           ],
                                                                                                                                                                                           tl: {
@@ -1554,10 +1554,10 @@ const suites_1 = {
                                                                                                                                                                                                           ]));
                                                                                                                                                                                                   a[3] = 14;
                                                                                                                                                                                                   return {
-                                                                                                                                                                                                          TAG: /* Eq */0,
-                                                                                                                                                                                                          _0: 14,
-                                                                                                                                                                                                          _1: a[3]
-                                                                                                                                                                                                        };
+                                                                                                                                                                                                    TAG: /* Eq */0,
+                                                                                                                                                                                                    _0: 14,
+                                                                                                                                                                                                    _1: a[3]
+                                                                                                                                                                                                  };
                                                                                                                                                                                                 })
                                                                                                                                                                                             ],
                                                                                                                                                                                             tl: {
@@ -1565,10 +1565,10 @@ const suites_1 = {
                                                                                                                                                                                                 "uint32_array - _BYTES_PER_ELEMENT",
                                                                                                                                                                                                 (function (param) {
                                                                                                                                                                                                     return {
-                                                                                                                                                                                                            TAG: /* Eq */0,
-                                                                                                                                                                                                            _0: 4,
-                                                                                                                                                                                                            _1: Uint32Array.BYTES_PER_ELEMENT
-                                                                                                                                                                                                          };
+                                                                                                                                                                                                      TAG: /* Eq */0,
+                                                                                                                                                                                                      _0: 4,
+                                                                                                                                                                                                      _1: Uint32Array.BYTES_PER_ELEMENT
+                                                                                                                                                                                                    };
                                                                                                                                                                                                   })
                                                                                                                                                                                               ],
                                                                                                                                                                                               tl: {
@@ -1576,14 +1576,14 @@ const suites_1 = {
                                                                                                                                                                                                   "uint32_array - make",
                                                                                                                                                                                                   (function (param) {
                                                                                                                                                                                                       return {
-                                                                                                                                                                                                              TAG: /* Eq */0,
-                                                                                                                                                                                                              _0: 12,
-                                                                                                                                                                                                              _1: new Uint32Array([
-                                                                                                                                                                                                                    1,
-                                                                                                                                                                                                                    2,
-                                                                                                                                                                                                                    3
-                                                                                                                                                                                                                  ]).byteLength
-                                                                                                                                                                                                            };
+                                                                                                                                                                                                        TAG: /* Eq */0,
+                                                                                                                                                                                                        _0: 12,
+                                                                                                                                                                                                        _1: new Uint32Array([
+                                                                                                                                                                                                              1,
+                                                                                                                                                                                                              2,
+                                                                                                                                                                                                              3
+                                                                                                                                                                                                            ]).byteLength
+                                                                                                                                                                                                      };
                                                                                                                                                                                                     })
                                                                                                                                                                                                 ],
                                                                                                                                                                                                 tl: {
@@ -1591,10 +1591,10 @@ const suites_1 = {
                                                                                                                                                                                                     "uint32_array - fromBuffer",
                                                                                                                                                                                                     (function (param) {
                                                                                                                                                                                                         return {
-                                                                                                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                                                                                                _0: 32,
-                                                                                                                                                                                                                _1: new Uint32Array(new ArrayBuffer(32), undefined, undefined).byteLength
-                                                                                                                                                                                                              };
+                                                                                                                                                                                                          TAG: /* Eq */0,
+                                                                                                                                                                                                          _0: 32,
+                                                                                                                                                                                                          _1: new Uint32Array(new ArrayBuffer(32), undefined, undefined).byteLength
+                                                                                                                                                                                                        };
                                                                                                                                                                                                       })
                                                                                                                                                                                                   ],
                                                                                                                                                                                                   tl: {
@@ -1603,10 +1603,10 @@ const suites_1 = {
                                                                                                                                                                                                       (function (param) {
                                                                                                                                                                                                           const buffer = new ArrayBuffer(32);
                                                                                                                                                                                                           return {
-                                                                                                                                                                                                                  TAG: /* Eq */0,
-                                                                                                                                                                                                                  _0: 24,
-                                                                                                                                                                                                                  _1: new Uint32Array(buffer, 8, undefined).byteLength
-                                                                                                                                                                                                                };
+                                                                                                                                                                                                            TAG: /* Eq */0,
+                                                                                                                                                                                                            _0: 24,
+                                                                                                                                                                                                            _1: new Uint32Array(buffer, 8, undefined).byteLength
+                                                                                                                                                                                                          };
                                                                                                                                                                                                         })
                                                                                                                                                                                                     ],
                                                                                                                                                                                                     tl: {
@@ -1615,10 +1615,10 @@ const suites_1 = {
                                                                                                                                                                                                         (function (param) {
                                                                                                                                                                                                             const buffer = new ArrayBuffer(32);
                                                                                                                                                                                                             return {
-                                                                                                                                                                                                                    TAG: /* Eq */0,
-                                                                                                                                                                                                                    _0: 8,
-                                                                                                                                                                                                                    _1: new Uint32Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                                                  };
+                                                                                                                                                                                                              TAG: /* Eq */0,
+                                                                                                                                                                                                              _0: 8,
+                                                                                                                                                                                                              _1: new Uint32Array(buffer, 8, 2).byteLength
+                                                                                                                                                                                                            };
                                                                                                                                                                                                           })
                                                                                                                                                                                                       ],
                                                                                                                                                                                                       tl: {
@@ -1626,10 +1626,10 @@ const suites_1 = {
                                                                                                                                                                                                           "uint32_array - fromLength",
                                                                                                                                                                                                           (function (param) {
                                                                                                                                                                                                               return {
-                                                                                                                                                                                                                      TAG: /* Eq */0,
-                                                                                                                                                                                                                      _0: 12,
-                                                                                                                                                                                                                      _1: new Uint32Array(3).byteLength
-                                                                                                                                                                                                                    };
+                                                                                                                                                                                                                TAG: /* Eq */0,
+                                                                                                                                                                                                                _0: 12,
+                                                                                                                                                                                                                _1: new Uint32Array(3).byteLength
+                                                                                                                                                                                                              };
                                                                                                                                                                                                             })
                                                                                                                                                                                                         ],
                                                                                                                                                                                                         tl: {
@@ -1645,10 +1645,10 @@ const suites_1 = {
                                                                                                                                                                                                                     ]);
                                                                                                                                                                                                                 a[3] = 14;
                                                                                                                                                                                                                 return {
-                                                                                                                                                                                                                        TAG: /* Eq */0,
-                                                                                                                                                                                                                        _0: 14,
-                                                                                                                                                                                                                        _1: a[3]
-                                                                                                                                                                                                                      };
+                                                                                                                                                                                                                  TAG: /* Eq */0,
+                                                                                                                                                                                                                  _0: 14,
+                                                                                                                                                                                                                  _1: a[3]
+                                                                                                                                                                                                                };
                                                                                                                                                                                                               })
                                                                                                                                                                                                           ],
                                                                                                                                                                                                           tl: {
@@ -1656,10 +1656,10 @@ const suites_1 = {
                                                                                                                                                                                                               "float32_array - _BYTES_PER_ELEMENT",
                                                                                                                                                                                                               (function (param) {
                                                                                                                                                                                                                   return {
-                                                                                                                                                                                                                          TAG: /* Eq */0,
-                                                                                                                                                                                                                          _0: 4,
-                                                                                                                                                                                                                          _1: Float32Array.BYTES_PER_ELEMENT
-                                                                                                                                                                                                                        };
+                                                                                                                                                                                                                    TAG: /* Eq */0,
+                                                                                                                                                                                                                    _0: 4,
+                                                                                                                                                                                                                    _1: Float32Array.BYTES_PER_ELEMENT
+                                                                                                                                                                                                                  };
                                                                                                                                                                                                                 })
                                                                                                                                                                                                             ],
                                                                                                                                                                                                             tl: {
@@ -1667,14 +1667,14 @@ const suites_1 = {
                                                                                                                                                                                                                 "float32_array - make",
                                                                                                                                                                                                                 (function (param) {
                                                                                                                                                                                                                     return {
-                                                                                                                                                                                                                            TAG: /* Eq */0,
-                                                                                                                                                                                                                            _0: 12,
-                                                                                                                                                                                                                            _1: new Float32Array([
-                                                                                                                                                                                                                                  1,
-                                                                                                                                                                                                                                  2,
-                                                                                                                                                                                                                                  3
-                                                                                                                                                                                                                                ]).byteLength
-                                                                                                                                                                                                                          };
+                                                                                                                                                                                                                      TAG: /* Eq */0,
+                                                                                                                                                                                                                      _0: 12,
+                                                                                                                                                                                                                      _1: new Float32Array([
+                                                                                                                                                                                                                            1,
+                                                                                                                                                                                                                            2,
+                                                                                                                                                                                                                            3
+                                                                                                                                                                                                                          ]).byteLength
+                                                                                                                                                                                                                    };
                                                                                                                                                                                                                   })
                                                                                                                                                                                                               ],
                                                                                                                                                                                                               tl: {
@@ -1682,10 +1682,10 @@ const suites_1 = {
                                                                                                                                                                                                                   "float32_array - fromBuffer",
                                                                                                                                                                                                                   (function (param) {
                                                                                                                                                                                                                       return {
-                                                                                                                                                                                                                              TAG: /* Eq */0,
-                                                                                                                                                                                                                              _0: 32,
-                                                                                                                                                                                                                              _1: new Float32Array(new ArrayBuffer(32), undefined, undefined).byteLength
-                                                                                                                                                                                                                            };
+                                                                                                                                                                                                                        TAG: /* Eq */0,
+                                                                                                                                                                                                                        _0: 32,
+                                                                                                                                                                                                                        _1: new Float32Array(new ArrayBuffer(32), undefined, undefined).byteLength
+                                                                                                                                                                                                                      };
                                                                                                                                                                                                                     })
                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                 tl: {
@@ -1694,10 +1694,10 @@ const suites_1 = {
                                                                                                                                                                                                                     (function (param) {
                                                                                                                                                                                                                         const buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                         return {
-                                                                                                                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                                                                                                                _0: 24,
-                                                                                                                                                                                                                                _1: new Float32Array(buffer, 8, undefined).byteLength
-                                                                                                                                                                                                                              };
+                                                                                                                                                                                                                          TAG: /* Eq */0,
+                                                                                                                                                                                                                          _0: 24,
+                                                                                                                                                                                                                          _1: new Float32Array(buffer, 8, undefined).byteLength
+                                                                                                                                                                                                                        };
                                                                                                                                                                                                                       })
                                                                                                                                                                                                                   ],
                                                                                                                                                                                                                   tl: {
@@ -1706,10 +1706,10 @@ const suites_1 = {
                                                                                                                                                                                                                       (function (param) {
                                                                                                                                                                                                                           const buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                           return {
-                                                                                                                                                                                                                                  TAG: /* Eq */0,
-                                                                                                                                                                                                                                  _0: 8,
-                                                                                                                                                                                                                                  _1: new Float32Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                                                                };
+                                                                                                                                                                                                                            TAG: /* Eq */0,
+                                                                                                                                                                                                                            _0: 8,
+                                                                                                                                                                                                                            _1: new Float32Array(buffer, 8, 2).byteLength
+                                                                                                                                                                                                                          };
                                                                                                                                                                                                                         })
                                                                                                                                                                                                                     ],
                                                                                                                                                                                                                     tl: {
@@ -1717,10 +1717,10 @@ const suites_1 = {
                                                                                                                                                                                                                         "float32_array - fromLength",
                                                                                                                                                                                                                         (function (param) {
                                                                                                                                                                                                                             return {
-                                                                                                                                                                                                                                    TAG: /* Eq */0,
-                                                                                                                                                                                                                                    _0: 12,
-                                                                                                                                                                                                                                    _1: new Float32Array(3).byteLength
-                                                                                                                                                                                                                                  };
+                                                                                                                                                                                                                              TAG: /* Eq */0,
+                                                                                                                                                                                                                              _0: 12,
+                                                                                                                                                                                                                              _1: new Float32Array(3).byteLength
+                                                                                                                                                                                                                            };
                                                                                                                                                                                                                           })
                                                                                                                                                                                                                       ],
                                                                                                                                                                                                                       tl: {
@@ -1736,10 +1736,10 @@ const suites_1 = {
                                                                                                                                                                                                                                   ]);
                                                                                                                                                                                                                               a[3] = 14;
                                                                                                                                                                                                                               return {
-                                                                                                                                                                                                                                      TAG: /* Eq */0,
-                                                                                                                                                                                                                                      _0: 14,
-                                                                                                                                                                                                                                      _1: a[3]
-                                                                                                                                                                                                                                    };
+                                                                                                                                                                                                                                TAG: /* Eq */0,
+                                                                                                                                                                                                                                _0: 14,
+                                                                                                                                                                                                                                _1: a[3]
+                                                                                                                                                                                                                              };
                                                                                                                                                                                                                             })
                                                                                                                                                                                                                         ],
                                                                                                                                                                                                                         tl: {
@@ -1747,10 +1747,10 @@ const suites_1 = {
                                                                                                                                                                                                                             "float64_array - _BYTES_PER_ELEMENT",
                                                                                                                                                                                                                             (function (param) {
                                                                                                                                                                                                                                 return {
-                                                                                                                                                                                                                                        TAG: /* Eq */0,
-                                                                                                                                                                                                                                        _0: 8,
-                                                                                                                                                                                                                                        _1: Float64Array.BYTES_PER_ELEMENT
-                                                                                                                                                                                                                                      };
+                                                                                                                                                                                                                                  TAG: /* Eq */0,
+                                                                                                                                                                                                                                  _0: 8,
+                                                                                                                                                                                                                                  _1: Float64Array.BYTES_PER_ELEMENT
+                                                                                                                                                                                                                                };
                                                                                                                                                                                                                               })
                                                                                                                                                                                                                           ],
                                                                                                                                                                                                                           tl: {
@@ -1758,14 +1758,14 @@ const suites_1 = {
                                                                                                                                                                                                                               "float64_array - make",
                                                                                                                                                                                                                               (function (param) {
                                                                                                                                                                                                                                   return {
-                                                                                                                                                                                                                                          TAG: /* Eq */0,
-                                                                                                                                                                                                                                          _0: 24,
-                                                                                                                                                                                                                                          _1: new Float64Array([
-                                                                                                                                                                                                                                                1,
-                                                                                                                                                                                                                                                2,
-                                                                                                                                                                                                                                                3
-                                                                                                                                                                                                                                              ]).byteLength
-                                                                                                                                                                                                                                        };
+                                                                                                                                                                                                                                    TAG: /* Eq */0,
+                                                                                                                                                                                                                                    _0: 24,
+                                                                                                                                                                                                                                    _1: new Float64Array([
+                                                                                                                                                                                                                                          1,
+                                                                                                                                                                                                                                          2,
+                                                                                                                                                                                                                                          3
+                                                                                                                                                                                                                                        ]).byteLength
+                                                                                                                                                                                                                                  };
                                                                                                                                                                                                                                 })
                                                                                                                                                                                                                             ],
                                                                                                                                                                                                                             tl: {
@@ -1773,10 +1773,10 @@ const suites_1 = {
                                                                                                                                                                                                                                 "float64_array - fromBuffer",
                                                                                                                                                                                                                                 (function (param) {
                                                                                                                                                                                                                                     return {
-                                                                                                                                                                                                                                            TAG: /* Eq */0,
-                                                                                                                                                                                                                                            _0: 32,
-                                                                                                                                                                                                                                            _1: new Float64Array(new ArrayBuffer(32), undefined, undefined).byteLength
-                                                                                                                                                                                                                                          };
+                                                                                                                                                                                                                                      TAG: /* Eq */0,
+                                                                                                                                                                                                                                      _0: 32,
+                                                                                                                                                                                                                                      _1: new Float64Array(new ArrayBuffer(32), undefined, undefined).byteLength
+                                                                                                                                                                                                                                    };
                                                                                                                                                                                                                                   })
                                                                                                                                                                                                                               ],
                                                                                                                                                                                                                               tl: {
@@ -1785,10 +1785,10 @@ const suites_1 = {
                                                                                                                                                                                                                                   (function (param) {
                                                                                                                                                                                                                                       const buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                                       return {
-                                                                                                                                                                                                                                              TAG: /* Eq */0,
-                                                                                                                                                                                                                                              _0: 24,
-                                                                                                                                                                                                                                              _1: new Float64Array(buffer, 8, undefined).byteLength
-                                                                                                                                                                                                                                            };
+                                                                                                                                                                                                                                        TAG: /* Eq */0,
+                                                                                                                                                                                                                                        _0: 24,
+                                                                                                                                                                                                                                        _1: new Float64Array(buffer, 8, undefined).byteLength
+                                                                                                                                                                                                                                      };
                                                                                                                                                                                                                                     })
                                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                                 tl: {
@@ -1797,10 +1797,10 @@ const suites_1 = {
                                                                                                                                                                                                                                     (function (param) {
                                                                                                                                                                                                                                         const buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                                         return {
-                                                                                                                                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                                                                                                                                _0: 16,
-                                                                                                                                                                                                                                                _1: new Float64Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                                                                              };
+                                                                                                                                                                                                                                          TAG: /* Eq */0,
+                                                                                                                                                                                                                                          _0: 16,
+                                                                                                                                                                                                                                          _1: new Float64Array(buffer, 8, 2).byteLength
+                                                                                                                                                                                                                                        };
                                                                                                                                                                                                                                       })
                                                                                                                                                                                                                                   ],
                                                                                                                                                                                                                                   tl: {
@@ -1808,10 +1808,10 @@ const suites_1 = {
                                                                                                                                                                                                                                       "float64_array - fromLength",
                                                                                                                                                                                                                                       (function (param) {
                                                                                                                                                                                                                                           return {
-                                                                                                                                                                                                                                                  TAG: /* Eq */0,
-                                                                                                                                                                                                                                                  _0: 24,
-                                                                                                                                                                                                                                                  _1: new Float64Array(3).byteLength
-                                                                                                                                                                                                                                                };
+                                                                                                                                                                                                                                            TAG: /* Eq */0,
+                                                                                                                                                                                                                                            _0: 24,
+                                                                                                                                                                                                                                            _1: new Float64Array(3).byteLength
+                                                                                                                                                                                                                                          };
                                                                                                                                                                                                                                         })
                                                                                                                                                                                                                                     ],
                                                                                                                                                                                                                                     tl: {
@@ -1827,10 +1827,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                 ]);
                                                                                                                                                                                                                                             a[3] = 14;
                                                                                                                                                                                                                                             return {
-                                                                                                                                                                                                                                                    TAG: /* Eq */0,
-                                                                                                                                                                                                                                                    _0: 14,
-                                                                                                                                                                                                                                                    _1: a[3]
-                                                                                                                                                                                                                                                  };
+                                                                                                                                                                                                                                              TAG: /* Eq */0,
+                                                                                                                                                                                                                                              _0: 14,
+                                                                                                                                                                                                                                              _1: a[3]
+                                                                                                                                                                                                                                            };
                                                                                                                                                                                                                                           })
                                                                                                                                                                                                                                       ],
                                                                                                                                                                                                                                       tl: {
@@ -1838,10 +1838,10 @@ const suites_1 = {
                                                                                                                                                                                                                                           "DataView - make, byteLength",
                                                                                                                                                                                                                                           (function (param) {
                                                                                                                                                                                                                                               return {
-                                                                                                                                                                                                                                                      TAG: /* Eq */0,
-                                                                                                                                                                                                                                                      _0: 32,
-                                                                                                                                                                                                                                                      _1: new DataView(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                                                                                    };
+                                                                                                                                                                                                                                                TAG: /* Eq */0,
+                                                                                                                                                                                                                                                _0: 32,
+                                                                                                                                                                                                                                                _1: new DataView(new ArrayBuffer(32)).byteLength
+                                                                                                                                                                                                                                              };
                                                                                                                                                                                                                                             })
                                                                                                                                                                                                                                         ],
                                                                                                                                                                                                                                         tl: {
@@ -1849,10 +1849,10 @@ const suites_1 = {
                                                                                                                                                                                                                                             "DataView - fromBuffer",
                                                                                                                                                                                                                                             (function (param) {
                                                                                                                                                                                                                                                 return {
-                                                                                                                                                                                                                                                        TAG: /* Eq */0,
-                                                                                                                                                                                                                                                        _0: 32,
-                                                                                                                                                                                                                                                        _1: new DataView(new ArrayBuffer(32), undefined, undefined).byteLength
-                                                                                                                                                                                                                                                      };
+                                                                                                                                                                                                                                                  TAG: /* Eq */0,
+                                                                                                                                                                                                                                                  _0: 32,
+                                                                                                                                                                                                                                                  _1: new DataView(new ArrayBuffer(32), undefined, undefined).byteLength
+                                                                                                                                                                                                                                                };
                                                                                                                                                                                                                                               })
                                                                                                                                                                                                                                           ],
                                                                                                                                                                                                                                           tl: {
@@ -1861,10 +1861,10 @@ const suites_1 = {
                                                                                                                                                                                                                                               (function (param) {
                                                                                                                                                                                                                                                   const buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                                                   return {
-                                                                                                                                                                                                                                                          TAG: /* Eq */0,
-                                                                                                                                                                                                                                                          _0: 24,
-                                                                                                                                                                                                                                                          _1: new DataView(buffer, 8, undefined).byteLength
-                                                                                                                                                                                                                                                        };
+                                                                                                                                                                                                                                                    TAG: /* Eq */0,
+                                                                                                                                                                                                                                                    _0: 24,
+                                                                                                                                                                                                                                                    _1: new DataView(buffer, 8, undefined).byteLength
+                                                                                                                                                                                                                                                  };
                                                                                                                                                                                                                                                 })
                                                                                                                                                                                                                                             ],
                                                                                                                                                                                                                                             tl: {
@@ -1873,10 +1873,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                 (function (param) {
                                                                                                                                                                                                                                                     const buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                                                     return {
-                                                                                                                                                                                                                                                            TAG: /* Eq */0,
-                                                                                                                                                                                                                                                            _0: 4,
-                                                                                                                                                                                                                                                            _1: new DataView(buffer, 8, 4).byteLength
-                                                                                                                                                                                                                                                          };
+                                                                                                                                                                                                                                                      TAG: /* Eq */0,
+                                                                                                                                                                                                                                                      _0: 4,
+                                                                                                                                                                                                                                                      _1: new DataView(buffer, 8, 4).byteLength
+                                                                                                                                                                                                                                                    };
                                                                                                                                                                                                                                                   })
                                                                                                                                                                                                                                               ],
                                                                                                                                                                                                                                               tl: {
@@ -1885,10 +1885,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                   (function (param) {
                                                                                                                                                                                                                                                       const buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                                                       return {
-                                                                                                                                                                                                                                                              TAG: /* Eq */0,
-                                                                                                                                                                                                                                                              _0: buffer,
-                                                                                                                                                                                                                                                              _1: new DataView(buffer, undefined, undefined).buffer
-                                                                                                                                                                                                                                                            };
+                                                                                                                                                                                                                                                        TAG: /* Eq */0,
+                                                                                                                                                                                                                                                        _0: buffer,
+                                                                                                                                                                                                                                                        _1: new DataView(buffer, undefined, undefined).buffer
+                                                                                                                                                                                                                                                      };
                                                                                                                                                                                                                                                     })
                                                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                                                 tl: {
@@ -1897,10 +1897,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                     (function (param) {
                                                                                                                                                                                                                                                         const buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                                                         return {
-                                                                                                                                                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                _0: 8,
-                                                                                                                                                                                                                                                                _1: new DataView(buffer, 8, undefined).byteOffset
-                                                                                                                                                                                                                                                              };
+                                                                                                                                                                                                                                                          TAG: /* Eq */0,
+                                                                                                                                                                                                                                                          _0: 8,
+                                                                                                                                                                                                                                                          _1: new DataView(buffer, 8, undefined).byteOffset
+                                                                                                                                                                                                                                                        };
                                                                                                                                                                                                                                                       })
                                                                                                                                                                                                                                                   ],
                                                                                                                                                                                                                                                   tl: {
@@ -1911,10 +1911,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                           const view = new DataView(buffer);
                                                                                                                                                                                                                                                           view.setInt8(0, 1);
                                                                                                                                                                                                                                                           return {
-                                                                                                                                                                                                                                                                  TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                  _0: 1,
-                                                                                                                                                                                                                                                                  _1: view.getInt8(0)
-                                                                                                                                                                                                                                                                };
+                                                                                                                                                                                                                                                            TAG: /* Eq */0,
+                                                                                                                                                                                                                                                            _0: 1,
+                                                                                                                                                                                                                                                            _1: view.getInt8(0)
+                                                                                                                                                                                                                                                          };
                                                                                                                                                                                                                                                         })
                                                                                                                                                                                                                                                     ],
                                                                                                                                                                                                                                                     tl: {
@@ -1925,10 +1925,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                             const view = new DataView(buffer);
                                                                                                                                                                                                                                                             view.setUint8(0, 128);
                                                                                                                                                                                                                                                             return {
-                                                                                                                                                                                                                                                                    TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                    _0: 128,
-                                                                                                                                                                                                                                                                    _1: view.getUint8(0)
-                                                                                                                                                                                                                                                                  };
+                                                                                                                                                                                                                                                              TAG: /* Eq */0,
+                                                                                                                                                                                                                                                              _0: 128,
+                                                                                                                                                                                                                                                              _1: view.getUint8(0)
+                                                                                                                                                                                                                                                            };
                                                                                                                                                                                                                                                           })
                                                                                                                                                                                                                                                       ],
                                                                                                                                                                                                                                                       tl: {
@@ -1939,10 +1939,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                               const view = new DataView(buffer);
                                                                                                                                                                                                                                                               view.setInt16(0, 257);
                                                                                                                                                                                                                                                               return {
-                                                                                                                                                                                                                                                                      TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                      _0: 257,
-                                                                                                                                                                                                                                                                      _1: view.getInt16(0)
-                                                                                                                                                                                                                                                                    };
+                                                                                                                                                                                                                                                                TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                _0: 257,
+                                                                                                                                                                                                                                                                _1: view.getInt16(0)
+                                                                                                                                                                                                                                                              };
                                                                                                                                                                                                                                                             })
                                                                                                                                                                                                                                                         ],
                                                                                                                                                                                                                                                         tl: {
@@ -1953,10 +1953,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                 const view = new DataView(buffer);
                                                                                                                                                                                                                                                                 view.setInt16(0, 25000, 1);
                                                                                                                                                                                                                                                                 return {
-                                                                                                                                                                                                                                                                        TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                        _0: 25000,
-                                                                                                                                                                                                                                                                        _1: view.getInt16(0, 1)
-                                                                                                                                                                                                                                                                      };
+                                                                                                                                                                                                                                                                  TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                  _0: 25000,
+                                                                                                                                                                                                                                                                  _1: view.getInt16(0, 1)
+                                                                                                                                                                                                                                                                };
                                                                                                                                                                                                                                                               })
                                                                                                                                                                                                                                                           ],
                                                                                                                                                                                                                                                           tl: {
@@ -1967,10 +1967,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                   const view = new DataView(buffer);
                                                                                                                                                                                                                                                                   view.setInt16(0, 25000, 1);
                                                                                                                                                                                                                                                                   return {
-                                                                                                                                                                                                                                                                          TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                          _0: -22431,
-                                                                                                                                                                                                                                                                          _1: view.getInt16(0)
-                                                                                                                                                                                                                                                                        };
+                                                                                                                                                                                                                                                                    TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                    _0: -22431,
+                                                                                                                                                                                                                                                                    _1: view.getInt16(0)
+                                                                                                                                                                                                                                                                  };
                                                                                                                                                                                                                                                                 })
                                                                                                                                                                                                                                                             ],
                                                                                                                                                                                                                                                             tl: {
@@ -1981,10 +1981,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                     const view = new DataView(buffer);
                                                                                                                                                                                                                                                                     view.setUint16(0, 32768);
                                                                                                                                                                                                                                                                     return {
-                                                                                                                                                                                                                                                                            TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                            _0: 32768,
-                                                                                                                                                                                                                                                                            _1: view.getUint16(0)
-                                                                                                                                                                                                                                                                          };
+                                                                                                                                                                                                                                                                      TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                      _0: 32768,
+                                                                                                                                                                                                                                                                      _1: view.getUint16(0)
+                                                                                                                                                                                                                                                                    };
                                                                                                                                                                                                                                                                   })
                                                                                                                                                                                                                                                               ],
                                                                                                                                                                                                                                                               tl: {
@@ -1995,10 +1995,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                       const view = new DataView(buffer);
                                                                                                                                                                                                                                                                       view.setUint16(0, 32768, 1);
                                                                                                                                                                                                                                                                       return {
-                                                                                                                                                                                                                                                                              TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                              _0: 32768,
-                                                                                                                                                                                                                                                                              _1: view.getUint16(0, 1)
-                                                                                                                                                                                                                                                                            };
+                                                                                                                                                                                                                                                                        TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                        _0: 32768,
+                                                                                                                                                                                                                                                                        _1: view.getUint16(0, 1)
+                                                                                                                                                                                                                                                                      };
                                                                                                                                                                                                                                                                     })
                                                                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                                                                 tl: {
@@ -2009,10 +2009,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                         const view = new DataView(buffer);
                                                                                                                                                                                                                                                                         view.setUint16(0, 32768, 1);
                                                                                                                                                                                                                                                                         return {
-                                                                                                                                                                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                                _0: 128,
-                                                                                                                                                                                                                                                                                _1: view.getUint16(0)
-                                                                                                                                                                                                                                                                              };
+                                                                                                                                                                                                                                                                          TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                          _0: 128,
+                                                                                                                                                                                                                                                                          _1: view.getUint16(0)
+                                                                                                                                                                                                                                                                        };
                                                                                                                                                                                                                                                                       })
                                                                                                                                                                                                                                                                   ],
                                                                                                                                                                                                                                                                   tl: {
@@ -2023,10 +2023,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                           const view = new DataView(buffer);
                                                                                                                                                                                                                                                                           view.setInt32(0, 65537);
                                                                                                                                                                                                                                                                           return {
-                                                                                                                                                                                                                                                                                  TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                                  _0: 65537,
-                                                                                                                                                                                                                                                                                  _1: view.getInt32(0)
-                                                                                                                                                                                                                                                                                };
+                                                                                                                                                                                                                                                                            TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                            _0: 65537,
+                                                                                                                                                                                                                                                                            _1: view.getInt32(0)
+                                                                                                                                                                                                                                                                          };
                                                                                                                                                                                                                                                                         })
                                                                                                                                                                                                                                                                     ],
                                                                                                                                                                                                                                                                     tl: {
@@ -2037,10 +2037,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                             const view = new DataView(buffer);
                                                                                                                                                                                                                                                                             view.setInt32(0, 65537, 1);
                                                                                                                                                                                                                                                                             return {
-                                                                                                                                                                                                                                                                                    TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                                    _0: 65537,
-                                                                                                                                                                                                                                                                                    _1: view.getInt32(0, 1)
-                                                                                                                                                                                                                                                                                  };
+                                                                                                                                                                                                                                                                              TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                              _0: 65537,
+                                                                                                                                                                                                                                                                              _1: view.getInt32(0, 1)
+                                                                                                                                                                                                                                                                            };
                                                                                                                                                                                                                                                                           })
                                                                                                                                                                                                                                                                       ],
                                                                                                                                                                                                                                                                       tl: {
@@ -2051,10 +2051,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                               const view = new DataView(buffer);
                                                                                                                                                                                                                                                                               view.setInt32(0, 65537, 1);
                                                                                                                                                                                                                                                                               return {
-                                                                                                                                                                                                                                                                                      TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                                      _0: 16777472,
-                                                                                                                                                                                                                                                                                      _1: view.getInt32(0)
-                                                                                                                                                                                                                                                                                    };
+                                                                                                                                                                                                                                                                                TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                                _0: 16777472,
+                                                                                                                                                                                                                                                                                _1: view.getInt32(0)
+                                                                                                                                                                                                                                                                              };
                                                                                                                                                                                                                                                                             })
                                                                                                                                                                                                                                                                         ],
                                                                                                                                                                                                                                                                         tl: {
@@ -2065,10 +2065,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                                 const view = new DataView(buffer);
                                                                                                                                                                                                                                                                                 view.setUint32(0, 65537);
                                                                                                                                                                                                                                                                                 return {
-                                                                                                                                                                                                                                                                                        TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                                        _0: 65537,
-                                                                                                                                                                                                                                                                                        _1: view.getUint32(0)
-                                                                                                                                                                                                                                                                                      };
+                                                                                                                                                                                                                                                                                  TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                                  _0: 65537,
+                                                                                                                                                                                                                                                                                  _1: view.getUint32(0)
+                                                                                                                                                                                                                                                                                };
                                                                                                                                                                                                                                                                               })
                                                                                                                                                                                                                                                                           ],
                                                                                                                                                                                                                                                                           tl: {
@@ -2079,10 +2079,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                                   const view = new DataView(buffer);
                                                                                                                                                                                                                                                                                   view.setUint32(0, 65537, 1);
                                                                                                                                                                                                                                                                                   return {
-                                                                                                                                                                                                                                                                                          TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                                          _0: 65537,
-                                                                                                                                                                                                                                                                                          _1: view.getUint32(0, 1)
-                                                                                                                                                                                                                                                                                        };
+                                                                                                                                                                                                                                                                                    TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                                    _0: 65537,
+                                                                                                                                                                                                                                                                                    _1: view.getUint32(0, 1)
+                                                                                                                                                                                                                                                                                  };
                                                                                                                                                                                                                                                                                 })
                                                                                                                                                                                                                                                                             ],
                                                                                                                                                                                                                                                                             tl: {
@@ -2093,10 +2093,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                                     const view = new DataView(buffer);
                                                                                                                                                                                                                                                                                     view.setUint32(0, 65537, 1);
                                                                                                                                                                                                                                                                                     return {
-                                                                                                                                                                                                                                                                                            TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                                            _0: 16777472,
-                                                                                                                                                                                                                                                                                            _1: view.getUint32(0)
-                                                                                                                                                                                                                                                                                          };
+                                                                                                                                                                                                                                                                                      TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                                      _0: 16777472,
+                                                                                                                                                                                                                                                                                      _1: view.getUint32(0)
+                                                                                                                                                                                                                                                                                    };
                                                                                                                                                                                                                                                                                   })
                                                                                                                                                                                                                                                                               ],
                                                                                                                                                                                                                                                                               tl: {
@@ -2107,10 +2107,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                                       const view = new DataView(buffer);
                                                                                                                                                                                                                                                                                       view.setFloat32(0, 65537.0);
                                                                                                                                                                                                                                                                                       return {
-                                                                                                                                                                                                                                                                                              TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                                              _0: 65537.0,
-                                                                                                                                                                                                                                                                                              _1: view.getFloat32(0)
-                                                                                                                                                                                                                                                                                            };
+                                                                                                                                                                                                                                                                                        TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                                        _0: 65537.0,
+                                                                                                                                                                                                                                                                                        _1: view.getFloat32(0)
+                                                                                                                                                                                                                                                                                      };
                                                                                                                                                                                                                                                                                     })
                                                                                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                                                                                 tl: {
@@ -2121,10 +2121,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                                         const view = new DataView(buffer);
                                                                                                                                                                                                                                                                                         view.setFloat32(0, 65537.0, 1);
                                                                                                                                                                                                                                                                                         return {
-                                                                                                                                                                                                                                                                                                TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                                                _0: 65537.0,
-                                                                                                                                                                                                                                                                                                _1: view.getFloat32(0, 1)
-                                                                                                                                                                                                                                                                                              };
+                                                                                                                                                                                                                                                                                          TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                                          _0: 65537.0,
+                                                                                                                                                                                                                                                                                          _1: view.getFloat32(0, 1)
+                                                                                                                                                                                                                                                                                        };
                                                                                                                                                                                                                                                                                       })
                                                                                                                                                                                                                                                                                   ],
                                                                                                                                                                                                                                                                                   tl: {
@@ -2135,10 +2135,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                                           const view = new DataView(buffer);
                                                                                                                                                                                                                                                                                           view.setFloat32(0, 1.0, 1);
                                                                                                                                                                                                                                                                                           return {
-                                                                                                                                                                                                                                                                                                  TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                                                  _0: 4.600602988224807e-41,
-                                                                                                                                                                                                                                                                                                  _1: view.getFloat32(0)
-                                                                                                                                                                                                                                                                                                };
+                                                                                                                                                                                                                                                                                            TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                                            _0: 4.600602988224807e-41,
+                                                                                                                                                                                                                                                                                            _1: view.getFloat32(0)
+                                                                                                                                                                                                                                                                                          };
                                                                                                                                                                                                                                                                                         })
                                                                                                                                                                                                                                                                                     ],
                                                                                                                                                                                                                                                                                     tl: {
@@ -2149,10 +2149,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                                             const view = new DataView(buffer);
                                                                                                                                                                                                                                                                                             view.setFloat64(0, 1e200);
                                                                                                                                                                                                                                                                                             return {
-                                                                                                                                                                                                                                                                                                    TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                                                    _0: 1e200,
-                                                                                                                                                                                                                                                                                                    _1: view.getFloat64(0)
-                                                                                                                                                                                                                                                                                                  };
+                                                                                                                                                                                                                                                                                              TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                                              _0: 1e200,
+                                                                                                                                                                                                                                                                                              _1: view.getFloat64(0)
+                                                                                                                                                                                                                                                                                            };
                                                                                                                                                                                                                                                                                           })
                                                                                                                                                                                                                                                                                       ],
                                                                                                                                                                                                                                                                                       tl: {
@@ -2163,10 +2163,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                                               const view = new DataView(buffer);
                                                                                                                                                                                                                                                                                               view.setFloat64(0, 1e200, 1);
                                                                                                                                                                                                                                                                                               return {
-                                                                                                                                                                                                                                                                                                      TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                                                      _0: 1e200,
-                                                                                                                                                                                                                                                                                                      _1: view.getFloat64(0, 1)
-                                                                                                                                                                                                                                                                                                    };
+                                                                                                                                                                                                                                                                                                TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                                                _0: 1e200,
+                                                                                                                                                                                                                                                                                                _1: view.getFloat64(0, 1)
+                                                                                                                                                                                                                                                                                              };
                                                                                                                                                                                                                                                                                             })
                                                                                                                                                                                                                                                                                         ],
                                                                                                                                                                                                                                                                                         tl: {
@@ -2177,10 +2177,10 @@ const suites_1 = {
                                                                                                                                                                                                                                                                                                 const view = new DataView(buffer);
                                                                                                                                                                                                                                                                                                 view.setFloat64(0, 1.0, 1);
                                                                                                                                                                                                                                                                                                 return {
-                                                                                                                                                                                                                                                                                                        TAG: /* Eq */0,
-                                                                                                                                                                                                                                                                                                        _0: 3.03865e-319,
-                                                                                                                                                                                                                                                                                                        _1: view.getFloat64(0)
-                                                                                                                                                                                                                                                                                                      };
+                                                                                                                                                                                                                                                                                                  TAG: /* Eq */0,
+                                                                                                                                                                                                                                                                                                  _0: 3.03865e-319,
+                                                                                                                                                                                                                                                                                                  _1: view.getFloat64(0)
+                                                                                                                                                                                                                                                                                                };
                                                                                                                                                                                                                                                                                               })
                                                                                                                                                                                                                                                                                           ],
                                                                                                                                                                                                                                                                                           tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_undefined_test.js b/jscomp/test/dist/jscomp/test/js_undefined_test.js
index ac1833f53..0bee1d41a 100644
--- a/jscomp/test/dist/jscomp/test/js_undefined_test.js
+++ b/jscomp/test/dist/jscomp/test/js_undefined_test.js
@@ -9,10 +9,10 @@ const suites_0 = [
   "toOption - empty",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: undefined,
-              _1: undefined
-            };
+        TAG: /* Eq */0,
+        _0: undefined,
+        _1: undefined
+      };
     })
 ];
 
@@ -21,10 +21,10 @@ const suites_1 = {
     "File \"jscomp/test/js_undefined_test.ml\", line 5, characters 2-9",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: undefined,
-                _1: undefined
-              };
+          TAG: /* Eq */0,
+          _0: undefined,
+          _1: undefined
+        };
       })
   ],
   tl: {
@@ -32,10 +32,10 @@ const suites_1 = {
       "return",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: "something",
-                  _1: Caml_option.undefined_to_opt("something")
-                };
+            TAG: /* Eq */0,
+            _0: "something",
+            _1: Caml_option.undefined_to_opt("something")
+          };
         })
     ],
     tl: {
@@ -43,10 +43,10 @@ const suites_1 = {
         "test - empty",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: true,
-                    _1: true
-                  };
+              TAG: /* Eq */0,
+              _0: true,
+              _1: true
+            };
           })
       ],
       tl: {
@@ -54,10 +54,10 @@ const suites_1 = {
           "File \"jscomp/test/js_undefined_test.ml\", line 8, characters 2-9",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: true,
-                      _1: true
-                    };
+                TAG: /* Eq */0,
+                _0: true,
+                _1: true
+              };
             })
         ],
         tl: {
@@ -65,12 +65,12 @@ const suites_1 = {
             "bind - empty",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: undefined,
-                        _1: Js__Js_undefined.bind((function (v) {
-                                return v;
-                              }), undefined)
-                      };
+                  TAG: /* Eq */0,
+                  _0: undefined,
+                  _1: Js__Js_undefined.bind((function (v) {
+                          return v;
+                        }), undefined)
+                };
               })
           ],
           tl: {
@@ -78,12 +78,12 @@ const suites_1 = {
               "map - 'a",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: 4,
-                          _1: Js__Js_undefined.map((function (n) {
-                                  return (n << 1);
-                                }), 2)
-                        };
+                    TAG: /* Eq */0,
+                    _0: 4,
+                    _1: Js__Js_undefined.map((function (n) {
+                            return (n << 1);
+                          }), 2)
+                  };
                 })
             ],
             tl: {
@@ -97,10 +97,10 @@ const suites_1 = {
                             hit.contents = true;
                           }), undefined);
                     return {
-                            TAG: /* Eq */0,
-                            _0: false,
-                            _1: hit.contents
-                          };
+                      TAG: /* Eq */0,
+                      _0: false,
+                      _1: hit.contents
+                    };
                   })
               ],
               tl: {
@@ -114,10 +114,10 @@ const suites_1 = {
                               hit.contents = v;
                             }), 2);
                       return {
-                              TAG: /* Eq */0,
-                              _0: 2,
-                              _1: hit.contents
-                            };
+                        TAG: /* Eq */0,
+                        _0: 2,
+                        _1: hit.contents
+                      };
                     })
                 ],
                 tl: {
@@ -125,10 +125,10 @@ const suites_1 = {
                     "fromOption - None",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: undefined,
-                                _1: Js__Js_undefined.fromOption(undefined)
-                              };
+                          TAG: /* Eq */0,
+                          _0: undefined,
+                          _1: Js__Js_undefined.fromOption(undefined)
+                        };
                       })
                   ],
                   tl: {
@@ -136,10 +136,10 @@ const suites_1 = {
                       "fromOption - Some",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: 2,
-                                  _1: Js__Js_undefined.fromOption(2)
-                                };
+                            TAG: /* Eq */0,
+                            _0: 2,
+                            _1: Js__Js_undefined.fromOption(2)
+                          };
                         })
                     ],
                     tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_weakmap_test.js b/jscomp/test/dist/jscomp/test/js_weakmap_test.js
index b18596632..5b112dd95 100644
--- a/jscomp/test/dist/jscomp/test/js_weakmap_test.js
+++ b/jscomp/test/dist/jscomp/test/js_weakmap_test.js
@@ -9,10 +9,10 @@ const suites_0 = [
       const key = {};
       const weakmap = new WeakMap().set(key, "value");
       return {
-              TAG: /* Eq */0,
-              _0: true,
-              _1: weakmap.has(key)
-            };
+        TAG: /* Eq */0,
+        _0: true,
+        _1: weakmap.has(key)
+      };
     })
 ];
 
@@ -24,16 +24,16 @@ const suites_1 = {
         const weakmap = new WeakMap().set(key, "value");
         const deleted = weakmap.delete(key);
         return {
-                TAG: /* Eq */0,
-                _0: [
-                  true,
-                  false
-                ],
-                _1: [
-                  deleted,
-                  weakmap.has(key)
-                ]
-              };
+          TAG: /* Eq */0,
+          _0: [
+            true,
+            false
+          ],
+          _1: [
+            deleted,
+            weakmap.has(key)
+          ]
+        };
       })
   ],
   tl: {
@@ -44,10 +44,10 @@ const suites_1 = {
           const weakmap = new WeakMap().set(key, "value");
           const deleted = weakmap.delete({});
           return {
-                  TAG: /* Eq */0,
-                  _0: false,
-                  _1: deleted
-                };
+            TAG: /* Eq */0,
+            _0: false,
+            _1: deleted
+          };
         })
     ],
     tl: {
@@ -60,16 +60,16 @@ const suites_1 = {
             const a = weakmap.get(key_a);
             const b = weakmap.get(key_b);
             return {
-                    TAG: /* Eq */0,
-                    _0: [
-                      "value_a",
-                      undefined
-                    ],
-                    _1: [
-                      a,
-                      b
-                    ]
-                  };
+              TAG: /* Eq */0,
+              _0: [
+                "value_a",
+                undefined
+              ],
+              _1: [
+                a,
+                b
+              ]
+            };
           })
       ],
       tl: {
@@ -83,16 +83,16 @@ const suites_1 = {
               weakmap.delete(key_b);
               const has_b_after = weakmap.has(key_b);
               return {
-                      TAG: /* Eq */0,
-                      _0: [
-                        has_b_before,
-                        has_b_after
-                      ],
-                      _1: [
-                        true,
-                        false
-                      ]
-                    };
+                TAG: /* Eq */0,
+                _0: [
+                  has_b_before,
+                  has_b_after
+                ],
+                _1: [
+                  true,
+                  false
+                ]
+              };
             })
         ],
         tl: {
@@ -107,16 +107,16 @@ const suites_1 = {
                 const all_has_b = weakmap_1.has(key_b) === true && weakmap_2.has(key_b) && weakmap_3.has(key_b);
                 const all_same_ref = weakmap_1 === weakmap_2 && weakmap_2 === weakmap_3;
                 return {
-                        TAG: /* Eq */0,
-                        _0: [
-                          true,
-                          true
-                        ],
-                        _1: [
-                          all_has_b,
-                          all_same_ref
-                        ]
-                      };
+                  TAG: /* Eq */0,
+                  _0: [
+                    true,
+                    true
+                  ],
+                  _1: [
+                    all_has_b,
+                    all_same_ref
+                  ]
+                };
               })
           ],
           tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_weakset_test.js b/jscomp/test/dist/jscomp/test/js_weakset_test.js
index 777373959..17eb12eec 100644
--- a/jscomp/test/dist/jscomp/test/js_weakset_test.js
+++ b/jscomp/test/dist/jscomp/test/js_weakset_test.js
@@ -9,10 +9,10 @@ const suites_0 = [
       const value = {};
       const weakset = new WeakSet().add(value);
       return {
-              TAG: /* Eq */0,
-              _0: true,
-              _1: weakset.has(value)
-            };
+        TAG: /* Eq */0,
+        _0: true,
+        _1: weakset.has(value)
+      };
     })
 ];
 
@@ -24,16 +24,16 @@ const suites_1 = {
         const weakset = new WeakSet().add(value);
         const deleted = weakset.delete(value);
         return {
-                TAG: /* Eq */0,
-                _0: [
-                  true,
-                  false
-                ],
-                _1: [
-                  deleted,
-                  weakset.has(value)
-                ]
-              };
+          TAG: /* Eq */0,
+          _0: [
+            true,
+            false
+          ],
+          _1: [
+            deleted,
+            weakset.has(value)
+          ]
+        };
       })
   ],
   tl: {
@@ -45,10 +45,10 @@ const suites_1 = {
           const weakset = new WeakSet().add(a);
           const deleted = weakset.delete(b);
           return {
-                  TAG: /* Eq */0,
-                  _0: false,
-                  _1: deleted
-                };
+            TAG: /* Eq */0,
+            _0: false,
+            _1: deleted
+          };
         })
     ],
     tl: {
@@ -62,16 +62,16 @@ const suites_1 = {
             weakset.delete(b);
             const has_b_after = weakset.has(b);
             return {
-                    TAG: /* Eq */0,
-                    _0: [
-                      has_b_before,
-                      has_b_after
-                    ],
-                    _1: [
-                      true,
-                      false
-                    ]
-                  };
+              TAG: /* Eq */0,
+              _0: [
+                has_b_before,
+                has_b_after
+              ],
+              _1: [
+                true,
+                false
+              ]
+            };
           })
       ],
       tl: {
@@ -86,16 +86,16 @@ const suites_1 = {
               const all_has_b = weakset_1.has(b) === true && weakset_2.has(b) && weakset_3.has(b);
               const all_same_ref = weakset_1 === weakset_2 && weakset_2 === weakset_3;
               return {
-                      TAG: /* Eq */0,
-                      _0: [
-                        true,
-                        true
-                      ],
-                      _1: [
-                        all_has_b,
-                        all_same_ref
-                      ]
-                    };
+                TAG: /* Eq */0,
+                _0: [
+                  true,
+                  true
+                ],
+                _1: [
+                  all_has_b,
+                  all_same_ref
+                ]
+              };
             })
         ],
         tl: {
@@ -106,10 +106,10 @@ const suites_1 = {
                 value["k"] = 1;
                 const weakset = new WeakSet().add(value);
                 return {
-                        TAG: /* Eq */0,
-                        _0: true,
-                        _1: weakset.has(value)
-                      };
+                  TAG: /* Eq */0,
+                  _0: true,
+                  _1: weakset.has(value)
+                };
               })
           ],
           tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/jsoo_400_test.js b/jscomp/test/dist/jscomp/test/jsoo_400_test.js
index f30764e0c..15b90b79f 100644
--- a/jscomp/test/dist/jscomp/test/jsoo_400_test.js
+++ b/jscomp/test/dist/jscomp/test/jsoo_400_test.js
@@ -20,11 +20,11 @@ Mt.from_pair_suites("Jsoo_400_test", {
         "File \"jscomp/test/jsoo_400_test.ml\", line 8, characters 3-10",
         (function (param) {
             return {
-                    TAG: /* ThrowAny */7,
-                    _0: (function (param) {
-                        u(undefined);
-                      })
-                  };
+              TAG: /* ThrowAny */7,
+              _0: (function (param) {
+                  u(undefined);
+                })
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/key_word_property.js b/jscomp/test/dist/jscomp/test/key_word_property.js
index fe46c247e..6acefa75f 100644
--- a/jscomp/test/dist/jscomp/test/key_word_property.js
+++ b/jscomp/test/dist/jscomp/test/key_word_property.js
@@ -19,26 +19,26 @@ const $$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
+  };
 }
 
 const test = {
diff --git a/jscomp/test/dist/jscomp/test/key_word_property2.js b/jscomp/test/dist/jscomp/test/key_word_property2.js
index 4d43a2bdc..d22e23358 100644
--- a/jscomp/test/dist/jscomp/test/key_word_property2.js
+++ b/jscomp/test/dist/jscomp/test/key_word_property2.js
@@ -5,16 +5,16 @@ const 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
+  ];
 }
 
 const $$case = Export_keyword.$$case;
diff --git a/jscomp/test/dist/jscomp/test/key_word_property_plus_test.js b/jscomp/test/dist/jscomp/test/key_word_property_plus_test.js
index 774604aac..fbe630362 100644
--- a/jscomp/test/dist/jscomp/test/key_word_property_plus_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/large_obj_test.js b/jscomp/test/dist/jscomp/test/large_obj_test.js
index 71550b996..3b01af507 100644
--- a/jscomp/test/dist/jscomp/test/large_obj_test.js
+++ b/jscomp/test/dist/jscomp/test/large_obj_test.js
@@ -593,13 +593,13 @@ const raw_object = obj_init(undefined);
 
 if (Caml_oo_curry.js1(291536124, 1, raw_object) !== 34) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/large_obj_test.ml",
-              124,
-              10
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/large_obj_test.ml",
+          124,
+          10
+        ]
+      });
 }
 
 function raw_class_init($$class) {
@@ -918,13 +918,13 @@ const v = Curry._2(raw_class[0], undefined, 3);
 
 if (Caml_oo_curry.js1(291536121, 2, v) !== 56) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/large_obj_test.ml",
-              251,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/large_obj_test.ml",
+          251,
+          2
+        ]
+      });
 }
 
 exports.raw_object = raw_object;
diff --git a/jscomp/test/dist/jscomp/test/large_record_duplication_test.js b/jscomp/test/dist/jscomp/test/large_record_duplication_test.js
index 9fe80eb32..1dc392804 100644
--- a/jscomp/test/dist/jscomp/test/large_record_duplication_test.js
+++ b/jscomp/test/dist/jscomp/test/large_record_duplication_test.js
@@ -29,14 +29,14 @@ const Small = /* @__PURE__ */Caml_exceptions.create("Large_record_duplication_te
 function f_small(u) {
   if (u.MEL_EXN_ID === Small) {
     return {
-            MEL_EXN_ID: Small,
-            x: 2,
-            y: u.y
-          };
+      MEL_EXN_ID: Small,
+      x: 2,
+      y: u.y
+    };
   } else {
     return {
-            MEL_EXN_ID: Stdlib.Not_found
-          };
+      MEL_EXN_ID: Stdlib.Not_found
+    };
   }
 }
 
diff --git a/jscomp/test/dist/jscomp/test/lazy_test.js b/jscomp/test/dist/jscomp/test/lazy_test.js
index 2c9efaf00..7a7bffbc6 100644
--- a/jscomp/test/dist/jscomp/test/lazy_test.js
+++ b/jscomp/test/dist/jscomp/test/lazy_test.js
@@ -23,9 +23,9 @@ function lazy_test(param) {
   CamlinternalLazy.force(v);
   const g = u.contents;
   return [
-          h,
-          g
-        ];
+    h,
+    g
+  ];
 }
 
 function f(param) {
@@ -40,13 +40,13 @@ function f(param) {
     return 1;
   }
   throw new Caml_js_exceptions.MelangeError("Match_failure", {
-            MEL_EXN_ID: "Match_failure",
-            _1: [
-              "jscomp/test/lazy_test.ml",
-              9,
-              8
-            ]
-          });
+        MEL_EXN_ID: "Match_failure",
+        _1: [
+          "jscomp/test/lazy_test.ml",
+          9,
+          8
+        ]
+      });
 }
 
 const s = {
@@ -134,8 +134,8 @@ const f007 = {
   LAZY_DONE: false,
   VAL: (function () {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     })
 };
 
@@ -144,16 +144,16 @@ const f008 = {
   VAL: (function () {
       console.log("hi");
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     })
 };
 
 function a2(x) {
   return {
-          LAZY_DONE: true,
-          VAL: x
-        };
+    LAZY_DONE: true,
+    VAL: x
+  };
 }
 
 const a3 = {
@@ -185,13 +185,13 @@ Mt.from_pair_suites("Lazy_test", {
         "simple",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: lazy_test(undefined),
-                    _1: [
-                      3,
-                      32
-                    ]
-                  };
+              TAG: /* Eq */0,
+              _0: lazy_test(undefined),
+              _1: [
+                3,
+                32
+              ]
+            };
           })
       ],
       tl: {
@@ -199,10 +199,10 @@ Mt.from_pair_suites("Lazy_test", {
           "lazy_match",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: h,
-                      _1: 2
-                    };
+                TAG: /* Eq */0,
+                _0: h,
+                _1: 2
+              };
             })
         ],
         tl: {
@@ -210,10 +210,10 @@ Mt.from_pair_suites("Lazy_test", {
             "lazy_force",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: u_v.contents,
-                        _1: 2
-                      };
+                  TAG: /* Eq */0,
+                  _0: u_v.contents,
+                  _1: 2
+                };
               })
           ],
           tl: {
@@ -221,10 +221,10 @@ Mt.from_pair_suites("Lazy_test", {
               "lazy_from_fun",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: CamlinternalLazy.force(l_from_fun),
-                          _1: 3
-                        };
+                    TAG: /* Eq */0,
+                    _0: CamlinternalLazy.force(l_from_fun),
+                    _1: 3
+                  };
                 })
             ],
             tl: {
@@ -232,13 +232,13 @@ Mt.from_pair_suites("Lazy_test", {
                 "lazy_from_val",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: CamlinternalLazy.force({
-                                  LAZY_DONE: true,
-                                  VAL: 3
-                                }),
-                            _1: 3
-                          };
+                      TAG: /* Eq */0,
+                      _0: CamlinternalLazy.force({
+                            LAZY_DONE: true,
+                            VAL: 3
+                          }),
+                      _1: 3
+                    };
                   })
               ],
               tl: {
@@ -246,16 +246,16 @@ Mt.from_pair_suites("Lazy_test", {
                   "lazy_from_val2",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: CamlinternalLazy.force(CamlinternalLazy.force({
-                                        LAZY_DONE: true,
-                                        VAL: {
-                                          LAZY_DONE: true,
-                                          VAL: 3
-                                        }
-                                      })),
-                              _1: 3
-                            };
+                        TAG: /* Eq */0,
+                        _0: CamlinternalLazy.force(CamlinternalLazy.force({
+                                  LAZY_DONE: true,
+                                  VAL: {
+                                    LAZY_DONE: true,
+                                    VAL: 3
+                                  }
+                                })),
+                        _1: 3
+                      };
                     })
                 ],
                 tl: {
@@ -264,13 +264,13 @@ Mt.from_pair_suites("Lazy_test", {
                     (function (param) {
                         debugger;
                         return {
-                                TAG: /* Eq */0,
-                                _0: CamlinternalLazy.force(CamlinternalLazy.force({
-                                          LAZY_DONE: true,
-                                          VAL: forward_test
-                                        })),
-                                _1: 4
-                              };
+                          TAG: /* Eq */0,
+                          _0: CamlinternalLazy.force(CamlinternalLazy.force({
+                                    LAZY_DONE: true,
+                                    VAL: forward_test
+                                  })),
+                          _1: 4
+                        };
                       })
                   ],
                   tl: {
@@ -278,10 +278,10 @@ Mt.from_pair_suites("Lazy_test", {
                       "jscomp/test/lazy_test.ml",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: a3,
-                                  _1: a4
-                                };
+                            TAG: /* Eq */0,
+                            _0: a3,
+                            _1: a4
+                          };
                         })
                     ],
                     tl: {
@@ -289,10 +289,10 @@ Mt.from_pair_suites("Lazy_test", {
                         "jscomp/test/lazy_test.ml",
                         (function (param) {
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: a7,
-                                    _1: undefined
-                                  };
+                              TAG: /* Eq */0,
+                              _0: a7,
+                              _1: undefined
+                            };
                           })
                       ],
                       tl: {
@@ -300,10 +300,10 @@ Mt.from_pair_suites("Lazy_test", {
                           "jscomp/test/lazy_test.ml",
                           (function (param) {
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: a8,
-                                      _1: undefined
-                                    };
+                                TAG: /* Eq */0,
+                                _0: a8,
+                                _1: undefined
+                              };
                             })
                         ],
                         tl: {
@@ -311,12 +311,12 @@ Mt.from_pair_suites("Lazy_test", {
                             "File \"jscomp/test/lazy_test.ml\", line 76, characters 0-7",
                             (function (param) {
                                 return {
-                                        TAG: /* Ok */4,
-                                        _0: Stdlib__Lazy.is_val({
-                                              LAZY_DONE: true,
-                                              VAL: 3
-                                            })
-                                      };
+                                  TAG: /* Ok */4,
+                                  _0: Stdlib__Lazy.is_val({
+                                        LAZY_DONE: true,
+                                        VAL: 3
+                                      })
+                                };
                               })
                           ],
                           tl: {
@@ -324,16 +324,16 @@ Mt.from_pair_suites("Lazy_test", {
                               "File \"jscomp/test/lazy_test.ml\", line 77, characters 0-7",
                               (function (param) {
                                   return {
-                                          TAG: /* Ok */4,
-                                          _0: !Stdlib__Lazy.is_val({
-                                                LAZY_DONE: false,
-                                                VAL: (function () {
-                                                    throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                                              MEL_EXN_ID: Stdlib.Not_found
-                                                            });
-                                                  })
-                                              })
-                                        };
+                                    TAG: /* Ok */4,
+                                    _0: !Stdlib__Lazy.is_val({
+                                          LAZY_DONE: false,
+                                          VAL: (function () {
+                                              throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
+                                                    MEL_EXN_ID: Stdlib.Not_found
+                                                  });
+                                            })
+                                        })
+                                  };
                                 })
                             ],
                             tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/lexer_test.js b/jscomp/test/dist/jscomp/test/lexer_test.js
index 5a6d05859..6571d3755 100644
--- a/jscomp/test/dist/jscomp/test/lexer_test.js
+++ b/jscomp/test/dist/jscomp/test/lexer_test.js
@@ -45,8 +45,8 @@ function from_tokens(lst) {
       return match.hd;
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.End_of_file, {
-              MEL_EXN_ID: Stdlib.End_of_file
-            });
+          MEL_EXN_ID: Stdlib.End_of_file
+        });
   };
 }
 
@@ -54,43 +54,43 @@ const lexer_suites_0 = [
   "arith_token",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: get_tokens(Arith_lexer.lexeme, "x + 3 + 4 + y"),
-              _1: {
-                hd: {
-                  TAG: /* IDENT */1,
-                  _0: "x"
-                },
+        TAG: /* Eq */0,
+        _0: get_tokens(Arith_lexer.lexeme, "x + 3 + 4 + y"),
+        _1: {
+          hd: {
+            TAG: /* IDENT */1,
+            _0: "x"
+          },
+          tl: {
+            hd: /* PLUS */0,
+            tl: {
+              hd: {
+                TAG: /* NUMERAL */0,
+                _0: 3
+              },
+              tl: {
+                hd: /* PLUS */0,
                 tl: {
-                  hd: /* PLUS */0,
+                  hd: {
+                    TAG: /* NUMERAL */0,
+                    _0: 4
+                  },
                   tl: {
-                    hd: {
-                      TAG: /* NUMERAL */0,
-                      _0: 3
-                    },
+                    hd: /* PLUS */0,
                     tl: {
-                      hd: /* PLUS */0,
-                      tl: {
-                        hd: {
-                          TAG: /* NUMERAL */0,
-                          _0: 4
-                        },
-                        tl: {
-                          hd: /* PLUS */0,
-                          tl: {
-                            hd: {
-                              TAG: /* IDENT */1,
-                              _0: "y"
-                            },
-                            tl: /* [] */0
-                          }
-                        }
-                      }
+                      hd: {
+                        TAG: /* IDENT */1,
+                        _0: "y"
+                      },
+                      tl: /* [] */0
                     }
                   }
                 }
               }
-            };
+            }
+          }
+        }
+      };
     })
 ];
 
@@ -99,13 +99,13 @@ const lexer_suites_1 = {
     "simple token",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: Arith_lexer.lexeme(Stdlib__Lexing.from_string(undefined, "10")),
-                _1: {
-                  TAG: /* NUMERAL */0,
-                  _0: 10
-                }
-              };
+          TAG: /* Eq */0,
+          _0: Arith_lexer.lexeme(Stdlib__Lexing.from_string(undefined, "10")),
+          _1: {
+            TAG: /* NUMERAL */0,
+            _0: 10
+          }
+        };
       })
   ],
   tl: {
@@ -123,46 +123,43 @@ const lexer_suites_1 = {
           };
           Number_lexer.token(add, Stdlib__Lexing.from_string(undefined, "32 + 32 ( ) * / "));
           return {
-                  TAG: /* Eq */0,
-                  _0: Stdlib__List.rev(v.contents),
-                  _1: {
-                    hd: "number",
+            TAG: /* Eq */0,
+            _0: Stdlib__List.rev(v.contents),
+            _1: {
+              hd: "number",
+              tl: {
+                hd: "32",
+                tl: {
+                  hd: "new line",
+                  tl: {
+                    hd: "+",
                     tl: {
-                      hd: "32",
+                      hd: "new line",
                       tl: {
-                        hd: "new line",
+                        hd: "number",
                         tl: {
-                          hd: "+",
+                          hd: "32",
                           tl: {
                             hd: "new line",
                             tl: {
-                              hd: "number",
+                              hd: "(",
                               tl: {
-                                hd: "32",
+                                hd: "new line",
                                 tl: {
-                                  hd: "new line",
+                                  hd: ")",
                                   tl: {
-                                    hd: "(",
+                                    hd: "new line",
                                     tl: {
-                                      hd: "new line",
+                                      hd: "*",
                                       tl: {
-                                        hd: ")",
+                                        hd: "new line",
                                         tl: {
-                                          hd: "new line",
+                                          hd: "/",
                                           tl: {
-                                            hd: "*",
+                                            hd: "new line",
                                             tl: {
-                                              hd: "new line",
-                                              tl: {
-                                                hd: "/",
-                                                tl: {
-                                                  hd: "new line",
-                                                  tl: {
-                                                    hd: "eof",
-                                                    tl: /* [] */0
-                                                  }
-                                                }
-                                              }
+                                              hd: "eof",
+                                              tl: /* [] */0
                                             }
                                           }
                                         }
@@ -177,7 +174,10 @@ const lexer_suites_1 = {
                       }
                     }
                   }
-                };
+                }
+              }
+            }
+          };
         })
     ],
     tl: {
@@ -185,10 +185,10 @@ const lexer_suites_1 = {
         "simple number",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: Arith_syntax.str(Arith_parser.toplevel(Arith_lexer.lexeme, Stdlib__Lexing.from_string(undefined, "10"))),
-                    _1: "10."
-                  };
+              TAG: /* Eq */0,
+              _0: Arith_syntax.str(Arith_parser.toplevel(Arith_lexer.lexeme, Stdlib__Lexing.from_string(undefined, "10"))),
+              _1: "10."
+            };
           })
       ],
       tl: {
@@ -196,10 +196,10 @@ const lexer_suites_1 = {
           "arith",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: Arith_syntax.str(Arith_parser.toplevel(Arith_lexer.lexeme, Stdlib__Lexing.from_string(undefined, "x + 3 + 4 + y"))),
-                      _1: "x+3.+4.+y"
-                    };
+                TAG: /* Eq */0,
+                _0: Arith_syntax.str(Arith_parser.toplevel(Arith_lexer.lexeme, Stdlib__Lexing.from_string(undefined, "x + 3 + 4 + y"))),
+                _1: "x+3.+4.+y"
+              };
             })
         ],
         tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/lib_js_test.js b/jscomp/test/dist/jscomp/test/lib_js_test.js
index a328bd9a2..d8c329448 100644
--- a/jscomp/test/dist/jscomp/test/lib_js_test.js
+++ b/jscomp/test/dist/jscomp/test/lib_js_test.js
@@ -20,10 +20,10 @@ const suites_0 = [
   "anything_to_string",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: "3",
-              _1: String(3)
-            };
+        TAG: /* Eq */0,
+        _0: "3",
+        _1: String(3)
+      };
     })
 ];
 
diff --git a/jscomp/test/dist/jscomp/test/libarg_test.js b/jscomp/test/dist/jscomp/test/libarg_test.js
index 372bc9758..782f05c65 100644
--- a/jscomp/test/dist/jscomp/test/libarg_test.js
+++ b/jscomp/test/dist/jscomp/test/libarg_test.js
@@ -18,11 +18,11 @@ const accum = {
 
 function record(fmt) {
   return Stdlib__Printf.ksprintf((function (s) {
-                accum.contents = {
-                  hd: s,
-                  tl: accum.contents
-                };
-              }), fmt);
+          accum.contents = {
+            hd: s,
+            tl: accum.contents
+          };
+        }), fmt);
 }
 
 function f_unit(param) {
diff --git a/jscomp/test/dist/jscomp/test/libqueue_test.js b/jscomp/test/dist/jscomp/test/libqueue_test.js
index b8c4b6ed8..e3f6dab4e 100644
--- a/jscomp/test/dist/jscomp/test/libqueue_test.js
+++ b/jscomp/test/dist/jscomp/test/libqueue_test.js
@@ -9,11 +9,11 @@ const Stdlib__Queue = require("melange/queue.js");
 
 function to_list(q) {
   return Stdlib__List.rev(Stdlib__Queue.fold((function (l, x) {
-                    return {
-                            hd: x,
-                            tl: l
-                          };
-                  }), /* [] */0, q));
+              return {
+                hd: x,
+                tl: l
+              };
+            }), /* [] */0, q));
 }
 
 const Q = {
@@ -63,13 +63,13 @@ const q = {
 
 if (!(Caml_obj.caml_equal(to_list(q), /* [] */0) && q.length === 0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              28,
-              25
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          28,
+          25
+        ]
+      });
 }
 
 Stdlib__Queue.add(1, q);
@@ -79,13 +79,13 @@ if (!(Caml_obj.caml_equal(to_list(q), {
           tl: /* [] */0
         }) && q.length === 1)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              29,
-              25
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          29,
+          25
+        ]
+      });
 }
 
 Stdlib__Queue.add(2, q);
@@ -98,13 +98,13 @@ if (!(Caml_obj.caml_equal(to_list(q), {
           }
         }) && q.length === 2)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              30,
-              25
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          30,
+          25
+        ]
+      });
 }
 
 Stdlib__Queue.add(3, q);
@@ -120,13 +120,13 @@ if (!(Caml_obj.caml_equal(to_list(q), {
           }
         }) && q.length === 3)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              31,
-              25
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          31,
+          25
+        ]
+      });
 }
 
 Stdlib__Queue.add(4, q);
@@ -145,24 +145,24 @@ if (!(Caml_obj.caml_equal(to_list(q), {
           }
         }) && q.length === 4)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              32,
-              25
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          32,
+          25
+        ]
+      });
 }
 
 if (Stdlib__Queue.take(q) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              33,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          33,
+          2
+        ]
+      });
 }
 
 if (!(Caml_obj.caml_equal(to_list(q), {
@@ -176,24 +176,24 @@ if (!(Caml_obj.caml_equal(to_list(q), {
           }
         }) && q.length === 3)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              33,
-              25
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          33,
+          25
+        ]
+      });
 }
 
 if (Stdlib__Queue.take(q) !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              34,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          34,
+          2
+        ]
+      });
 }
 
 if (!(Caml_obj.caml_equal(to_list(q), {
@@ -204,24 +204,24 @@ if (!(Caml_obj.caml_equal(to_list(q), {
           }
         }) && q.length === 2)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              34,
-              25
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          34,
+          25
+        ]
+      });
 }
 
 if (Stdlib__Queue.take(q) !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              35,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          35,
+          2
+        ]
+      });
 }
 
 if (!(Caml_obj.caml_equal(to_list(q), {
@@ -229,46 +229,46 @@ if (!(Caml_obj.caml_equal(to_list(q), {
           tl: /* [] */0
         }) && q.length === 1)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              35,
-              25
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          35,
+          25
+        ]
+      });
 }
 
 if (Stdlib__Queue.take(q) !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              36,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          36,
+          2
+        ]
+      });
 }
 
 if (!(Caml_obj.caml_equal(to_list(q), /* [] */0) && q.length === 0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              36,
-              25
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          36,
+          25
+        ]
+      });
 }
 
 if (!does_raise(Stdlib__Queue.take, q)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              37,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          37,
+          2
+        ]
+      });
 }
 
 const q$1 = {
@@ -281,59 +281,59 @@ Stdlib__Queue.add(1, q$1);
 
 if (Stdlib__Queue.take(q$1) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              42,
-              13
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          42,
+          13
+        ]
+      });
 }
 
 if (!does_raise(Stdlib__Queue.take, q$1)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              42,
-              36
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          42,
+          36
+        ]
+      });
 }
 
 Stdlib__Queue.add(2, q$1);
 
 if (Stdlib__Queue.take(q$1) !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              43,
-              13
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          43,
+          13
+        ]
+      });
 }
 
 if (!does_raise(Stdlib__Queue.take, q$1)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              43,
-              36
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          43,
+          36
+        ]
+      });
 }
 
 if (q$1.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              44,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          44,
+          2
+        ]
+      });
 }
 
 const q$2 = {
@@ -346,127 +346,127 @@ Stdlib__Queue.add(1, q$2);
 
 if (Stdlib__Queue.peek(q$2) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              49,
-              13
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          49,
+          13
+        ]
+      });
 }
 
 Stdlib__Queue.add(2, q$2);
 
 if (Stdlib__Queue.peek(q$2) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              50,
-              13
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          50,
+          13
+        ]
+      });
 }
 
 Stdlib__Queue.add(3, q$2);
 
 if (Stdlib__Queue.peek(q$2) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              51,
-              13
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          51,
+          13
+        ]
+      });
 }
 
 if (Stdlib__Queue.peek(q$2) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              52,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          52,
+          2
+        ]
+      });
 }
 
 if (Stdlib__Queue.take(q$2) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              52,
-              25
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          52,
+          25
+        ]
+      });
 }
 
 if (Stdlib__Queue.peek(q$2) !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              53,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          53,
+          2
+        ]
+      });
 }
 
 if (Stdlib__Queue.take(q$2) !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              53,
-              25
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          53,
+          25
+        ]
+      });
 }
 
 if (Stdlib__Queue.peek(q$2) !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              54,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          54,
+          2
+        ]
+      });
 }
 
 if (Stdlib__Queue.take(q$2) !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              54,
-              25
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          54,
+          25
+        ]
+      });
 }
 
 if (!does_raise(Stdlib__Queue.peek, q$2)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              55,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          55,
+          2
+        ]
+      });
 }
 
 if (!does_raise(Stdlib__Queue.peek, q$2)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              56,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          56,
+          2
+        ]
+      });
 }
 
 const q$3 = {
@@ -483,24 +483,24 @@ Stdlib__Queue.clear(q$3);
 
 if (q$3.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              63,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          63,
+          2
+        ]
+      });
 }
 
 if (!does_raise(Stdlib__Queue.take, q$3)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              64,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          64,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(q$3, {
@@ -509,26 +509,26 @@ if (!Caml_obj.caml_equal(q$3, {
         last: /* Nil */0
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              65,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          65,
+          2
+        ]
+      });
 }
 
 Stdlib__Queue.add(42, q$3);
 
 if (Stdlib__Queue.take(q$3) !== 42) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              67,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          67,
+          2
+        ]
+      });
 }
 
 const q1 = {
@@ -575,13 +575,13 @@ if (!Caml_obj.caml_equal(to_list(q1), {
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              74,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          74,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q2), {
@@ -616,47 +616,47 @@ if (!Caml_obj.caml_equal(to_list(q2), {
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              75,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          75,
+          2
+        ]
+      });
 }
 
 if (q1.length !== 10) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              76,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          76,
+          2
+        ]
+      });
 }
 
 if (q2.length !== 10) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              77,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          77,
+          2
+        ]
+      });
 }
 
 for (let i$2 = 1; i$2 <= 10; ++i$2) {
   if (Stdlib__Queue.take(q1) !== i$2) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/libqueue_test.ml",
-                79,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/libqueue_test.ml",
+            79,
+            4
+          ]
+        });
   }
   
 }
@@ -664,13 +664,13 @@ for (let i$2 = 1; i$2 <= 10; ++i$2) {
 for (let i$3 = 1; i$3 <= 10; ++i$3) {
   if (Stdlib__Queue.take(q2) !== i$3) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/libqueue_test.ml",
-                82,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/libqueue_test.ml",
+            82,
+            4
+          ]
+        });
   }
   
 }
@@ -683,36 +683,36 @@ const q$4 = {
 
 if (q$4.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              88,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          88,
+          2
+        ]
+      });
 }
 
 for (let i$4 = 1; i$4 <= 10; ++i$4) {
   Stdlib__Queue.add(i$4, q$4);
   if (q$4.length !== i$4) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/libqueue_test.ml",
-                91,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/libqueue_test.ml",
+            91,
+            4
+          ]
+        });
   }
   if (q$4.length === 0) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/libqueue_test.ml",
-                92,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/libqueue_test.ml",
+            92,
+            4
+          ]
+        });
   }
   
 }
@@ -720,47 +720,47 @@ for (let i$4 = 1; i$4 <= 10; ++i$4) {
 for (let i$5 = 10; i$5 >= 1; --i$5) {
   if (q$4.length !== i$5) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/libqueue_test.ml",
-                95,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/libqueue_test.ml",
+            95,
+            4
+          ]
+        });
   }
   if (q$4.length === 0) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/libqueue_test.ml",
-                96,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/libqueue_test.ml",
+            96,
+            4
+          ]
+        });
   }
   Stdlib__Queue.take(q$4);
 }
 
 if (q$4.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              99,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          99,
+          2
+        ]
+      });
 }
 
 if (q$4.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              100,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          100,
+          2
+        ]
+      });
 }
 
 const q$5 = {
@@ -780,13 +780,13 @@ const i$7 = {
 Stdlib__Queue.iter((function (j) {
         if (i$7.contents !== j) {
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/libqueue_test.ml",
-                      107,
-                      19
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/libqueue_test.ml",
+                  107,
+                  19
+                ]
+              });
         }
         i$7.contents = i$7.contents + 1 | 0;
       }), q$5);
@@ -805,92 +805,92 @@ const q2$1 = {
 
 if (q1$1.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              112,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          112,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q1$1), /* [] */0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              112,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          112,
+          28
+        ]
+      });
 }
 
 if (q2$1.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              113,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          113,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q2$1), /* [] */0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              113,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          113,
+          28
+        ]
+      });
 }
 
 Stdlib__Queue.transfer(q1$1, q2$1);
 
 if (q1$1.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              115,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          115,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q1$1), /* [] */0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              115,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          115,
+          28
+        ]
+      });
 }
 
 if (q2$1.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              116,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          116,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q2$1), /* [] */0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              116,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          116,
+          28
+        ]
+      });
 }
 
 const q1$2 = {
@@ -911,13 +911,13 @@ for (let i$8 = 1; i$8 <= 4; ++i$8) {
 
 if (q1$2.length !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              122,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          122,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q1$2), {
@@ -934,70 +934,70 @@ if (!Caml_obj.caml_equal(to_list(q1$2), {
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              122,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          122,
+          28
+        ]
+      });
 }
 
 if (q2$2.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              123,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          123,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q2$2), /* [] */0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              123,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          123,
+          28
+        ]
+      });
 }
 
 Stdlib__Queue.transfer(q1$2, q2$2);
 
 if (q1$2.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              125,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          125,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q1$2), /* [] */0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              125,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          125,
+          28
+        ]
+      });
 }
 
 if (q2$2.length !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              126,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          126,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q2$2), {
@@ -1014,13 +1014,13 @@ if (!Caml_obj.caml_equal(to_list(q2$2), {
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              126,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          126,
+          28
+        ]
+      });
 }
 
 const q1$3 = {
@@ -1041,35 +1041,35 @@ for (let i$9 = 5; i$9 <= 8; ++i$9) {
 
 if (q1$3.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              132,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          132,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q1$3), /* [] */0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              132,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          132,
+          28
+        ]
+      });
 }
 
 if (q2$3.length !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              133,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          133,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q2$3), {
@@ -1086,48 +1086,48 @@ if (!Caml_obj.caml_equal(to_list(q2$3), {
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              133,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          133,
+          28
+        ]
+      });
 }
 
 Stdlib__Queue.transfer(q1$3, q2$3);
 
 if (q1$3.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              135,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          135,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q1$3), /* [] */0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              135,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          135,
+          28
+        ]
+      });
 }
 
 if (q2$3.length !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              136,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          136,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q2$3), {
@@ -1144,13 +1144,13 @@ if (!Caml_obj.caml_equal(to_list(q2$3), {
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              136,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          136,
+          28
+        ]
+      });
 }
 
 const q1$4 = {
@@ -1175,13 +1175,13 @@ for (let i$11 = 5; i$11 <= 8; ++i$11) {
 
 if (q1$4.length !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              143,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          143,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q1$4), {
@@ -1198,24 +1198,24 @@ if (!Caml_obj.caml_equal(to_list(q1$4), {
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              143,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          143,
+          28
+        ]
+      });
 }
 
 if (q2$4.length !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              144,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          144,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q2$4), {
@@ -1232,48 +1232,48 @@ if (!Caml_obj.caml_equal(to_list(q2$4), {
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              144,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          144,
+          28
+        ]
+      });
 }
 
 Stdlib__Queue.transfer(q1$4, q2$4);
 
 if (q1$4.length !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              146,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          146,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q1$4), /* [] */0)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              146,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          146,
+          28
+        ]
+      });
 }
 
 if (q2$4.length !== 8) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              147,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          147,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(to_list(q2$4), {
@@ -1302,13 +1302,13 @@ if (!Caml_obj.caml_equal(to_list(q2$4), {
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/libqueue_test.ml",
-              147,
-              28
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/libqueue_test.ml",
+          147,
+          28
+        ]
+      });
 }
 
 console.log("OK");
diff --git a/jscomp/test/dist/jscomp/test/limits_test.js b/jscomp/test/dist/jscomp/test/limits_test.js
index 67fb05710..915c3c017 100644
--- a/jscomp/test/dist/jscomp/test/limits_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/list_test.js b/jscomp/test/dist/jscomp/test/list_test.js
index ae2a639ca..f7630341b 100644
--- a/jscomp/test/dist/jscomp/test/list_test.js
+++ b/jscomp/test/dist/jscomp/test/list_test.js
@@ -10,19 +10,19 @@ const list_suites_0 = [
   "length",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: 1,
-              _1: Stdlib__List.length({
-                    hd: [
-                      0,
-                      1,
-                      2,
-                      3,
-                      4
-                    ],
-                    tl: /* [] */0
-                  })
-            };
+        TAG: /* Eq */0,
+        _0: 1,
+        _1: Stdlib__List.length({
+              hd: [
+                0,
+                1,
+                2,
+                3,
+                4
+              ],
+              tl: /* [] */0
+            })
+      };
     })
 ];
 
@@ -31,25 +31,25 @@ const list_suites_1 = {
     "length2",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: 5,
-                _1: Stdlib__List.length({
-                      hd: 0,
+          TAG: /* Eq */0,
+          _0: 5,
+          _1: Stdlib__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 @@ const list_suites_1 = {
       "long_length",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: 30000,
-                  _1: Stdlib__List.length(Stdlib__Array.to_list(Stdlib__Array.init(30000, (function (param) {
-                                  return 0;
-                                }))))
-                };
+            TAG: /* Eq */0,
+            _0: 30000,
+            _1: Stdlib__List.length(Stdlib__Array.to_list(Stdlib__Array.init(30000, (function (param) {
+                            return 0;
+                          }))))
+          };
         })
     ],
     tl: {
@@ -70,34 +70,34 @@ const list_suites_1 = {
         "sort",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: Stdlib__List.sort(Caml.caml_int_compare, {
-                          hd: 4,
-                          tl: {
-                            hd: 1,
-                            tl: {
-                              hd: 2,
-                              tl: {
-                                hd: 3,
-                                tl: /* [] */0
-                              }
-                            }
-                          }
-                        }),
-                    _1: {
+              TAG: /* Eq */0,
+              _0: Stdlib__List.sort(Caml.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: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/loop_regression_test.js b/jscomp/test/dist/jscomp/test/loop_regression_test.js
index 05067ee2a..eb675e435 100644
--- a/jscomp/test/dist/jscomp/test/loop_regression_test.js
+++ b/jscomp/test/dist/jscomp/test/loop_regression_test.js
@@ -25,10 +25,10 @@ const suites_0 = [
   "sum",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: 55,
-              _1: f(undefined)
-            };
+        TAG: /* Eq */0,
+        _0: 55,
+        _1: f(undefined)
+      };
     })
 ];
 
diff --git a/jscomp/test/dist/jscomp/test/map_find_test.js b/jscomp/test/dist/jscomp/test/map_find_test.js
index 6e5de5e2f..23c5086b1 100644
--- a/jscomp/test/dist/jscomp/test/map_find_test.js
+++ b/jscomp/test/dist/jscomp/test/map_find_test.js
@@ -26,13 +26,13 @@ function create(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -43,9 +43,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -58,25 +58,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -89,21 +89,21 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -115,13 +115,13 @@ function add(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -145,8 +145,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg.compare, x, param.v);
     if (c === 0) {
@@ -203,13 +203,13 @@ function create$1(l, x, d, r) {
   const hl = height$1(l);
   const hr = height$1(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$1(l, x, d, r) {
@@ -220,9 +220,9 @@ function bal$1(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -235,25 +235,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -266,21 +266,21 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add$1(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -292,13 +292,13 @@ function add$1(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -322,8 +322,8 @@ function find$1(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg$1.compare, x, param.v);
     if (c === 0) {
@@ -367,10 +367,10 @@ Mt.from_pair_suites("Map_find_test", {
         "int",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: Curry._2(find, 10, m),
-                    _1: /* 'a' */97
-                  };
+              TAG: /* Eq */0,
+              _0: Curry._2(find, 10, m),
+              _1: /* 'a' */97
+            };
           })
       ],
       tl: {
@@ -378,10 +378,10 @@ Mt.from_pair_suites("Map_find_test", {
           "string",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: Curry._2(find$1, "10", s),
-                      _1: /* 'a' */97
-                    };
+                TAG: /* Eq */0,
+                _0: Curry._2(find$1, "10", s),
+                _1: /* 'a' */97
+              };
             })
         ],
         tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/map_test.js b/jscomp/test/dist/jscomp/test/map_test.js
index 94eb29a50..dd4fdc819 100644
--- a/jscomp/test/dist/jscomp/test/map_test.js
+++ b/jscomp/test/dist/jscomp/test/map_test.js
@@ -27,13 +27,13 @@ function create(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -44,9 +44,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -59,25 +59,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -90,21 +90,21 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -116,13 +116,13 @@ function add(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -228,8 +228,8 @@ function cardinal(param) {
 
 function of_list(bs) {
   return Stdlib__List.fold_left((function (m, param) {
-                return add(param[0], param[1], m);
-              }), /* Empty */0, bs);
+          return add(param[0], param[1], m);
+        }), /* Empty */0, bs);
 }
 
 const funarg = {
@@ -248,13 +248,13 @@ function create$1(l, x, d, r) {
   const hl = height$1(l);
   const hr = height$1(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$1(l, x, d, r) {
@@ -265,9 +265,9 @@ function bal$1(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -280,25 +280,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -311,21 +311,21 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add$1(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -337,13 +337,13 @@ function add$1(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -367,8 +367,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg.compare, x, param.v);
     if (c === 0) {
@@ -402,10 +402,10 @@ const int_map_suites_0 = [
             }
           });
       return {
-              TAG: /* Eq */0,
-              _0: Curry._1(cardinal, v),
-              _1: 3
-            };
+        TAG: /* Eq */0,
+        _0: Curry._1(cardinal, v),
+        _1: 3
+      };
     })
 ];
 
@@ -452,10 +452,10 @@ const int_map_suites_1 = {
               }
             });
         return {
-                TAG: /* Eq */0,
-                _0: Curry._3(compare$1, Caml.caml_int_compare, u, v),
-                _1: 0
-              };
+          TAG: /* Eq */0,
+          _0: Curry._3(compare$1, Caml.caml_int_compare, u, v),
+          _1: 0
+        };
       })
   ],
   tl: {
@@ -501,12 +501,12 @@ const int_map_suites_1 = {
                 }
               });
           return {
-                  TAG: /* Eq */0,
-                  _0: true,
-                  _1: Curry._3(equal, (function (x, y) {
-                          return x === y;
-                        }), u, v)
-                };
+            TAG: /* Eq */0,
+            _0: true,
+            _1: Curry._3(equal, (function (x, y) {
+                    return x === y;
+                  }), u, v)
+          };
         })
     ],
     tl: {
@@ -525,10 +525,10 @@ const int_map_suites_1 = {
               
             }
             return {
-                    TAG: /* Eq */0,
-                    _0: v,
-                    _1: -1
-                  };
+              TAG: /* Eq */0,
+              _0: v,
+              _1: -1
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/mario_game.js b/jscomp/test/dist/jscomp/test/mario_game.js
index 6377d6f8a..b187f0bac 100644
--- a/jscomp/test/dist/jscomp/test/mario_game.js
+++ b/jscomp/test/dist/jscomp/test/mario_game.js
@@ -32,15 +32,15 @@ function setup_sprite(loopOpt, bbox_offsetOpt, bbox_sizeOpt, img_src, max_frames
       ]) ? frame_size : bbox_size;
   const 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) {
@@ -48,106 +48,106 @@ function make_enemy(param) {
   switch (param[0]) {
     case /* Goomba */0 :
         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 */1 :
         if (dir === /* Left */0) {
           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 */2 :
         if (dir === /* Left */0) {
           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 */3 :
         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 */4 :
         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
+            ]);
     
   }
 }
@@ -156,92 +156,92 @@ function make_particle(param) {
   switch (param) {
     case /* GoombaSquish */0 :
         return setup_sprite(undefined, undefined, undefined, "enemies.png", 1, 0, [
-                    16,
-                    16
-                  ], [
-                    0,
-                    144
-                  ]);
+              16,
+              16
+            ], [
+              0,
+              144
+            ]);
     case /* BrickChunkL */1 :
         return setup_sprite(undefined, undefined, undefined, "chunks.png", 1, 0, [
-                    8,
-                    8
-                  ], [
-                    0,
-                    0
-                  ]);
+              8,
+              8
+            ], [
+              0,
+              0
+            ]);
     case /* BrickChunkR */2 :
         return setup_sprite(undefined, undefined, undefined, "chunks.png", 1, 0, [
-                    8,
-                    8
-                  ], [
-                    8,
-                    0
-                  ]);
+              8,
+              8
+            ], [
+              8,
+              0
+            ]);
     case /* Score100 */3 :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    12,
-                    8
-                  ], [
-                    0,
-                    0
-                  ]);
+              12,
+              8
+            ], [
+              0,
+              0
+            ]);
     case /* Score200 */4 :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    12,
-                    9
-                  ], [
-                    0,
-                    9
-                  ]);
+              12,
+              9
+            ], [
+              0,
+              9
+            ]);
     case /* Score400 */5 :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    12,
-                    9
-                  ], [
-                    0,
-                    18
-                  ]);
+              12,
+              9
+            ], [
+              0,
+              18
+            ]);
     case /* Score800 */6 :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    12,
-                    9
-                  ], [
-                    0,
-                    27
-                  ]);
+              12,
+              9
+            ], [
+              0,
+              27
+            ]);
     case /* Score1000 */7 :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    14,
-                    9
-                  ], [
-                    13,
-                    0
-                  ]);
+              14,
+              9
+            ], [
+              13,
+              0
+            ]);
     case /* Score2000 */8 :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    14,
-                    9
-                  ], [
-                    13,
-                    9
-                  ]);
+              14,
+              9
+            ], [
+              13,
+              9
+            ]);
     case /* Score4000 */9 :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    14,
-                    9
-                  ], [
-                    13,
-                    18
-                  ]);
+              14,
+              9
+            ], [
+              13,
+              18
+            ]);
     case /* Score8000 */10 :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    14,
-                    9
-                  ], [
-                    13,
-                    27
-                  ]);
+              14,
+              9
+            ], [
+              13,
+              27
+            ]);
     
   }
 }
@@ -260,120 +260,120 @@ function make_type(typ, dir) {
             switch (typ$1) {
               case /* Standing */0 :
                   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 */1 :
                   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 */2 :
                   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 */3 :
                   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 */0 :
                   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 */1 :
                   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 */2 :
                   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 */3 :
                   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
+                      ]);
               
             }
           }
@@ -383,238 +383,238 @@ function make_type(typ, dir) {
             switch (typ$2) {
               case /* Standing */0 :
                   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 */1 :
                   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 */2 :
                   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 */3 :
                   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 */0 :
                   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 */1 :
                   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 */2 :
                   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 */3 :
                   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 */1 :
         return make_enemy([
-                    typ._0,
-                    dir
-                  ]);
+              typ._0,
+              dir
+            ]);
     case /* SItem */2 :
         let param = typ._0;
         switch (param) {
           case /* Mushroom */0 :
               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 */1 :
               return setup_sprite(undefined, undefined, undefined, "items.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          188
-                        ]);
+                    16,
+                    16
+                  ], [
+                    0,
+                    188
+                  ]);
           case /* Star */2 :
               return setup_sprite(undefined, undefined, undefined, "items.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          16,
-                          48
-                        ]);
+                    16,
+                    16
+                  ], [
+                    16,
+                    48
+                  ]);
           case /* Coin */3 :
               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 */3 :
         let param$1 = typ._0;
         if (!/* tag */(typeof param$1 === "number" || typeof param$1 === "string")) {
           return setup_sprite(undefined, undefined, undefined, "blocks.png", 4, 15, [
-                      16,
-                      16
-                    ], [
-                      0,
-                      16
-                    ]);
+                16,
+                16
+              ], [
+                0,
+                16
+              ]);
         }
         switch (param$1) {
           case /* QBlockUsed */0 :
               return setup_sprite(undefined, undefined, undefined, "blocks.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          32
-                        ]);
+                    16,
+                    16
+                  ], [
+                    0,
+                    32
+                  ]);
           case /* Brick */1 :
               return setup_sprite(undefined, undefined, undefined, "blocks.png", 5, 10, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          0
-                        ]);
+                    16,
+                    16
+                  ], [
+                    0,
+                    0
+                  ]);
           case /* UnBBlock */2 :
               return setup_sprite(undefined, undefined, undefined, "blocks.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          48
-                        ]);
+                    16,
+                    16
+                  ], [
+                    0,
+                    48
+                  ]);
           case /* Cloud */3 :
               return setup_sprite(undefined, undefined, undefined, "blocks.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          64
-                        ]);
+                    16,
+                    16
+                  ], [
+                    0,
+                    64
+                  ]);
           case /* Panel */4 :
               return setup_sprite(undefined, undefined, undefined, "panel.png", 3, 15, [
-                          26,
-                          26
-                        ], [
-                          0,
-                          0
-                        ]);
+                    26,
+                    26
+                  ], [
+                    0,
+                    0
+                  ]);
           case /* Ground */5 :
               return setup_sprite(undefined, undefined, undefined, "ground.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          32
-                        ]);
+                    16,
+                    16
+                  ], [
+                    0,
+                    32
+                  ]);
           
         }
     
@@ -625,16 +625,16 @@ function make_from_params(params, context) {
   const 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) {
@@ -696,9 +696,9 @@ const 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) {
@@ -706,16 +706,16 @@ function make_type$1(typ, ctx) {
     case /* BrickChunkL */1 :
     case /* BrickChunkR */2 :
         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
+      };
   }
 }
 
@@ -733,14 +733,14 @@ function make$1(velOpt, accOpt, part_type, pos, ctx) {
   const vel$1 = pair_to_xy(vel);
   const 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) {
@@ -764,9 +764,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) {
@@ -798,9 +798,9 @@ function setup_obj(has_gravityOpt, speedOpt, param) {
   const has_gravity = has_gravityOpt !== undefined ? has_gravityOpt : true;
   const speed = speedOpt !== undefined ? speedOpt : 1;
   return {
-          has_gravity: has_gravity,
-          speed: speed
-        };
+    has_gravity: has_gravity,
+    speed: speed
+  };
 }
 
 function set_vel_to_speed(obj) {
@@ -871,9 +871,9 @@ function make$2(idOpt, dirOpt, spawnable, context, param) {
     score: 0
   };
   return [
-          spr,
-          obj
-        ];
+    spr,
+    obj
+  ];
 }
 
 function spawn(spawnable, context, param) {
@@ -886,33 +886,33 @@ function spawn(spawnable, context, param) {
   switch (spawnable.TAG) {
     case /* SPlayer */0 :
         return {
-                TAG: /* Player */0,
-                _0: spawnable._0,
-                _1: spr,
-                _2: obj
-              };
+          TAG: /* Player */0,
+          _0: spawnable._0,
+          _1: spr,
+          _2: obj
+        };
     case /* SEnemy */1 :
         set_vel_to_speed(obj);
         return {
-                TAG: /* Enemy */1,
-                _0: spawnable._0,
-                _1: spr,
-                _2: obj
-              };
+          TAG: /* Enemy */1,
+          _0: spawnable._0,
+          _1: spr,
+          _2: obj
+        };
     case /* SItem */2 :
         return {
-                TAG: /* Item */2,
-                _0: spawnable._0,
-                _1: spr,
-                _2: obj
-              };
+          TAG: /* Item */2,
+          _0: spawnable._0,
+          _1: spr,
+          _2: obj
+        };
     case /* SBlock */3 :
         return {
-                TAG: /* Block */3,
-                _0: spawnable._0,
-                _1: spr,
-                _2: obj
-              };
+          TAG: /* Block */3,
+          _0: spawnable._0,
+          _1: spr,
+          _2: obj
+        };
     
   }
 }
@@ -1006,49 +1006,49 @@ function update_player(player, keys, context) {
   const pl_typ = player.health <= 1 ? /* SmallM */1 : /* BigM */0;
   if (!prev_jumping && player.jumping) {
     return [
-            pl_typ,
-            make({
-                  TAG: /* SPlayer */0,
-                  _0: pl_typ,
-                  _1: /* Jumping */1
-                }, player.dir, context)
-          ];
+      pl_typ,
+      make({
+            TAG: /* SPlayer */0,
+            _0: pl_typ,
+            _1: /* Jumping */1
+          }, 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,
-                  _0: pl_typ,
-                  _1: /* Running */2
-                }, player.dir, context)
-          ];
+      pl_typ,
+      make({
+            TAG: /* SPlayer */0,
+            _0: pl_typ,
+            _1: /* Running */2
+          }, player.dir, context)
+    ];
   } else if (prev_dir !== player.dir && player.jumping && prev_jumping) {
     return [
-            pl_typ,
-            make({
-                  TAG: /* SPlayer */0,
-                  _0: pl_typ,
-                  _1: /* Jumping */1
-                }, player.dir, context)
-          ];
+      pl_typ,
+      make({
+            TAG: /* SPlayer */0,
+            _0: pl_typ,
+            _1: /* Jumping */1
+          }, player.dir, context)
+    ];
   } else if (player.vel.y === 0 && player.crouch) {
     return [
-            pl_typ,
-            make({
-                  TAG: /* SPlayer */0,
-                  _0: pl_typ,
-                  _1: /* Crouching */3
-                }, player.dir, context)
-          ];
+      pl_typ,
+      make({
+            TAG: /* SPlayer */0,
+            _0: pl_typ,
+            _1: /* Crouching */3
+          }, player.dir, context)
+    ];
   } else if (player.vel.y === 0 && player.vel.x === 0) {
     return [
-            pl_typ,
-            make({
-                  TAG: /* SPlayer */0,
-                  _0: pl_typ,
-                  _1: /* Standing */0
-                }, player.dir, context)
-          ];
+      pl_typ,
+      make({
+            TAG: /* SPlayer */0,
+            _0: pl_typ,
+            _1: /* Standing */0
+          }, player.dir, context)
+    ];
   } else {
     return ;
   }
@@ -1146,11 +1146,11 @@ function evolve_enemy(player_dir, typ, spr, obj, context) {
         const new_spr = match[0];
         normalize_pos(new_obj.pos, spr.params, new_spr.params);
         return {
-                TAG: /* Enemy */1,
-                _0: /* GKoopaShell */3,
-                _1: new_spr,
-                _2: new_obj
-              };
+          TAG: /* Enemy */1,
+          _0: /* GKoopaShell */3,
+          _1: new_spr,
+          _2: new_obj
+        };
     case /* RKoopa */2 :
         const match$1 = make$2(undefined, obj.dir, {
               TAG: /* SEnemy */1,
@@ -1163,11 +1163,11 @@ function evolve_enemy(player_dir, typ, spr, obj, context) {
         const new_spr$1 = match$1[0];
         normalize_pos(new_obj$1.pos, spr.params, new_spr$1.params);
         return {
-                TAG: /* Enemy */1,
-                _0: /* RKoopaShell */4,
-                _1: new_spr$1,
-                _2: new_obj$1
-              };
+          TAG: /* Enemy */1,
+          _0: /* RKoopaShell */4,
+          _1: new_spr$1,
+          _2: new_obj$1
+        };
     case /* GKoopaShell */3 :
     case /* RKoopaShell */4 :
         break;
@@ -1211,11 +1211,11 @@ function evolve_block(obj, context) {
         obj.pos.y
       ]);
   return {
-          TAG: /* Block */3,
-          _0: /* QBlockUsed */0,
-          _1: match[0],
-          _2: match[1]
-        };
+    TAG: /* Block */3,
+    _0: /* QBlockUsed */0,
+    _1: match[0],
+    _2: match[1]
+  };
 }
 
 function spawn_above(player_dir, obj, typ, context) {
@@ -1243,15 +1243,15 @@ function get_aabb(obj) {
   const sy = match$1[1];
   const 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) {
@@ -1336,25 +1336,25 @@ function kill(collid, ctx) {
           pos_1
         ];
         const score = o.score > 0 ? ({
-              hd: make_score(o.score, pos, ctx),
-              tl: /* [] */0
-            }) : /* [] */0;
+            hd: make_score(o.score, pos, ctx),
+            tl: /* [] */0
+          }) : /* [] */0;
         let remains;
         remains = collid._0 === /* Goomba */0 ? ({
-              hd: make$1(undefined, undefined, /* GoombaSquish */0, pos, ctx),
-              tl: /* [] */0
-            }) : /* [] */0;
+            hd: make$1(undefined, undefined, /* GoombaSquish */0, pos, ctx),
+            tl: /* [] */0
+          }) : /* [] */0;
         return Stdlib.$at(score, remains);
     case /* Item */2 :
         const o$1 = collid._2;
         if (collid._0 === /* Mushroom */0) {
           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;
         }
@@ -1402,18 +1402,18 @@ function kill(collid, ctx) {
               0.2
             ], /* BrickChunkR */2, 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
+              }
+            }
+          }
+        };
     
   }
 }
@@ -1466,9 +1466,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) {
@@ -1501,9 +1501,9 @@ function game_win(ctx) {
   ctx.font = "20px 'Press Start 2P'";
   ctx.fillText("You win!", 180, 128);
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: "Game over."
-          });
+        MEL_EXN_ID: "Failure",
+        _1: "Game over."
+      });
 }
 
 function game_loss(ctx) {
@@ -1514,9 +1514,9 @@ function game_loss(ctx) {
   ctx.font = "20px 'Press Start 2P'";
   ctx.fillText("GAME OVER. You lose!", 60, 128);
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: "Game over."
-          });
+        MEL_EXN_ID: "Failure",
+        _1: "Game over."
+      });
 }
 
 const Draw = {
@@ -1532,19 +1532,19 @@ const 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) {
@@ -1573,9 +1573,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) {
@@ -1586,10 +1586,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
+  };
 }
 
 const Viewport = {
@@ -1653,9 +1653,9 @@ function process_collision(dir, c1, c2, state) {
         switch (c2.TAG) {
           case /* Player */0 :
               return [
-                      undefined,
-                      undefined
-                    ];
+                undefined,
+                undefined
+              ];
           case /* Enemy */1 :
               const typ$1 = c2._0;
               if (dir === /* South */1) {
@@ -1691,37 +1691,37 @@ function process_collision(dir, c1, c2, state) {
                           collide_block(undefined, dir, o1$3);
                           dec_health(o2$3);
                           return [
-                                  undefined,
-                                  undefined
-                                ];
+                            undefined,
+                            undefined
+                          ];
                         } else {
                           collide_block(undefined, dir, o1$3);
                           return [
-                                  undefined,
-                                  undefined
-                                ];
+                            undefined,
+                            undefined
+                          ];
                         }
                     case /* Panel */4 :
                         game_win(state.ctx);
                         return [
-                                undefined,
-                                undefined
-                              ];
+                          undefined,
+                          undefined
+                        ];
                     default:
                       collide_block(undefined, dir, o1$3);
                       return [
-                              undefined,
-                              undefined
-                            ];
+                        undefined,
+                        undefined
+                      ];
                   }
                 } else {
                   const updated_block = evolve_block(o2$3, context);
                   const spawned_item = spawn_above(o1$3.dir, o2$3, t._0, context);
                   collide_block(undefined, dir, o1$3);
                   return [
-                          spawned_item,
-                          updated_block
-                        ];
+                    spawned_item,
+                    updated_block
+                  ];
                 }
               } else {
                 let exit$1 = 0;
@@ -1729,9 +1729,9 @@ function process_collision(dir, c1, c2, state) {
                   if (t === /* Panel */4) {
                     game_win(state.ctx);
                     return [
-                            undefined,
-                            undefined
-                          ];
+                      undefined,
+                      undefined
+                    ];
                   }
                   exit$1 = 4;
                 } else {
@@ -1742,15 +1742,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
+                  ];
                 }
                 
               }
@@ -1818,9 +1818,9 @@ function process_collision(dir, c1, c2, state) {
                         case /* North */0 :
                         case /* South */1 :
                             return [
-                                    undefined,
-                                    undefined
-                                  ];
+                              undefined,
+                              undefined
+                            ];
                         case /* East */2 :
                         case /* West */3 :
                             exit$3 = 4;
@@ -1831,9 +1831,9 @@ function process_collision(dir, c1, c2, state) {
                         rev_dir(o1$4, t1, s1$3);
                         rev_dir(o2$4, t2$2, s2$2);
                         return [
-                                undefined,
-                                undefined
-                              ];
+                          undefined,
+                          undefined
+                        ];
                       }
                       
                   }
@@ -1843,44 +1843,44 @@ function process_collision(dir, c1, c2, state) {
                     dec_health(o1$4);
                     dec_health(o2$4);
                     return [
-                            undefined,
-                            undefined
-                          ];
+                      undefined,
+                      undefined
+                    ];
                 case 2 :
                     if (o1$4.vel.x === 0) {
                       rev_dir(o2$4, t2$2, s2$2);
                       return [
-                              undefined,
-                              undefined
-                            ];
+                        undefined,
+                        undefined
+                      ];
                     } else {
                       dec_health(o2$4);
                       return [
-                              undefined,
-                              undefined
-                            ];
+                        undefined,
+                        undefined
+                      ];
                     }
                 case 3 :
                     if (o2$4.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 */2 :
               return [
-                      undefined,
-                      undefined
-                    ];
+                undefined,
+                undefined
+              ];
           case /* Block */3 :
               const t2$3 = c2._0;
               const o2$5 = c2._2;
@@ -1890,9 +1890,9 @@ function process_collision(dir, c1, c2, state) {
                 case /* South */1 :
                     collide_block(undefined, dir, o1$4);
                     return [
-                            undefined,
-                            undefined
-                          ];
+                      undefined,
+                      undefined
+                    ];
                 case /* East */2 :
                 case /* West */3 :
                     exit$4 = 4;
@@ -1909,9 +1909,9 @@ function process_collision(dir, c1, c2, state) {
                           dec_health(o2$5);
                           reverse_left_right(o1$4);
                           return [
-                                  undefined,
-                                  undefined
-                                ];
+                            undefined,
+                            undefined
+                          ];
                         }
                         exit$5 = 5;
                       } else {
@@ -1925,9 +1925,9 @@ function process_collision(dir, c1, c2, state) {
                           dec_health(o2$5);
                           reverse_left_right(o1$4);
                           return [
-                                  undefined,
-                                  undefined
-                                ];
+                            undefined,
+                            undefined
+                          ];
                         }
                         exit$5 = 5;
                       } else {
@@ -1942,17 +1942,17 @@ function process_collision(dir, c1, c2, state) {
                   case 5 :
                       rev_dir(o1$4, t1, s1$3);
                       return [
-                              undefined,
-                              undefined
-                            ];
+                        undefined,
+                        undefined
+                      ];
                   case 6 :
                       const updated_block$1 = evolve_block(o2$5, context);
                       const spawned_item$1 = spawn_above(o1$4.dir, o2$5, typ$2, context);
                       rev_dir(o1$4, t1, s1$3);
                       return [
-                              updated_block$1,
-                              spawned_item$1
-                            ];
+                        updated_block$1,
+                        spawned_item$1
+                      ];
                   
                 }
               }
@@ -1972,25 +1972,25 @@ function process_collision(dir, c1, c2, state) {
           case /* Enemy */1 :
           case /* Item */2 :
               return [
-                      undefined,
-                      undefined
-                    ];
+                undefined,
+                undefined
+              ];
           case /* Block */3 :
               switch (dir) {
                 case /* North */0 :
                 case /* South */1 :
                     collide_block(undefined, dir, o2$6);
                     return [
-                            undefined,
-                            undefined
-                          ];
+                      undefined,
+                      undefined
+                    ];
                 case /* East */2 :
                 case /* West */3 :
                     reverse_left_right(o2$6);
                     return [
-                            undefined,
-                            undefined
-                          ];
+                      undefined,
+                      undefined
+                    ];
                 
               }
           
@@ -1998,9 +1998,9 @@ function process_collision(dir, c1, c2, state) {
         break;
     case /* Block */3 :
         return [
-                undefined,
-                undefined
-              ];
+          undefined,
+          undefined
+        ];
     
   }
   switch (exit) {
@@ -2019,26 +2019,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)
+              ];
             }
             const 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)
+            ];
         }
         const 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 */3 :
@@ -2048,15 +2048,15 @@ function process_collision(dir, c1, c2, state) {
             dec_health(o1$1);
             o1$1.invuln = 60;
             return [
-                    undefined,
-                    undefined
-                  ];
+              undefined,
+              undefined
+            ];
         }
         const 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 :
         let exit$6 = 0;
         switch (t2$1) {
@@ -2072,9 +2072,9 @@ function process_collision(dir, c1, c2, state) {
               update_score(state, 1000);
               o2$2.score = 1000;
               return [
-                      undefined,
-                      undefined
-                    ];
+                undefined,
+                undefined
+              ];
           case /* FireFlower */1 :
           case /* Star */2 :
               exit$6 = 4;
@@ -2084,18 +2084,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;
     
@@ -2105,12 +2105,12 @@ function process_collision(dir, c1, c2, state) {
 function broad_phase(collid, all_collids, state) {
   const obj = collid._2;
   return Stdlib__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) {
@@ -2146,21 +2146,21 @@ function check_collisions(collid, all_collids, state) {
     if (o !== undefined) {
       const 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 {
       const 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;
@@ -2225,15 +2225,15 @@ function translate_keys(param) {
     tl: ctrls_1
   };
   return Stdlib__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) {
@@ -2488,15 +2488,15 @@ function convert_list(lst) {
   }
   const h = lst.hd;
   return Stdlib.$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) {
@@ -2509,9 +2509,9 @@ function choose_enemy_typ(typ) {
         return /* Goomba */0;
     default:
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: "Shouldn't reach here"
-              });
+            MEL_EXN_ID: "Failure",
+            _1: "Shouldn't reach here"
+          });
   }
 }
 
@@ -2525,16 +2525,16 @@ function choose_sblock_typ(typ) {
         return /* Cloud */3;
     case 3 :
         return {
-                TAG: /* QBlock */0,
-                _0: /* Mushroom */0
-              };
+          TAG: /* QBlock */0,
+          _0: /* Mushroom */0
+        };
     case 4 :
         return /* Ground */5;
     default:
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: "Shouldn't reach here"
-              });
+            MEL_EXN_ID: "Failure",
+            _1: "Shouldn't reach here"
+          });
   }
 }
 
@@ -2548,9 +2548,9 @@ function avoid_overlap(_lst, currentLst) {
     const h = lst.hd;
     if (!mem_loc(h[1], currentLst)) {
       return Stdlib.$at({
-                  hd: h,
-                  tl: /* [] */0
-                }, avoid_overlap(t, currentLst));
+            hd: h,
+            tl: /* [] */0
+          }, avoid_overlap(t, currentLst));
     }
     _lst = t;
     continue ;
@@ -2571,9 +2571,9 @@ function trim_edges(_lst, blockw, blockh) {
     const pixy = blockh * 16;
     if (!(cx < 128 || pixx - cx < 528 || cy === 0 || pixy - cy < 48)) {
       return Stdlib.$at({
-                  hd: h,
-                  tl: /* [] */0
-                }, trim_edges(t, blockw, blockh));
+            hd: h,
+            tl: /* [] */0
+          }, trim_edges(t, blockw, blockh));
     }
     _lst = t;
     continue ;
@@ -2585,15 +2585,15 @@ function generate_clouds(cbx, cby, typ, num) {
     return /* [] */0;
   } else {
     return Stdlib.$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));
   }
 }
 
@@ -2610,15 +2610,15 @@ function generate_coins(_block_coord) {
       const xc = h[1][0];
       const yc = h[1][1];
       return Stdlib.$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 ;
@@ -2637,64 +2637,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 :
         const num_clouds = Stdlib__Random.$$int(5) + 5 | 0;
@@ -2961,94 +2961,94 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) {
           return Stdlib.$at(one$2, Stdlib.$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 new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: "Shouldn't reach here"
-              });
+            MEL_EXN_ID: "Failure",
+            _1: "Shouldn't reach here"
+          });
   }
 }
 
@@ -3105,15 +3105,15 @@ function generate_block_enemies(_block_coord) {
       const xc = h[1][0];
       const yc = h[1][1];
       return Stdlib.$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 ;
@@ -3156,12 +3156,12 @@ function generate_block_locs(blockw, blockh, _cbx, _cby, _acc) {
 
 function generate_panel(context, blockw, blockh) {
   return spawn({
-              TAG: /* SBlock */3,
-              _0: /* Panel */4
-            }, context, [
-              blockw * 16 - 256,
-              blockh * 16 * 2 / 3
-            ]);
+        TAG: /* SBlock */3,
+        _0: /* Panel */4
+      }, context, [
+        blockw * 16 - 256,
+        blockh * 16 * 2 / 3
+      ]);
 }
 
 function generate_ground(blockw, blockh, _inc, _acc) {
@@ -3218,9 +3218,9 @@ function convert_to_block_obj(lst, context) {
         _0: sblock_typ
       }, context, h[1]);
   return Stdlib.$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) {
@@ -3234,9 +3234,9 @@ function convert_to_enemy_obj(lst, context) {
         _0: senemy_typ
       }, context, h[1]);
   return Stdlib.$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) {
@@ -3248,9 +3248,9 @@ function convert_to_coin_obj(lst, context) {
         _0: /* Coin */3
       }, context, lst.hd[1]);
   return Stdlib.$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) {
@@ -3272,9 +3272,9 @@ function generate_helper(blockw, blockh, cx, cy, context) {
   const coin_objects = convert_to_coin_obj(undup_coin_locs, context);
   const obj_panel = generate_panel(context, blockw, blockh);
   return Stdlib.$at(all_blocks, Stdlib.$at(obj_converted_enemies, Stdlib.$at(coin_objects, Stdlib.$at(obj_enemy_blocks, {
-                          hd: obj_panel,
-                          tl: /* [] */0
-                        }))));
+                    hd: obj_panel,
+                    tl: /* [] */0
+                  }))));
 }
 
 function generate(w, h, context) {
@@ -3290,9 +3290,9 @@ function generate(w, h, context) {
         224
       ]);
   return [
-          player,
-          collide_list
-        ];
+    player,
+    collide_list
+  ];
 }
 
 function init(param) {
@@ -3334,9 +3334,9 @@ function load(param) {
               _1: "cant find canvas %s \n"
             }), canvas_id);
     throw new Caml_js_exceptions.MelangeError("Failure", {
-              MEL_EXN_ID: "Failure",
-              _1: "fail"
-            });
+          MEL_EXN_ID: "Failure",
+          _1: "fail"
+        });
   }
   const context = canvas.getContext("2d");
   document.addEventListener("keydown", keydown, true);
@@ -3359,26 +3359,26 @@ function inc_counter(param) {
 
 function preload(param) {
   return Stdlib__List.map((function (img_src) {
-                const img_src$1 = "sprites/" + img_src;
-                const img = document.createElement("img");
-                img.src = img_src$1;
-                img.addEventListener("load", (function (ev) {
-                        inc_counter(undefined);
-                        return true;
-                      }), true);
-              }), {
-              hd: "blocks.png",
-              tl: {
-                hd: "items.png",
-                tl: {
-                  hd: "enemies.png",
-                  tl: {
-                    hd: "mario-small.png",
-                    tl: /* [] */0
-                  }
-                }
-              }
-            });
+          const img_src$1 = "sprites/" + img_src;
+          const img = document.createElement("img");
+          img.src = img_src$1;
+          img.addEventListener("load", (function (ev) {
+                  inc_counter(undefined);
+                  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/dist/jscomp/test/match_case_test.js b/jscomp/test/dist/jscomp/test/match_case_test.js
index 266e6a6de..95a2b27a6 100644
--- a/jscomp/test/dist/jscomp/test/match_case_test.js
+++ b/jscomp/test/dist/jscomp/test/match_case_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/method_name_test.js b/jscomp/test/dist/jscomp/test/method_name_test.js
index 2ad27e19b..7389f18c2 100644
--- a/jscomp/test/dist/jscomp/test/method_name_test.js
+++ b/jscomp/test/dist/jscomp/test/method_name_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/miss_colon_test.js b/jscomp/test/dist/jscomp/test/miss_colon_test.js
index 297221da7..13779d539 100644
--- a/jscomp/test/dist/jscomp/test/miss_colon_test.js
+++ b/jscomp/test/dist/jscomp/test/miss_colon_test.js
@@ -10,9 +10,9 @@ function $plus$colon(_f, _g) {
       const n = f._0;
       if (g.TAG === /* Int */0) {
         return {
-                TAG: /* Int */0,
-                _0: n + g._0 | 0
-              };
+          TAG: /* Int */0,
+          _0: n + g._0 | 0
+        };
       }
       if (n === 0) {
         return g;
@@ -23,10 +23,10 @@ function $plus$colon(_f, _g) {
       case /* Int */0 :
           if (g._0 !== 0) {
             return {
-                    TAG: /* Add */2,
-                    _0: f,
-                    _1: g
-                  };
+              TAG: /* Add */2,
+              _0: f,
+              _1: g
+            };
           } else {
             return f;
           }
@@ -37,10 +37,10 @@ function $plus$colon(_f, _g) {
       case /* Var */1 :
       case /* Mul */3 :
           return {
-                  TAG: /* Add */2,
-                  _0: f,
-                  _1: g
-                };
+            TAG: /* Add */2,
+            _0: f,
+            _1: g
+          };
       
     }
   };
@@ -56,15 +56,15 @@ function $star$colon(_f, _g) {
       const n = f._0;
       if (g.TAG === /* Int */0) {
         return {
-                TAG: /* Int */0,
-                _0: Math.imul(n, g._0)
-              };
+          TAG: /* Int */0,
+          _0: Math.imul(n, g._0)
+        };
       }
       if (n === 0) {
         return {
-                TAG: /* Int */0,
-                _0: 0
-              };
+          TAG: /* Int */0,
+          _0: 0
+        };
       }
       exit$1 = 3;
     } else {
@@ -74,9 +74,9 @@ function $star$colon(_f, _g) {
       if (g.TAG === /* Int */0) {
         if (g._0 === 0) {
           return {
-                  TAG: /* Int */0,
-                  _0: 0
-                };
+            TAG: /* Int */0,
+            _0: 0
+          };
         }
         exit = 2;
       } else {
@@ -90,20 +90,20 @@ function $star$colon(_f, _g) {
       case /* Int */0 :
           if (g._0 !== 1) {
             return {
-                    TAG: /* Mul */3,
-                    _0: f,
-                    _1: g
-                  };
+              TAG: /* Mul */3,
+              _0: f,
+              _1: g
+            };
           } else {
             return f;
           }
       case /* Var */1 :
       case /* Add */2 :
           return {
-                  TAG: /* Mul */3,
-                  _0: f,
-                  _1: g
-                };
+            TAG: /* Mul */3,
+            _0: f,
+            _1: g
+          };
       case /* Mul */3 :
           _g = g._1;
           _f = $star$colon(f, g._0);
diff --git a/jscomp/test/dist/jscomp/test/module_alias_test.js b/jscomp/test/dist/jscomp/test/module_alias_test.js
index f18a6ad8d..3d18eda5e 100644
--- a/jscomp/test/dist/jscomp/test/module_alias_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/module_parameter_test.js b/jscomp/test/dist/jscomp/test/module_parameter_test.js
index 02bbe1279..13d9f7796 100644
--- a/jscomp/test/dist/jscomp/test/module_parameter_test.js
+++ b/jscomp/test/dist/jscomp/test/module_parameter_test.js
@@ -22,10 +22,10 @@ const suites_0 = [
   "const",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: 1,
-              _1: 1
-            };
+        TAG: /* Eq */0,
+        _0: 1,
+        _1: 1
+      };
     })
 ];
 
@@ -34,10 +34,10 @@ const suites_1 = {
     "other",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: 3,
-                _1: 3
-              };
+          TAG: /* Eq */0,
+          _0: 3,
+          _1: 3
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/module_splice_test.js b/jscomp/test/dist/jscomp/test/module_splice_test.js
index 16bfae154..0293424cd 100644
--- a/jscomp/test/dist/jscomp/test/module_splice_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/more_poly_variant_test.js b/jscomp/test/dist/jscomp/test/more_poly_variant_test.js
index 9fbd9c047..1d08851e0 100644
--- a/jscomp/test/dist/jscomp/test/more_poly_variant_test.js
+++ b/jscomp/test/dist/jscomp/test/more_poly_variant_test.js
@@ -8,25 +8,25 @@ function map(f, param) {
   }
   const match = param.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 === "string" || x.NAME !== "Snoc") {
     return {
-            NAME: "A",
-            VAL: x
-          };
+      NAME: "A",
+      VAL: x
+    };
   } else {
     return {
-            NAME: "B",
-            VAL: x
-          };
+      NAME: "B",
+      VAL: x
+    };
   }
 }
 
diff --git a/jscomp/test/dist/jscomp/test/mpr_6033_test.js b/jscomp/test/dist/jscomp/test/mpr_6033_test.js
index 4598ed333..6f60e776c 100644
--- a/jscomp/test/dist/jscomp/test/mpr_6033_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/mt.js b/jscomp/test/dist/jscomp/test/mt.js
index fb669e39f..c4ca24e04 100644
--- a/jscomp/test/dist/jscomp/test/mt.js
+++ b/jscomp/test/dist/jscomp/test/mt.js
@@ -34,11 +34,11 @@ function from_suites(name, suite) {
   if (match && is_mocha(undefined)) {
     describe(name, (function () {
             return Stdlib__List.iter((function (param) {
-                          const partial_arg = param[1];
-                          it(param[0], (function () {
-                                  return Curry._1(partial_arg, undefined);
-                                }));
-                        }), suite);
+                    const partial_arg = param[1];
+                    it(param[0], (function () {
+                            return Curry._1(partial_arg, undefined);
+                          }));
+                  }), suite);
           }));
     return ;
   }
@@ -102,11 +102,11 @@ function from_pair_suites(name, suites) {
     if (is_mocha(undefined)) {
       describe(name, (function () {
               return Stdlib__List.iter((function (param) {
-                            const code = param[1];
-                            it(param[0], (function () {
-                                    return handleCode(Curry._1(code, undefined));
-                                  }));
-                          }), suites);
+                      const code = param[1];
+                      it(param[0], (function () {
+                              return handleCode(Curry._1(code, undefined));
+                            }));
+                    }), suites);
             }));
       return ;
     } else {
@@ -115,78 +115,78 @@ function from_pair_suites(name, suites) {
             "testing"
           ]);
       return Stdlib__List.iter((function (param) {
-                    const name = param[0];
-                    const _fn = Curry._1(param[1], undefined);
-                    switch (_fn.TAG) {
-                      case /* Eq */0 :
-                          console.log([
-                                name,
-                                _fn._0,
-                                "eq?",
-                                _fn._1
-                              ]);
-                          return ;
-                      case /* Neq */1 :
-                          console.log([
-                                name,
-                                _fn._0,
-                                "neq?",
-                                _fn._1
-                              ]);
-                          return ;
-                      case /* StrictEq */2 :
-                          console.log([
-                                name,
-                                _fn._0,
-                                "strict_eq?",
-                                _fn._1
-                              ]);
-                          return ;
-                      case /* StrictNeq */3 :
-                          console.log([
-                                name,
-                                _fn._0,
-                                "strict_neq?",
-                                _fn._1
-                              ]);
-                          return ;
-                      case /* Ok */4 :
-                          console.log([
-                                name,
-                                _fn._0,
-                                "ok?"
-                              ]);
-                          return ;
-                      case /* Approx */5 :
-                          console.log([
-                                name,
-                                _fn._0,
-                                "~",
-                                _fn._1
-                              ]);
-                          return ;
-                      case /* ApproxThreshold */6 :
-                          console.log([
-                                name,
-                                _fn._1,
-                                "~",
-                                _fn._2,
-                                " (",
-                                _fn._0,
-                                ")"
-                              ]);
-                          return ;
-                      case /* ThrowAny */7 :
-                          return ;
-                      case /* Fail */8 :
-                          console.log("failed");
-                          return ;
-                      case /* FailWith */9 :
-                          console.log("failed: " + _fn._0);
-                          return ;
-                      
-                    }
-                  }), suites);
+              const name = param[0];
+              const _fn = Curry._1(param[1], undefined);
+              switch (_fn.TAG) {
+                case /* Eq */0 :
+                    console.log([
+                          name,
+                          _fn._0,
+                          "eq?",
+                          _fn._1
+                        ]);
+                    return ;
+                case /* Neq */1 :
+                    console.log([
+                          name,
+                          _fn._0,
+                          "neq?",
+                          _fn._1
+                        ]);
+                    return ;
+                case /* StrictEq */2 :
+                    console.log([
+                          name,
+                          _fn._0,
+                          "strict_eq?",
+                          _fn._1
+                        ]);
+                    return ;
+                case /* StrictNeq */3 :
+                    console.log([
+                          name,
+                          _fn._0,
+                          "strict_neq?",
+                          _fn._1
+                        ]);
+                    return ;
+                case /* Ok */4 :
+                    console.log([
+                          name,
+                          _fn._0,
+                          "ok?"
+                        ]);
+                    return ;
+                case /* Approx */5 :
+                    console.log([
+                          name,
+                          _fn._0,
+                          "~",
+                          _fn._1
+                        ]);
+                    return ;
+                case /* ApproxThreshold */6 :
+                    console.log([
+                          name,
+                          _fn._1,
+                          "~",
+                          _fn._2,
+                          " (",
+                          _fn._0,
+                          ")"
+                        ]);
+                    return ;
+                case /* ThrowAny */7 :
+                    return ;
+                case /* Fail */8 :
+                    console.log("failed");
+                    return ;
+                case /* FailWith */9 :
+                    console.log("failed: " + _fn._0);
+                    return ;
+                
+              }
+            }), suites);
     }
   }
   
@@ -200,14 +200,14 @@ function from_promise_suites(name, suites) {
     if (is_mocha(undefined)) {
       describe(name, (function () {
               return Stdlib__List.iter((function (param) {
-                            const code = param[1];
-                            it(param[0], (function () {
-                                    return code.then(function (x) {
-                                                handleCode(x);
-                                                return val_unit;
-                                              });
-                                  }));
-                          }), suites);
+                      const code = param[1];
+                      it(param[0], (function () {
+                              return code.then(function (x) {
+                                    handleCode(x);
+                                    return val_unit;
+                                  });
+                            }));
+                    }), suites);
             }));
     } else {
       console.log("promise suites");
@@ -224,10 +224,10 @@ function eq_suites(test_id, suites, loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -241,9 +241,9 @@ function bool_suites(test_id, suites, loc, x) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Ok */4,
-                  _0: x
-                };
+            TAG: /* Ok */4,
+            _0: x
+          };
         })
     ],
     tl: suites.contents
@@ -257,9 +257,9 @@ function throw_suites(test_id, suites, loc, x) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* ThrowAny */7,
-                  _0: x
-                };
+            TAG: /* ThrowAny */7,
+            _0: x
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/mt_global.js b/jscomp/test/dist/jscomp/test/mt_global.js
index 1af26fb97..2f2e010cf 100644
--- a/jscomp/test/dist/jscomp/test/mt_global.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _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 */1,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Neq */1,
+            _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 */5,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Approx */5,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/mutable_obj_test.js b/jscomp/test/dist/jscomp/test/mutable_obj_test.js
index 8100c362d..300ca983f 100644
--- a/jscomp/test/dist/jscomp/test/mutable_obj_test.js
+++ b/jscomp/test/dist/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/dist/jscomp/test/mutable_uncurry_test.js b/jscomp/test/dist/jscomp/test/mutable_uncurry_test.js
index c738978f7..49516c5ac 100644
--- a/jscomp/test/dist/jscomp/test/mutable_uncurry_test.js
+++ b/jscomp/test/dist/jscomp/test/mutable_uncurry_test.js
@@ -60,10 +60,10 @@ function ut3(param, param$1, param$2) {
   const x1 = param$1.contents;
   const x2 = param$2.contents;
   return [
-          x0,
-          x1,
-          x2
-        ];
+    x0,
+    x1,
+    x2
+  ];
 }
 
 function t3(param, param$1, param$2) {
@@ -71,10 +71,10 @@ function t3(param, param$1, param$2) {
   const x1 = param$1.contents;
   const x2 = param$2.contents;
   return [
-          x0,
-          x1,
-          x2
-        ];
+    x0,
+    x1,
+    x2
+  ];
 }
 
 function ut4(param, param$1, param$2, param$3) {
@@ -83,11 +83,11 @@ function ut4(param, param$1, param$2, param$3) {
   const x2 = param$2.contents;
   const x3 = param$3.contents;
   return [
-          x0,
-          x1,
-          x2,
-          x3
-        ];
+    x0,
+    x1,
+    x2,
+    x3
+  ];
 }
 
 function t4(param, param$1, param$2, param$3) {
@@ -96,11 +96,11 @@ function t4(param, param$1, param$2, param$3) {
   const x2 = param$2.contents;
   const x3 = param$3.contents;
   return [
-          x0,
-          x1,
-          x2,
-          x3
-        ];
+    x0,
+    x1,
+    x2,
+    x3
+  ];
 }
 
 function ut5(param, param$1, param$2, param$3, param$4) {
@@ -110,12 +110,12 @@ function ut5(param, param$1, param$2, param$3, param$4) {
   const x3 = param$3.contents;
   const x4 = param$4.contents;
   return [
-          x0,
-          x1,
-          x2,
-          x3,
-          x4
-        ];
+    x0,
+    x1,
+    x2,
+    x3,
+    x4
+  ];
 }
 
 function t5(param, param$1, param$2, param$3, param$4) {
@@ -125,12 +125,12 @@ function t5(param, param$1, param$2, param$3, param$4) {
   const x3 = param$3.contents;
   const x4 = param$4.contents;
   return [
-          x0,
-          x1,
-          x2,
-          x3,
-          x4
-        ];
+    x0,
+    x1,
+    x2,
+    x3,
+    x4
+  ];
 }
 
 function nested0(param, param$1, param$2) {
diff --git a/jscomp/test/dist/jscomp/test/name_mangle_test.js b/jscomp/test/dist/jscomp/test/name_mangle_test.js
index 36450996f..c847a98da 100644
--- a/jscomp/test/dist/jscomp/test/name_mangle_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/nested_module_alias.js b/jscomp/test/dist/jscomp/test/nested_module_alias.js
index c888c0e79..585ecaa5b 100644
--- a/jscomp/test/dist/jscomp/test/nested_module_alias.js
+++ b/jscomp/test/dist/jscomp/test/nested_module_alias.js
@@ -5,9 +5,9 @@ const Stdlib__List = require("melange/list.js");
 
 function v(x) {
   return [
-          Stdlib__List.length(x),
-          Stdlib__List.length(x)
-        ];
+    Stdlib__List.length(x),
+    Stdlib__List.length(x)
+  ];
 }
 
 exports.v = v;
diff --git a/jscomp/test/dist/jscomp/test/noassert.js b/jscomp/test/dist/jscomp/test/noassert.js
index 2f9529b11..01eb33cb8 100644
--- a/jscomp/test/dist/jscomp/test/noassert.js
+++ b/jscomp/test/dist/jscomp/test/noassert.js
@@ -5,13 +5,13 @@ const Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 function f(param) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/noassert.ml",
-              5,
-              11
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/noassert.ml",
+          5,
+          11
+        ]
+      });
 }
 
 function h(param) {
diff --git a/jscomp/test/dist/jscomp/test/obj_magic_test.js b/jscomp/test/dist/jscomp/test/obj_magic_test.js
index 4c7d7a5b1..2c0b33da8 100644
--- a/jscomp/test/dist/jscomp/test/obj_magic_test.js
+++ b/jscomp/test/dist/jscomp/test/obj_magic_test.js
@@ -11,10 +11,10 @@ const suites_0 = [
   "is_block_test1",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: false,
-              _1: false
-            };
+        TAG: /* Eq */0,
+        _0: false,
+        _1: false
+      };
     })
 ];
 
@@ -23,13 +23,13 @@ const suites_1 = {
     "is_block_test2",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: true,
-                _1: typeof ({
-                    hd: 3,
-                    tl: /* [] */0
-                  }) !== "number"
-              };
+          TAG: /* Eq */0,
+          _0: true,
+          _1: typeof ({
+            hd: 3,
+            tl: /* [] */0
+          }) !== "number"
+        };
       })
   ],
   tl: {
@@ -37,10 +37,10 @@ const suites_1 = {
       "is_block_test3",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: true,
-                  _1: true
-                };
+            TAG: /* Eq */0,
+            _0: true,
+            _1: true
+          };
         })
     ],
     tl: {
@@ -48,10 +48,10 @@ const suites_1 = {
         "is_block_test4",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: false,
-                    _1: false
-                  };
+              TAG: /* Eq */0,
+              _0: false,
+              _1: false
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/obj_test.js b/jscomp/test/dist/jscomp/test/obj_test.js
index d5e61b1d7..faaf79d9a 100644
--- a/jscomp/test/dist/jscomp/test/obj_test.js
+++ b/jscomp/test/dist/jscomp/test/obj_test.js
@@ -164,16 +164,16 @@ const suites_0 = [
   "single_obj",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: [
-                3,
-                32
-              ],
-              _1: [
-                Caml_oo_curry.js1(120, 1, v),
-                Caml_oo_curry.js1(121, 2, v)
-              ]
-            };
+        TAG: /* Eq */0,
+        _0: [
+          3,
+          32
+        ],
+        _1: [
+          Caml_oo_curry.js1(120, 1, v),
+          Caml_oo_curry.js1(121, 2, v)
+        ]
+      };
     })
 ];
 
@@ -182,16 +182,16 @@ const suites_1 = {
     "single_obj_cache",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: [
-                  3,
-                  32
-                ],
-                _1: [
-                  Caml_oo_curry.js1(120, 3, v),
-                  Caml_oo_curry.js1(121, 4, v)
-                ]
-              };
+          TAG: /* Eq */0,
+          _0: [
+            3,
+            32
+          ],
+          _1: [
+            Caml_oo_curry.js1(120, 3, v),
+            Caml_oo_curry.js1(121, 4, v)
+          ]
+        };
       })
   ],
   tl: {
@@ -199,10 +199,10 @@ const suites_1 = {
       "self_obj",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: 13,
-                  _1: Caml_oo_curry.js2(616641298, 5, vv, 3)
-                };
+            TAG: /* Eq */0,
+            _0: 13,
+            _1: Caml_oo_curry.js2(616641298, 5, vv, 3)
+          };
         })
     ],
     tl: {
@@ -210,10 +210,10 @@ const suites_1 = {
         "uu_id",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: "uu",
-                    _1: Caml_oo_curry.js1(23515, 6, uu)
-                  };
+              TAG: /* Eq */0,
+              _0: "uu",
+              _1: Caml_oo_curry.js1(23515, 6, uu)
+            };
           })
       ],
       tl: {
@@ -221,10 +221,10 @@ const suites_1 = {
           "uu_add",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: Caml_oo_curry.js3(4846113, 7, uuu, 1, 20),
-                      _1: 21
-                    };
+                TAG: /* Eq */0,
+                _0: Caml_oo_curry.js3(4846113, 7, uuu, 1, 20),
+                _1: 21
+              };
             })
         ],
         tl: {
@@ -232,10 +232,10 @@ const suites_1 = {
             "v_add",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: Caml_oo_curry.js3(4846113, 8, vvvv, 3, 7),
-                        _1: 10
-                      };
+                  TAG: /* Eq */0,
+                  _0: Caml_oo_curry.js3(4846113, 8, vvvv, 3, 7),
+                  _1: 10
+                };
               })
           ],
           tl: {
@@ -243,10 +243,10 @@ const suites_1 = {
               "u_id1",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: Caml_oo_curry.js1(5243894, 9, u),
-                          _1: 3
-                        };
+                    TAG: /* Eq */0,
+                    _0: Caml_oo_curry.js1(5243894, 9, u),
+                    _1: 3
+                  };
                 })
             ],
             tl: {
@@ -254,10 +254,10 @@ const suites_1 = {
                 "u_id2",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: Caml_oo_curry.js1(5243895, 10, u),
-                            _1: 4
-                          };
+                      TAG: /* Eq */0,
+                      _0: Caml_oo_curry.js1(5243895, 10, u),
+                      _1: 4
+                    };
                   })
               ],
               tl: {
@@ -265,10 +265,10 @@ const suites_1 = {
                   "u hi",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: Caml_oo_curry.js3(23297, 11, u, 1, 2),
-                              _1: 3
-                            };
+                        TAG: /* Eq */0,
+                        _0: Caml_oo_curry.js3(23297, 11, u, 1, 2),
+                        _1: 3
+                      };
                     })
                 ],
                 tl: {
@@ -276,10 +276,10 @@ const suites_1 = {
                     "u hello",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: Caml_oo_curry.js2(616641298, 12, u, 32),
-                                _1: 32
-                              };
+                          TAG: /* Eq */0,
+                          _0: Caml_oo_curry.js2(616641298, 12, u, 32),
+                          _1: 32
+                        };
                       })
                   ],
                   tl: {
@@ -287,10 +287,10 @@ const suites_1 = {
                       "v hi",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: Caml_oo_curry.js2(23297, 13, vvvv, 31),
-                                  _1: 63
-                                };
+                            TAG: /* Eq */0,
+                            _0: Caml_oo_curry.js2(23297, 13, vvvv, 31),
+                            _1: 63
+                          };
                         })
                     ],
                     tl: {
@@ -298,10 +298,10 @@ const suites_1 = {
                         "uuu add",
                         (function (param) {
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: Caml_oo_curry.js3(4846113, 14, uuu, 3, 4),
-                                    _1: 7
-                                  };
+                              TAG: /* Eq */0,
+                              _0: Caml_oo_curry.js3(4846113, 14, uuu, 3, 4),
+                              _1: 7
+                            };
                           })
                       ],
                       tl: {
@@ -309,10 +309,10 @@ const suites_1 = {
                           "v x",
                           (function (param) {
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: Caml_oo_curry.js1(120, 15, v),
-                                      _1: 3
-                                    };
+                                TAG: /* Eq */0,
+                                _0: Caml_oo_curry.js1(120, 15, v),
+                                _1: 3
+                              };
                             })
                         ],
                         tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/ocaml_parsetree_test.js b/jscomp/test/dist/jscomp/test/ocaml_parsetree_test.js
index 81c2a4d53..436faf6e1 100644
--- a/jscomp/test/dist/jscomp/test/ocaml_parsetree_test.js
+++ b/jscomp/test/dist/jscomp/test/ocaml_parsetree_test.js
@@ -74,8 +74,8 @@ function fatal_error(msg) {
   Stdlib.prerr_string(">> Fatal error: ");
   console.error(msg);
   throw new Caml_js_exceptions.MelangeError(Fatal_error, {
-            MEL_EXN_ID: Fatal_error
-          });
+        MEL_EXN_ID: Fatal_error
+      });
 }
 
 function create_hashtable(size, init) {
@@ -178,48 +178,48 @@ function style_of_tag(s) {
     switch (s._1) {
       case "dim" :
           return {
-                  hd: /* Dim */2,
-                  tl: /* [] */0
-                };
+            hd: /* Dim */2,
+            tl: /* [] */0
+          };
       case "error" :
           return cur_styles.contents.error;
       case "filename" :
           return {
-                  hd: {
-                    TAG: /* FG */0,
-                    _0: /* Cyan */6
-                  },
-                  tl: /* [] */0
-                };
+            hd: {
+              TAG: /* FG */0,
+              _0: /* Cyan */6
+            },
+            tl: /* [] */0
+          };
       case "info" :
           return {
-                  hd: /* Bold */0,
-                  tl: {
-                    hd: {
-                      TAG: /* FG */0,
-                      _0: /* Yellow */3
-                    },
-                    tl: /* [] */0
-                  }
-                };
+            hd: /* Bold */0,
+            tl: {
+              hd: {
+                TAG: /* FG */0,
+                _0: /* Yellow */3
+              },
+              tl: /* [] */0
+            }
+          };
       case "loc" :
           return cur_styles.contents.loc;
       case "warning" :
           return cur_styles.contents.warning;
       default:
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     }
   } else {
     throw new Caml_js_exceptions.MelangeError("Match_failure", {
-              MEL_EXN_ID: "Match_failure",
-              _1: [
-                "misc.ml",
-                428,
-                19
-              ]
-            });
+          MEL_EXN_ID: "Match_failure",
+          _1: [
+            "misc.ml",
+            428,
+            19
+          ]
+        });
   }
 }
 
@@ -253,9 +253,9 @@ function set_color_tag_handling(ppf) {
       style_of_tag(param);
       if (color_enabled.contents) {
         return ansi_of_style_l({
-                    hd: /* Reset */1,
-                    tl: /* [] */0
-                  });
+              hd: /* Reset */1,
+              tl: /* [] */0
+            });
       } else {
         return "";
       }
@@ -456,9 +456,9 @@ function loop(i) {
     return /* [] */0;
   } else {
     return {
-            hd: i,
-            tl: loop(i - 1 | 0)
-          };
+      hd: i,
+      tl: loop(i - 1 | 0)
+    };
   }
 }
 
@@ -470,91 +470,91 @@ function letter(param) {
         return letter_all;
     case 99 :
         return {
-                hd: 1,
-                tl: {
-                  hd: 2,
-                  tl: /* [] */0
-                }
-              };
+          hd: 1,
+          tl: {
+            hd: 2,
+            tl: /* [] */0
+          }
+        };
     case 100 :
         return {
-                hd: 3,
-                tl: /* [] */0
-              };
+          hd: 3,
+          tl: /* [] */0
+        };
     case 101 :
         return {
-                hd: 4,
-                tl: /* [] */0
-              };
+          hd: 4,
+          tl: /* [] */0
+        };
     case 102 :
         return {
-                hd: 5,
-                tl: /* [] */0
-              };
+          hd: 5,
+          tl: /* [] */0
+        };
     case 107 :
         return {
-                hd: 32,
+          hd: 32,
+          tl: {
+            hd: 33,
+            tl: {
+              hd: 34,
+              tl: {
+                hd: 35,
                 tl: {
-                  hd: 33,
+                  hd: 36,
                   tl: {
-                    hd: 34,
+                    hd: 37,
                     tl: {
-                      hd: 35,
+                      hd: 38,
                       tl: {
-                        hd: 36,
-                        tl: {
-                          hd: 37,
-                          tl: {
-                            hd: 38,
-                            tl: {
-                              hd: 39,
-                              tl: /* [] */0
-                            }
-                          }
-                        }
+                        hd: 39,
+                        tl: /* [] */0
                       }
                     }
                   }
                 }
-              };
+              }
+            }
+          }
+        };
     case 108 :
         return {
-                hd: 6,
-                tl: /* [] */0
-              };
+          hd: 6,
+          tl: /* [] */0
+        };
     case 109 :
         return {
-                hd: 7,
-                tl: /* [] */0
-              };
+          hd: 7,
+          tl: /* [] */0
+        };
     case 112 :
         return {
-                hd: 8,
-                tl: /* [] */0
-              };
+          hd: 8,
+          tl: /* [] */0
+        };
     case 114 :
         return {
-                hd: 9,
-                tl: /* [] */0
-              };
+          hd: 9,
+          tl: /* [] */0
+        };
     case 115 :
         return {
-                hd: 10,
-                tl: /* [] */0
-              };
+          hd: 10,
+          tl: /* [] */0
+        };
     case 117 :
         return {
-                hd: 11,
-                tl: {
-                  hd: 12,
-                  tl: /* [] */0
-                }
-              };
+          hd: 11,
+          tl: {
+            hd: 12,
+            tl: /* [] */0
+          }
+        };
     case 118 :
         return {
-                hd: 13,
-                tl: /* [] */0
-              };
+          hd: 13,
+          tl: /* [] */0
+        };
     case 98 :
     case 103 :
     case 104 :
@@ -568,35 +568,32 @@ function letter(param) {
         return /* [] */0;
     case 120 :
         return {
-                hd: 14,
+          hd: 14,
+          tl: {
+            hd: 15,
+            tl: {
+              hd: 16,
+              tl: {
+                hd: 17,
                 tl: {
-                  hd: 15,
+                  hd: 18,
                   tl: {
-                    hd: 16,
+                    hd: 19,
                     tl: {
-                      hd: 17,
+                      hd: 20,
                       tl: {
-                        hd: 18,
+                        hd: 21,
                         tl: {
-                          hd: 19,
+                          hd: 22,
                           tl: {
-                            hd: 20,
+                            hd: 23,
                             tl: {
-                              hd: 21,
+                              hd: 24,
                               tl: {
-                                hd: 22,
+                                hd: 25,
                                 tl: {
-                                  hd: 23,
-                                  tl: {
-                                    hd: 24,
-                                    tl: {
-                                      hd: 25,
-                                      tl: {
-                                        hd: 30,
-                                        tl: /* [] */0
-                                      }
-                                    }
-                                  }
+                                  hd: 30,
+                                  tl: /* [] */0
                                 }
                               }
                             }
@@ -606,26 +603,29 @@ function letter(param) {
                     }
                   }
                 }
-              };
+              }
+            }
+          }
+        };
     case 121 :
         return {
-                hd: 26,
-                tl: /* [] */0
-              };
+          hd: 26,
+          tl: /* [] */0
+        };
     case 122 :
         return {
-                hd: 27,
-                tl: /* [] */0
-              };
+          hd: 27,
+          tl: /* [] */0
+        };
     default:
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "warnings.ml",
-                  176,
-                  9
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "warnings.ml",
+              176,
+              9
+            ]
+          });
   }
 }
 
@@ -657,16 +657,16 @@ function parse_opt(error, active, flags, s) {
       const n = _n;
       if (i >= s.length) {
         return [
-                i,
-                n
-              ];
+          i,
+          n
+        ];
       }
       const match = Caml_string.get(s, i);
       if (match > 57 || match < 48) {
         return [
-                i,
-                n
-              ];
+          i,
+          n
+        ];
       }
       _i = i + 1 | 0;
       _n = (Math.imul(10, n) + Caml_string.get(s, i) | 0) - /* '0' */48 | 0;
@@ -679,24 +679,24 @@ function parse_opt(error, active, flags, s) {
     const i$1 = match[0];
     if (!((i$1 + 2 | 0) < s.length && Caml_string.get(s, i$1) === /* '.' */46 && Caml_string.get(s, i$1 + 1 | 0) === /* '.' */46)) {
       return [
-              i$1,
-              n1,
-              n1
-            ];
+        i$1,
+        n1,
+        n1
+      ];
     }
     const match$1 = get_num(0, i$1 + 2 | 0);
     const n2 = match$1[1];
     if (n2 < n1) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                MEL_EXN_ID: Stdlib__Arg.Bad,
-                _1: "Ill-formed list of warnings"
-              });
+            MEL_EXN_ID: Stdlib__Arg.Bad,
+            _1: "Ill-formed list of warnings"
+          });
     }
     return [
-            match$1[0],
-            n1,
-            n2
-          ];
+      match$1[0],
+      n1,
+      n2
+    ];
   };
   const loop = function (_i) {
     while(true) {
@@ -709,9 +709,9 @@ function parse_opt(error, active, flags, s) {
         if (c >= 97) {
           if (c >= 123) {
             throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                      MEL_EXN_ID: Stdlib__Arg.Bad,
-                      _1: "Ill-formed list of warnings"
-                    });
+                  MEL_EXN_ID: Stdlib__Arg.Bad,
+                  _1: "Ill-formed list of warnings"
+                });
           }
           Stdlib__List.iter(clear, letter(Caml_string.get(s, i)));
           _i = i + 1 | 0;
@@ -719,9 +719,9 @@ function parse_opt(error, active, flags, s) {
         }
         if (c >= 91) {
           throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                    MEL_EXN_ID: Stdlib__Arg.Bad,
-                    _1: "Ill-formed list of warnings"
-                  });
+                MEL_EXN_ID: Stdlib__Arg.Bad,
+                _1: "Ill-formed list of warnings"
+              });
         }
         Stdlib__List.iter(set, letter(Stdlib__Char.lowercase_ascii(Caml_string.get(s, i))));
         _i = i + 1 | 0;
@@ -732,9 +732,9 @@ function parse_opt(error, active, flags, s) {
           return loop_letter_num(set_all, i + 1 | 0);
         }
         throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                  MEL_EXN_ID: Stdlib__Arg.Bad,
-                  _1: "Ill-formed list of warnings"
-                });
+              MEL_EXN_ID: Stdlib__Arg.Bad,
+              _1: "Ill-formed list of warnings"
+            });
       }
       if (c >= 43) {
         switch (c) {
@@ -742,54 +742,54 @@ function parse_opt(error, active, flags, s) {
               return loop_letter_num(set, i + 1 | 0);
           case 44 :
               throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                        MEL_EXN_ID: Stdlib__Arg.Bad,
-                        _1: "Ill-formed list of warnings"
-                      });
+                    MEL_EXN_ID: Stdlib__Arg.Bad,
+                    _1: "Ill-formed list of warnings"
+                  });
           case 45 :
               return loop_letter_num(clear, i + 1 | 0);
           
         }
       } else {
         throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                  MEL_EXN_ID: Stdlib__Arg.Bad,
-                  _1: "Ill-formed list of warnings"
-                });
+              MEL_EXN_ID: Stdlib__Arg.Bad,
+              _1: "Ill-formed list of warnings"
+            });
       }
     };
   };
   const loop_letter_num = function (myset, i) {
     if (i >= s.length) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                MEL_EXN_ID: Stdlib__Arg.Bad,
-                _1: "Ill-formed list of warnings"
-              });
+            MEL_EXN_ID: Stdlib__Arg.Bad,
+            _1: "Ill-formed list of warnings"
+          });
     }
     const match = Caml_string.get(s, i);
     if (match >= 65) {
       if (match >= 97) {
         if (match >= 123) {
           throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                    MEL_EXN_ID: Stdlib__Arg.Bad,
-                    _1: "Ill-formed list of warnings"
-                  });
+                MEL_EXN_ID: Stdlib__Arg.Bad,
+                _1: "Ill-formed list of warnings"
+              });
         }
         Stdlib__List.iter(myset, letter(Caml_string.get(s, i)));
         return loop(i + 1 | 0);
       }
       if (match >= 91) {
         throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                  MEL_EXN_ID: Stdlib__Arg.Bad,
-                  _1: "Ill-formed list of warnings"
-                });
+              MEL_EXN_ID: Stdlib__Arg.Bad,
+              _1: "Ill-formed list of warnings"
+            });
       }
       Stdlib__List.iter(myset, letter(Stdlib__Char.lowercase_ascii(Caml_string.get(s, i))));
       return loop(i + 1 | 0);
     }
     if (match > 57 || match < 48) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                MEL_EXN_ID: Stdlib__Arg.Bad,
-                _1: "Ill-formed list of warnings"
-              });
+            MEL_EXN_ID: Stdlib__Arg.Bad,
+            _1: "Ill-formed list of warnings"
+          });
     }
     const match$1 = get_range(i);
     for (let n = match$1[1] ,n_finish = Caml.caml_int_min(match$1[2], 104); n <= n_finish; ++n) {
@@ -870,27 +870,27 @@ function message(s) {
             const lab = match.hd;
             if (match.tl) {
               return Stdlib__String.concat(" ", {
-                          hd: "the following methods are overridden by the class",
-                          tl: {
-                            hd: lab,
-                            tl: {
-                              hd: ":\n ",
-                              tl: match.tl
-                            }
-                          }
-                        });
+                    hd: "the following methods are overridden by the class",
+                    tl: {
+                      hd: lab,
+                      tl: {
+                        hd: ":\n ",
+                        tl: match.tl
+                      }
+                    }
+                  });
             } else {
               return "the method " + (lab + " is overridden.");
             }
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "warnings.ml",
-                      283,
-                      26
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "warnings.ml",
+                  283,
+                  26
+                ]
+              });
       case /* Partial_match */3 :
           const s$2 = s._0;
           if (s$2 === "") {
@@ -906,27 +906,27 @@ function message(s) {
             const lab$1 = match$1.hd;
             if (match$1.tl) {
               return Stdlib__String.concat(" ", {
-                          hd: "the following instance variables are overridden by the class",
-                          tl: {
-                            hd: lab$1,
-                            tl: {
-                              hd: ":\n ",
-                              tl: match$1.tl
-                            }
-                          }
-                        }) + "\nThe behaviour changed in ocaml 3.10 (previous behaviour was hiding.)";
+                    hd: "the following instance variables are overridden by the class",
+                    tl: {
+                      hd: lab$1,
+                      tl: {
+                        hd: ":\n ",
+                        tl: match$1.tl
+                      }
+                    }
+                  }) + "\nThe behaviour changed in ocaml 3.10 (previous behaviour was hiding.)";
             } else {
               return "the instance variable " + (lab$1 + " is overridden.\nThe behaviour changed in ocaml 3.10 (previous behaviour was hiding.)");
             }
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "warnings.ml",
-                      303,
-                      37
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "warnings.ml",
+                  303,
+                  37
+                ]
+              });
       case /* Implicit_public_methods */6 :
           return "the following private methods were made public implicitly:\n " + (Stdlib__String.concat(" ", s._0) + ".");
       case /* Undeclared_virtual_method */7 :
@@ -944,76 +944,76 @@ function message(s) {
           return "unused variable " + (s._0 + ".");
       case /* Duplicate_definitions */14 :
           return Curry._4(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "the ",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "the ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                              TAG: /* String_literal */11,
+                              _0: " is defined in both types ",
                               _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
                                 _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
+                                  TAG: /* String_literal */11,
+                                  _0: " and ",
                                   _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " is defined in both types ",
+                                    TAG: /* String */2,
+                                    _0: /* No_padding */0,
                                     _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: {
-                                        TAG: /* String_literal */11,
-                                        _0: " and ",
-                                        _1: {
-                                          TAG: /* String */2,
-                                          _0: /* No_padding */0,
-                                          _1: {
-                                            TAG: /* Char_literal */12,
-                                            _0: /* '.' */46,
-                                            _1: /* End_of_format */0
-                                          }
-                                        }
-                                      }
+                                      TAG: /* Char_literal */12,
+                                      _0: /* '.' */46,
+                                      _1: /* End_of_format */0
                                     }
                                   }
                                 }
                               }
                             }
-                          },
-                          _1: "the %s %s is defined in both types %s and %s."
-                        }), s._0, s._1, s._2, s._3);
+                          }
+                        }
+                      }
+                    },
+                    _1: "the %s %s is defined in both types %s and %s."
+                  }), s._0, s._1, s._2, s._3);
       case /* Multiple_definition */15 :
           return Curry._3(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "files ",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "files ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " and ",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                              TAG: /* String_literal */11,
+                              _0: " both define a module named ",
                               _1: {
-                                TAG: /* String_literal */11,
-                                _0: " and ",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " both define a module named ",
-                                    _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
+                                _1: /* End_of_format */0
                               }
                             }
-                          },
-                          _1: "files %s and %s both define a module named %s"
-                        }), s._1, s._2, s._0);
+                          }
+                        }
+                      }
+                    },
+                    _1: "files %s and %s both define a module named %s"
+                  }), s._1, s._2, s._0);
       case /* Unused_value_declaration */16 :
           return "unused value " + (s._0 + ".");
       case /* Unused_open */17 :
@@ -1052,13 +1052,13 @@ function message(s) {
             return "this record of type " + (ty + (" contains fields that are \nnot visible in the current scope: " + (Stdlib__String.concat(" ", slist) + ".\nThey will not be selected if the type becomes unknown.")));
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "warnings.ml",
-                      365,
-                      39
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "warnings.ml",
+                  365,
+                  39
+                ]
+              });
           break;
       case /* Ambiguous_name */24 :
           const slist$1 = s._0;
@@ -1069,13 +1069,13 @@ function message(s) {
             return "these field labels belong to several types: " + (Stdlib__String.concat(" ", s._1) + "\nThe first one was selected. Please disambiguate if this is wrong.");
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "warnings.ml",
-                      374,
-                      36
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "warnings.ml",
+                  374,
+                  36
+                ]
+              });
           break;
       case /* Disambiguated_name */25 :
           return "this use of " + (s._0 + " required disambiguation.");
@@ -1083,123 +1083,123 @@ function message(s) {
           return "the label " + (s._0 + " is not optional.");
       case /* Open_shadow_identifier */27 :
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "this open statement shadows the ",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "this open statement shadows the ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " identifier ",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: " identifier ",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " (which is later used)",
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* String_literal */11,
+                              _0: " (which is later used)",
+                              _1: /* End_of_format */0
                             }
-                          },
-                          _1: "this open statement shadows the %s identifier %s (which is later used)"
-                        }), s._0, s._1);
+                          }
+                        }
+                      }
+                    },
+                    _1: "this open statement shadows the %s identifier %s (which is later used)"
+                  }), s._0, s._1);
       case /* Open_shadow_label_constructor */28 :
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "this open statement shadows the ",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "this open statement shadows the ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " (which is later used)",
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* String_literal */11,
+                              _0: " (which is later used)",
+                              _1: /* End_of_format */0
                             }
-                          },
-                          _1: "this open statement shadows the %s %s (which is later used)"
-                        }), s._0, s._1);
+                          }
+                        }
+                      }
+                    },
+                    _1: "this open statement shadows the %s %s (which is later used)"
+                  }), s._0, s._1);
       case /* Bad_env_variable */29 :
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "illegal environment variable ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: " : ",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          },
-                          _1: "illegal environment variable %s : %s"
-                        }), s._0, s._1);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "illegal environment variable ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " : ",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "illegal environment variable %s : %s"
+                  }), s._0, s._1);
       case /* Attribute_payload */30 :
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "illegal payload for attribute '",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: "'.\n",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          },
-                          _1: "illegal payload for attribute '%s'.\n%s"
-                        }), s._0, s._1);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "illegal payload for attribute '",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: "'.\n",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "illegal payload for attribute '%s'.\n%s"
+                  }), s._0, s._1);
       case /* Eliminated_optional_arguments */31 :
           const sl = s._0;
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "implicit elimination of optional argument",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          },
-                          _1: "implicit elimination of optional argument%s %s"
-                        }), Stdlib__List.length(sl) === 1 ? "" : "s", Stdlib__String.concat(", ", sl));
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "implicit elimination of optional argument",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "implicit elimination of optional argument%s %s"
+                  }), Stdlib__List.length(sl) === 1 ? "" : "s", Stdlib__String.concat(", ", sl));
       case /* No_cmi_file */32 :
           return "no cmi file was found in path for module " + s._0;
       case /* Bad_docstring */33 :
@@ -1267,44 +1267,44 @@ function in_file(name) {
     pos_cnum: -1
   };
   return {
-          loc_start: loc,
-          loc_end: loc,
-          loc_ghost: true
-        };
+    loc_start: loc,
+    loc_end: loc,
+    loc_ghost: true
+  };
 }
 
 const none = in_file("_none_");
 
 function curr(lexbuf) {
   return {
-          loc_start: lexbuf.lex_start_p,
-          loc_end: lexbuf.lex_curr_p,
-          loc_ghost: false
-        };
+    loc_start: lexbuf.lex_start_p,
+    loc_end: lexbuf.lex_curr_p,
+    loc_ghost: false
+  };
 }
 
 function symbol_rloc(param) {
   return {
-          loc_start: Stdlib__Parsing.symbol_start_pos(undefined),
-          loc_end: Stdlib__Parsing.symbol_end_pos(undefined),
-          loc_ghost: false
-        };
+    loc_start: Stdlib__Parsing.symbol_start_pos(undefined),
+    loc_end: Stdlib__Parsing.symbol_end_pos(undefined),
+    loc_ghost: false
+  };
 }
 
 function symbol_gloc(param) {
   return {
-          loc_start: Stdlib__Parsing.symbol_start_pos(undefined),
-          loc_end: Stdlib__Parsing.symbol_end_pos(undefined),
-          loc_ghost: true
-        };
+    loc_start: Stdlib__Parsing.symbol_start_pos(undefined),
+    loc_end: Stdlib__Parsing.symbol_end_pos(undefined),
+    loc_ghost: true
+  };
 }
 
 function rhs_loc(n) {
   return {
-          loc_start: Stdlib__Parsing.rhs_start_pos(n),
-          loc_end: Stdlib__Parsing.rhs_end_pos(n),
-          loc_ghost: false
-        };
+    loc_start: Stdlib__Parsing.rhs_start_pos(n),
+    loc_end: Stdlib__Parsing.rhs_end_pos(n),
+    loc_ghost: false
+  };
 }
 
 const input_name = {
@@ -1328,8 +1328,8 @@ function highlight_terminfo(ppf, num_lines, lb, locs) {
   const pos0 = -lb.lex_abs_pos | 0;
   if (pos0 < 0) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-              MEL_EXN_ID: Stdlib.Exit
-            });
+          MEL_EXN_ID: Stdlib.Exit
+        });
   }
   let lines = num_loc_lines.contents;
   for (let i = pos0 ,i_finish = lb.lex_buffer_len; i < i_finish; ++i) {
@@ -1340,8 +1340,8 @@ function highlight_terminfo(ppf, num_lines, lb, locs) {
   }
   if (lines >= (num_lines - 2 | 0)) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-              MEL_EXN_ID: Stdlib.Exit
-            });
+          MEL_EXN_ID: Stdlib.Exit
+        });
   }
   Caml_io.caml_ml_flush(Stdlib.stdout);
   Caml_external_polyfill.resolve("caml_terminfo_backup")(lines);
@@ -1375,8 +1375,8 @@ function highlight_dumb(ppf, lb, loc) {
   const pos0 = -lb.lex_abs_pos | 0;
   if (pos0 < 0) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-              MEL_EXN_ID: Stdlib.Exit
-            });
+          MEL_EXN_ID: Stdlib.Exit
+        });
   }
   const end_pos = (lb.lex_buffer_len - pos0 | 0) - 1 | 0;
   let line_start = 0;
@@ -1597,10 +1597,10 @@ function print_filename(ppf, file) {
 
 function get_pos_info(pos) {
   return [
-          pos.pos_fname,
-          pos.pos_lnum,
-          pos.pos_cnum - pos.pos_bol | 0
-        ];
+    pos.pos_fname,
+    pos.pos_lnum,
+    pos.pos_cnum - pos.pos_bol | 0
+  ];
 }
 
 function print_loc(ppf, loc) {
@@ -1618,30 +1618,30 @@ function print_loc(ppf, loc) {
       return ;
     } else {
       return Curry._2(Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Characters ",
-                        _1: {
-                          TAG: /* Int */4,
-                          _0: /* Int_i */3,
-                          _1: /* No_padding */0,
-                          _2: /* No_precision */0,
-                          _3: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '-' */45,
-                            _1: {
-                              TAG: /* Int */4,
-                              _0: /* Int_i */3,
-                              _1: /* No_padding */0,
-                              _2: /* No_precision */0,
-                              _3: /* End_of_format */0
-                            }
-                          }
-                        }
-                      },
-                      _1: "Characters %i-%i"
-                    }), loc.loc_start.pos_cnum, loc.loc_end.pos_cnum);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Characters ",
+                  _1: {
+                    TAG: /* Int */4,
+                    _0: /* Int_i */3,
+                    _1: /* No_padding */0,
+                    _2: /* No_precision */0,
+                    _3: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '-' */45,
+                      _1: {
+                        TAG: /* Int */4,
+                        _0: /* Int_i */3,
+                        _1: /* No_padding */0,
+                        _2: /* No_precision */0,
+                        _3: /* End_of_format */0
+                      }
+                    }
+                  }
+                },
+                _1: "Characters %i-%i"
+              }), loc.loc_start.pos_cnum, loc.loc_end.pos_cnum);
     }
   } else {
     Curry._5(Stdlib__Format.fprintf(ppf)({
@@ -1709,14 +1709,14 @@ function print_loc(ppf, loc) {
               }), ", characters ", startchar$1, "-", endchar);
     }
     return Stdlib__Format.fprintf(ppf)({
-                TAG: /* Format */0,
-                _0: {
-                  TAG: /* Formatting_lit */17,
-                  _0: /* Close_tag */1,
-                  _1: /* End_of_format */0
-                },
-                _1: "@}"
-              });
+          TAG: /* Format */0,
+          _0: {
+            TAG: /* Formatting_lit */17,
+            _0: /* Close_tag */1,
+            _1: /* End_of_format */0
+          },
+          _1: "@}"
+        });
   }
 }
 
@@ -1729,40 +1729,40 @@ function print$1(ppf, loc) {
     return ;
   } else {
     return Curry._3(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Formatting_gen */18,
-                      _0: {
-                        TAG: /* Open_tag */0,
-                        _0: {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "<loc>",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "<loc>"
-                        }
-                      },
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_gen */18,
+                _0: {
+                  TAG: /* Open_tag */0,
+                  _0: {
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "<loc>",
+                      _1: /* End_of_format */0
+                    },
+                    _1: "<loc>"
+                  }
+                },
+                _1: {
+                  TAG: /* Alpha */15,
+                  _0: {
+                    TAG: /* Formatting_lit */17,
+                    _0: /* Close_tag */1,
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
                       _1: {
-                        TAG: /* Alpha */15,
-                        _0: {
-                          TAG: /* Formatting_lit */17,
-                          _0: /* Close_tag */1,
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: /* Flush_newline */4,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        }
+                        TAG: /* Formatting_lit */17,
+                        _0: /* Flush_newline */4,
+                        _1: /* End_of_format */0
                       }
-                    },
-                    _1: "@{<loc>%a@}%s@."
-                  }), print_loc, loc, ":");
+                    }
+                  }
+                }
+              },
+              _1: "@{<loc>%a@}%s@."
+            }), print_loc, loc, ":");
   }
 }
 
@@ -1810,44 +1810,44 @@ function default_warning_printer(loc, ppf, w) {
     Curry._1(Misc_Color.setup, color.contents);
     print$1(ppf, loc);
     return Curry._3(Stdlib__Format.fprintf(ppf)({
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_gen */18,
+                _0: {
+                  TAG: /* Open_tag */0,
+                  _0: {
                     TAG: /* Format */0,
                     _0: {
-                      TAG: /* Formatting_gen */18,
-                      _0: {
-                        TAG: /* Open_tag */0,
-                        _0: {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "<warning>",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "<warning>"
-                        }
-                      },
+                      TAG: /* String_literal */11,
+                      _0: "<warning>",
+                      _1: /* End_of_format */0
+                    },
+                    _1: "<warning>"
+                  }
+                },
+                _1: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* Formatting_lit */17,
+                    _0: /* Close_tag */1,
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
                       _1: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
+                        TAG: /* Alpha */15,
+                        _0: {
                           TAG: /* Formatting_lit */17,
-                          _0: /* Close_tag */1,
-                          _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ' ' */32,
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Formatting_lit */17,
-                                _0: /* Flush_newline */4,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
+                          _0: /* Flush_newline */4,
+                          _1: /* End_of_format */0
                         }
                       }
-                    },
-                    _1: "@{<warning>%s@} %a@."
-                  }), "Warning", print, w);
+                    }
+                  }
+                }
+              },
+              _1: "@{<warning>%s@} %a@."
+            }), "Warning", print, w);
   }
   
 }
@@ -1907,11 +1907,11 @@ function errorf(locOpt, subOpt, if_highlightOpt, fmt) {
   let before = print_phanton_error_prefix;
   const k = function (msg) {
     return {
-            loc: loc,
-            msg: msg,
-            sub: sub,
-            if_highlight: if_highlight
-          };
+      loc: loc,
+      msg: msg,
+      sub: sub,
+      if_highlight: if_highlight
+    };
   };
   const buf = Stdlib__Buffer.create(64);
   const ppf = Stdlib__Format.formatter_of_buffer(buf);
@@ -1920,9 +1920,9 @@ function errorf(locOpt, subOpt, if_highlightOpt, fmt) {
     Curry._1(before, ppf);
   }
   return Stdlib__Format.kfprintf((function (param) {
-                Stdlib__Format.pp_print_flush(ppf, undefined);
-                return Curry._1(k, Stdlib__Buffer.contents(buf));
-              }), ppf, fmt);
+          Stdlib__Format.pp_print_flush(ppf, undefined);
+          return Curry._1(k, Stdlib__Buffer.contents(buf));
+        }), ppf, fmt);
 }
 
 const error_of_exn = {
@@ -1938,54 +1938,54 @@ function register_error_of_exn(f) {
 
 function error_of_printer(loc, print, x) {
   return Curry._2(errorf(loc, undefined, undefined, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Alpha */15,
-                    _0: {
-                      TAG: /* Formatting_lit */17,
-                      _0: /* FFlush */2,
-                      _1: /* End_of_format */0
-                    }
-                  },
-                  _1: "%a@?"
-                }), print, x);
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Alpha */15,
+              _0: {
+                TAG: /* Formatting_lit */17,
+                _0: /* FFlush */2,
+                _1: /* End_of_format */0
+              }
+            },
+            _1: "%a@?"
+          }), print, x);
 }
 
 register_error_of_exn(function (msg) {
       if (msg.MEL_EXN_ID === Stdlib.Sys_error) {
         return Curry._1(errorf(in_file(input_name.contents), undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "I/O error: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "I/O error: %s"
-                      }), msg._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "I/O error: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "I/O error: %s"
+                }), msg._1);
       } else if (msg.MEL_EXN_ID === Errors) {
         return Curry._1(errorf(in_file(input_name.contents), undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Some fatal warnings were triggered (",
-                          _1: {
-                            TAG: /* Int */4,
-                            _0: /* Int_d */0,
-                            _1: /* No_padding */0,
-                            _2: /* No_precision */0,
-                            _3: {
-                              TAG: /* String_literal */11,
-                              _0: " occurrences)",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "Some fatal warnings were triggered (%d occurrences)"
-                      }), msg._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Some fatal warnings were triggered (",
+                    _1: {
+                      TAG: /* Int */4,
+                      _0: /* Int_d */0,
+                      _1: /* No_padding */0,
+                      _2: /* No_precision */0,
+                      _3: {
+                        TAG: /* String_literal */11,
+                        _0: " occurrences)",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Some fatal warnings were triggered (%d occurrences)"
+                }), msg._1);
       } else {
         return ;
       }
@@ -2044,54 +2044,54 @@ function from_pair_suites(name, suites) {
     if (is_mocha(undefined)) {
       describe(name, (function () {
               return Stdlib__List.iter((function (param) {
-                            const code = param[1];
-                            it(param[0], (function () {
-                                    let spec = Curry._1(code, undefined);
-                                    switch (spec.TAG) {
-                                      case /* Eq */0 :
-                                          Assert.deepEqual(spec._0, spec._1);
-                                          return ;
-                                      case /* Neq */1 :
-                                          Assert.notDeepEqual(spec._0, spec._1);
-                                          return ;
-                                      case /* StrictEq */2 :
-                                          Assert.strictEqual(spec._0, spec._1);
-                                          return ;
-                                      case /* StrictNeq */3 :
-                                          Assert.notStrictEqual(spec._0, spec._1);
-                                          return ;
-                                      case /* Ok */4 :
-                                          Assert.ok(spec._0);
-                                          return ;
-                                      case /* Approx */5 :
-                                          const b = spec._1;
-                                          const a = spec._0;
-                                          if (!close_enough(undefined, a, b)) {
-                                            Assert.deepEqual(a, b);
-                                            return ;
-                                          } else {
-                                            return ;
-                                          }
-                                      case /* ApproxThreshold */6 :
-                                          const b$1 = spec._2;
-                                          const a$1 = spec._1;
-                                          if (!close_enough(spec._0, a$1, b$1)) {
-                                            Assert.deepEqual(a$1, b$1);
-                                            return ;
-                                          } else {
-                                            return ;
-                                          }
-                                      case /* ThrowAny */7 :
-                                          Assert.throws(spec._0);
-                                          return ;
-                                      case /* Fail */8 :
-                                          return assert_fail("failed");
-                                      case /* FailWith */9 :
-                                          return assert_fail(spec._0);
-                                      
+                      const code = param[1];
+                      it(param[0], (function () {
+                              let spec = Curry._1(code, undefined);
+                              switch (spec.TAG) {
+                                case /* Eq */0 :
+                                    Assert.deepEqual(spec._0, spec._1);
+                                    return ;
+                                case /* Neq */1 :
+                                    Assert.notDeepEqual(spec._0, spec._1);
+                                    return ;
+                                case /* StrictEq */2 :
+                                    Assert.strictEqual(spec._0, spec._1);
+                                    return ;
+                                case /* StrictNeq */3 :
+                                    Assert.notStrictEqual(spec._0, spec._1);
+                                    return ;
+                                case /* Ok */4 :
+                                    Assert.ok(spec._0);
+                                    return ;
+                                case /* Approx */5 :
+                                    const b = spec._1;
+                                    const a = spec._0;
+                                    if (!close_enough(undefined, a, b)) {
+                                      Assert.deepEqual(a, b);
+                                      return ;
+                                    } else {
+                                      return ;
                                     }
-                                  }));
-                          }), suites);
+                                case /* ApproxThreshold */6 :
+                                    const b$1 = spec._2;
+                                    const a$1 = spec._1;
+                                    if (!close_enough(spec._0, a$1, b$1)) {
+                                      Assert.deepEqual(a$1, b$1);
+                                      return ;
+                                    } else {
+                                      return ;
+                                    }
+                                case /* ThrowAny */7 :
+                                    Assert.throws(spec._0);
+                                    return ;
+                                case /* Fail */8 :
+                                    return assert_fail("failed");
+                                case /* FailWith */9 :
+                                    return assert_fail(spec._0);
+                                
+                              }
+                            }));
+                    }), suites);
             }));
       return ;
     } else {
@@ -2100,78 +2100,78 @@ function from_pair_suites(name, suites) {
             "testing"
           ]);
       return Stdlib__List.iter((function (param) {
-                    const name = param[0];
-                    const fn = Curry._1(param[1], undefined);
-                    switch (fn.TAG) {
-                      case /* Eq */0 :
-                          console.log([
-                                name,
-                                fn._0,
-                                "eq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case /* Neq */1 :
-                          console.log([
-                                name,
-                                fn._0,
-                                "neq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case /* StrictEq */2 :
-                          console.log([
-                                name,
-                                fn._0,
-                                "strict_eq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case /* StrictNeq */3 :
-                          console.log([
-                                name,
-                                fn._0,
-                                "strict_neq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case /* Ok */4 :
-                          console.log([
-                                name,
-                                fn._0,
-                                "ok?"
-                              ]);
-                          return ;
-                      case /* Approx */5 :
-                          console.log([
-                                name,
-                                fn._0,
-                                "~",
-                                fn._1
-                              ]);
-                          return ;
-                      case /* ApproxThreshold */6 :
-                          console.log([
-                                name,
-                                fn._1,
-                                "~",
-                                fn._2,
-                                " (",
-                                fn._0,
-                                ")"
-                              ]);
-                          return ;
-                      case /* ThrowAny */7 :
-                          return ;
-                      case /* Fail */8 :
-                          console.log("failed");
-                          return ;
-                      case /* FailWith */9 :
-                          console.log("failed: " + fn._0);
-                          return ;
-                      
-                    }
-                  }), suites);
+              const name = param[0];
+              const fn = Curry._1(param[1], undefined);
+              switch (fn.TAG) {
+                case /* Eq */0 :
+                    console.log([
+                          name,
+                          fn._0,
+                          "eq?",
+                          fn._1
+                        ]);
+                    return ;
+                case /* Neq */1 :
+                    console.log([
+                          name,
+                          fn._0,
+                          "neq?",
+                          fn._1
+                        ]);
+                    return ;
+                case /* StrictEq */2 :
+                    console.log([
+                          name,
+                          fn._0,
+                          "strict_eq?",
+                          fn._1
+                        ]);
+                    return ;
+                case /* StrictNeq */3 :
+                    console.log([
+                          name,
+                          fn._0,
+                          "strict_neq?",
+                          fn._1
+                        ]);
+                    return ;
+                case /* Ok */4 :
+                    console.log([
+                          name,
+                          fn._0,
+                          "ok?"
+                        ]);
+                    return ;
+                case /* Approx */5 :
+                    console.log([
+                          name,
+                          fn._0,
+                          "~",
+                          fn._1
+                        ]);
+                    return ;
+                case /* ApproxThreshold */6 :
+                    console.log([
+                          name,
+                          fn._1,
+                          "~",
+                          fn._2,
+                          " (",
+                          fn._0,
+                          ")"
+                        ]);
+                    return ;
+                case /* ThrowAny */7 :
+                    return ;
+                case /* Fail */8 :
+                    console.log("failed");
+                    return ;
+                case /* FailWith */9 :
+                    console.log("failed: " + fn._0);
+                    return ;
+                
+              }
+            }), suites);
     }
   }
   
@@ -2189,31 +2189,31 @@ function warn_bad_docstrings(param) {
           _0: true
         })) {
     return Stdlib__List.iter((function (ds) {
-                  const match = ds.ds_attached;
-                  switch (match) {
-                    case /* Unattached */0 :
-                        return prerr_warning(ds.ds_loc, {
-                                    TAG: /* Bad_docstring */33,
-                                    _0: true
-                                  });
-                    case /* Info */1 :
+            const match = ds.ds_attached;
+            switch (match) {
+              case /* Unattached */0 :
+                  return prerr_warning(ds.ds_loc, {
+                        TAG: /* Bad_docstring */33,
+                        _0: true
+                      });
+              case /* Info */1 :
+                  return ;
+              case /* Docs */2 :
+                  const match$1 = ds.ds_associated;
+                  switch (match$1) {
+                    case /* Zero */0 :
+                    case /* One */1 :
                         return ;
-                    case /* Docs */2 :
-                        const match$1 = ds.ds_associated;
-                        switch (match$1) {
-                          case /* Zero */0 :
-                          case /* One */1 :
-                              return ;
-                          case /* Many */2 :
-                              return prerr_warning(ds.ds_loc, {
-                                          TAG: /* Bad_docstring */33,
-                                          _0: false
-                                        });
-                          
-                        }
+                    case /* Many */2 :
+                        return prerr_warning(ds.ds_loc, {
+                              TAG: /* Bad_docstring */33,
+                              _0: false
+                            });
                     
                   }
-                }), Stdlib__List.rev(docstrings.contents));
+              
+            }
+          }), Stdlib__List.rev(docstrings.contents));
   }
   
 }
@@ -2268,29 +2268,29 @@ function docs_attr(ds) {
     pstr_loc: item_pstr_loc
   };
   return [
-          doc_loc,
-          {
-            TAG: /* PStr */0,
-            _0: {
-              hd: item,
-              tl: /* [] */0
-            }
-          }
-        ];
+    doc_loc,
+    {
+      TAG: /* PStr */0,
+      _0: {
+        hd: item,
+        tl: /* [] */0
+      }
+    }
+  ];
 }
 
 function add_docs_attrs(docs, attrs) {
   const ds = docs.docs_pre;
   const attrs$1 = ds !== undefined ? ({
-        hd: docs_attr(ds),
-        tl: attrs
-      }) : attrs;
+      hd: docs_attr(ds),
+      tl: attrs
+    }) : attrs;
   const ds$1 = docs.docs_post;
   if (ds$1 !== undefined) {
     return Stdlib.$at(attrs$1, {
-                hd: docs_attr(ds$1),
-                tl: /* [] */0
-              });
+          hd: docs_attr(ds$1),
+          tl: /* [] */0
+        });
   } else {
     return attrs$1;
   }
@@ -2299,9 +2299,9 @@ function add_docs_attrs(docs, attrs) {
 function add_info_attrs(info, attrs) {
   if (info !== undefined) {
     return Stdlib.$at(attrs, {
-                hd: docs_attr(info),
-                tl: /* [] */0
-              });
+          hd: docs_attr(info),
+          tl: /* [] */0
+        });
   } else {
     return attrs;
   }
@@ -2338,15 +2338,15 @@ function text_attr(ds) {
     pstr_loc: item_pstr_loc
   };
   return [
-          text_loc,
-          {
-            TAG: /* PStr */0,
-            _0: {
-              hd: item,
-              tl: /* [] */0
-            }
-          }
-        ];
+    text_loc,
+    {
+      TAG: /* PStr */0,
+      _0: {
+        hd: item,
+        tl: /* [] */0
+      }
+    }
+  ];
 }
 
 function add_text_attrs(dsl, attrs) {
@@ -2578,23 +2578,23 @@ function get_post_extra_text(pos) {
 
 function symbol_docs(param) {
   return {
-          docs_pre: get_pre_docs(Stdlib__Parsing.symbol_start_pos(undefined)),
-          docs_post: get_post_docs(Stdlib__Parsing.symbol_end_pos(undefined))
-        };
+    docs_pre: get_pre_docs(Stdlib__Parsing.symbol_start_pos(undefined)),
+    docs_post: get_post_docs(Stdlib__Parsing.symbol_end_pos(undefined))
+  };
 }
 
 function symbol_docs_lazy(param) {
   const p1 = Stdlib__Parsing.symbol_start_pos(undefined);
   const p2 = Stdlib__Parsing.symbol_end_pos(undefined);
   return {
-          LAZY_DONE: false,
-          VAL: (function () {
-              return {
-                      docs_pre: get_pre_docs(p1),
-                      docs_post: get_post_docs(p2)
-                    };
-            })
+    LAZY_DONE: false,
+    VAL: (function () {
+        return {
+          docs_pre: get_pre_docs(p1),
+          docs_post: get_post_docs(p2)
         };
+      })
+  };
 }
 
 function mark_symbol_docs(param) {
@@ -2610,11 +2610,11 @@ function mark_rhs_docs(pos1, pos2) {
 function symbol_text_lazy(param) {
   const pos = Stdlib__Parsing.symbol_start_pos(undefined);
   return {
-          LAZY_DONE: false,
-          VAL: (function () {
-              return get_text(pos);
-            })
-        };
+    LAZY_DONE: false,
+    VAL: (function () {
+        return get_text(pos);
+      })
+  };
 }
 
 function init(param) {
@@ -2634,471 +2634,471 @@ function mk(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          ptyp_desc: d,
-          ptyp_loc: loc,
-          ptyp_attributes: attrs
-        };
+    ptyp_desc: d,
+    ptyp_loc: loc,
+    ptyp_attributes: attrs
+  };
 }
 
 function attr(d, a) {
   return {
-          ptyp_desc: d.ptyp_desc,
-          ptyp_loc: d.ptyp_loc,
-          ptyp_attributes: Stdlib.$at(d.ptyp_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    ptyp_desc: d.ptyp_desc,
+    ptyp_loc: d.ptyp_loc,
+    ptyp_attributes: Stdlib.$at(d.ptyp_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function mk$1(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          ppat_desc: d,
-          ppat_loc: loc,
-          ppat_attributes: attrs
-        };
+    ppat_desc: d,
+    ppat_loc: loc,
+    ppat_attributes: attrs
+  };
 }
 
 function attr$1(d, a) {
   return {
-          ppat_desc: d.ppat_desc,
-          ppat_loc: d.ppat_loc,
-          ppat_attributes: Stdlib.$at(d.ppat_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    ppat_desc: d.ppat_desc,
+    ppat_loc: d.ppat_loc,
+    ppat_attributes: Stdlib.$at(d.ppat_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function mk$2(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pexp_desc: d,
-          pexp_loc: loc,
-          pexp_attributes: attrs
-        };
+    pexp_desc: d,
+    pexp_loc: loc,
+    pexp_attributes: attrs
+  };
 }
 
 function attr$2(d, a) {
   return {
-          pexp_desc: d.pexp_desc,
-          pexp_loc: d.pexp_loc,
-          pexp_attributes: Stdlib.$at(d.pexp_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pexp_desc: d.pexp_desc,
+    pexp_loc: d.pexp_loc,
+    pexp_attributes: Stdlib.$at(d.pexp_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function ident(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_ident */0,
-              _0: a
-            });
+        TAG: /* Pexp_ident */0,
+        _0: a
+      });
 }
 
 function constant(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_constant */1,
-              _0: a
-            });
+        TAG: /* Pexp_constant */1,
+        _0: a
+      });
 }
 
 function let_(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_let */2,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_let */2,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function fun_(loc, attrs, a, b, c, d) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_fun */4,
-              _0: a,
-              _1: b,
-              _2: c,
-              _3: d
-            });
+        TAG: /* Pexp_fun */4,
+        _0: a,
+        _1: b,
+        _2: c,
+        _3: d
+      });
 }
 
 function function_(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_function */3,
-              _0: a
-            });
+        TAG: /* Pexp_function */3,
+        _0: a
+      });
 }
 
 function apply(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_apply */5,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_apply */5,
+        _0: a,
+        _1: b
+      });
 }
 
 function match_(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_match */6,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_match */6,
+        _0: a,
+        _1: b
+      });
 }
 
 function try_(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_try */7,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_try */7,
+        _0: a,
+        _1: b
+      });
 }
 
 function tuple(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_tuple */8,
-              _0: a
-            });
+        TAG: /* Pexp_tuple */8,
+        _0: a
+      });
 }
 
 function construct(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_construct */9,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_construct */9,
+        _0: a,
+        _1: b
+      });
 }
 
 function variant(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_variant */10,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_variant */10,
+        _0: a,
+        _1: b
+      });
 }
 
 function record(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_record */11,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_record */11,
+        _0: a,
+        _1: b
+      });
 }
 
 function field(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_field */12,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_field */12,
+        _0: a,
+        _1: b
+      });
 }
 
 function setfield(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_setfield */13,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_setfield */13,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function array(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_array */14,
-              _0: a
-            });
+        TAG: /* Pexp_array */14,
+        _0: a
+      });
 }
 
 function ifthenelse(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_ifthenelse */15,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_ifthenelse */15,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function sequence(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_sequence */16,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_sequence */16,
+        _0: a,
+        _1: b
+      });
 }
 
 function while_(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_while */17,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_while */17,
+        _0: a,
+        _1: b
+      });
 }
 
 function for_(loc, attrs, a, b, c, d, e) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_for */18,
-              _0: a,
-              _1: b,
-              _2: c,
-              _3: d,
-              _4: e
-            });
+        TAG: /* Pexp_for */18,
+        _0: a,
+        _1: b,
+        _2: c,
+        _3: d,
+        _4: e
+      });
 }
 
 function constraint_(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_constraint */19,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_constraint */19,
+        _0: a,
+        _1: b
+      });
 }
 
 function coerce(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_coerce */20,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_coerce */20,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function send(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_send */21,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_send */21,
+        _0: a,
+        _1: b
+      });
 }
 
 function new_(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_new */22,
-              _0: a
-            });
+        TAG: /* Pexp_new */22,
+        _0: a
+      });
 }
 
 function setinstvar(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_setinstvar */23,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_setinstvar */23,
+        _0: a,
+        _1: b
+      });
 }
 
 function override(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_override */24,
-              _0: a
-            });
+        TAG: /* Pexp_override */24,
+        _0: a
+      });
 }
 
 function letmodule(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_letmodule */25,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_letmodule */25,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function assert_(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_assert */26,
-              _0: a
-            });
+        TAG: /* Pexp_assert */26,
+        _0: a
+      });
 }
 
 function lazy_(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_lazy */27,
-              _0: a
-            });
+        TAG: /* Pexp_lazy */27,
+        _0: a
+      });
 }
 
 function poly(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_poly */28,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_poly */28,
+        _0: a,
+        _1: b
+      });
 }
 
 function object_(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_object */29,
-              _0: a
-            });
+        TAG: /* Pexp_object */29,
+        _0: a
+      });
 }
 
 function newtype(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_newtype */30,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_newtype */30,
+        _0: a,
+        _1: b
+      });
 }
 
 function pack(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_pack */31,
-              _0: a
-            });
+        TAG: /* Pexp_pack */31,
+        _0: a
+      });
 }
 
 function open_(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_open */32,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_open */32,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function extension(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_extension */33,
-              _0: a
-            });
+        TAG: /* Pexp_extension */33,
+        _0: a
+      });
 }
 
 function $$case(lhs, guard, rhs) {
   return {
-          pc_lhs: lhs,
-          pc_guard: guard,
-          pc_rhs: rhs
-        };
+    pc_lhs: lhs,
+    pc_guard: guard,
+    pc_rhs: rhs
+  };
 }
 
 function mk$3(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pmty_desc: d,
-          pmty_loc: loc,
-          pmty_attributes: attrs
-        };
+    pmty_desc: d,
+    pmty_loc: loc,
+    pmty_attributes: attrs
+  };
 }
 
 function attr$3(d, a) {
   return {
-          pmty_desc: d.pmty_desc,
-          pmty_loc: d.pmty_loc,
-          pmty_attributes: Stdlib.$at(d.pmty_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pmty_desc: d.pmty_desc,
+    pmty_loc: d.pmty_loc,
+    pmty_attributes: Stdlib.$at(d.pmty_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function alias(loc, attrs, a) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_alias */6,
-              _0: a
-            });
+        TAG: /* Pmty_alias */6,
+        _0: a
+      });
 }
 
 function mk$4(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pmod_desc: d,
-          pmod_loc: loc,
-          pmod_attributes: attrs
-        };
+    pmod_desc: d,
+    pmod_loc: loc,
+    pmod_attributes: attrs
+  };
 }
 
 function attr$4(d, a) {
   return {
-          pmod_desc: d.pmod_desc,
-          pmod_loc: d.pmod_loc,
-          pmod_attributes: Stdlib.$at(d.pmod_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pmod_desc: d.pmod_desc,
+    pmod_loc: d.pmod_loc,
+    pmod_attributes: Stdlib.$at(d.pmod_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function mk$5(locOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   return {
-          psig_desc: d,
-          psig_loc: loc
-        };
+    psig_desc: d,
+    psig_loc: loc
+  };
 }
 
 function text(txt) {
   return Stdlib__List.map((function (ds) {
-                const a = text_attr(ds);
-                const loc = ds.ds_loc;
-                return mk$5(loc, {
-                            TAG: /* Psig_attribute */11,
-                            _0: a
-                          });
-              }), txt);
+          const a = text_attr(ds);
+          const loc = ds.ds_loc;
+          return mk$5(loc, {
+                TAG: /* Psig_attribute */11,
+                _0: a
+              });
+        }), txt);
 }
 
 function mk$6(locOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   return {
-          pstr_desc: d,
-          pstr_loc: loc
-        };
+    pstr_desc: d,
+    pstr_loc: loc
+  };
 }
 
 function text$1(txt) {
   return Stdlib__List.map((function (ds) {
-                const a = text_attr(ds);
-                const loc = ds.ds_loc;
-                return mk$6(loc, {
-                            TAG: /* Pstr_attribute */13,
-                            _0: a
-                          });
-              }), txt);
+          const a = text_attr(ds);
+          const loc = ds.ds_loc;
+          return mk$6(loc, {
+                TAG: /* Pstr_attribute */13,
+                _0: a
+              });
+        }), txt);
 }
 
 function mk$7(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pcl_desc: d,
-          pcl_loc: loc,
-          pcl_attributes: attrs
-        };
+    pcl_desc: d,
+    pcl_loc: loc,
+    pcl_attributes: attrs
+  };
 }
 
 function attr$5(d, a) {
   return {
-          pcl_desc: d.pcl_desc,
-          pcl_loc: d.pcl_loc,
-          pcl_attributes: Stdlib.$at(d.pcl_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pcl_desc: d.pcl_desc,
+    pcl_loc: d.pcl_loc,
+    pcl_attributes: Stdlib.$at(d.pcl_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function mk$8(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pcty_desc: d,
-          pcty_loc: loc,
-          pcty_attributes: attrs
-        };
+    pcty_desc: d,
+    pcty_loc: loc,
+    pcty_attributes: attrs
+  };
 }
 
 function attr$6(d, a) {
   return {
-          pcty_desc: d.pcty_desc,
-          pcty_loc: d.pcty_loc,
-          pcty_attributes: Stdlib.$at(d.pcty_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pcty_desc: d.pcty_desc,
+    pcty_loc: d.pcty_loc,
+    pcty_attributes: Stdlib.$at(d.pcty_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function mk$9(locOpt, attrsOpt, docsOpt, d) {
@@ -3106,82 +3106,82 @@ function mk$9(locOpt, attrsOpt, docsOpt, d) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   return {
-          pctf_desc: d,
-          pctf_loc: loc,
-          pctf_attributes: add_docs_attrs(docs, attrs)
-        };
+    pctf_desc: d,
+    pctf_loc: loc,
+    pctf_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 function inherit_(loc, attrs, a) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_inherit */0,
-              _0: a
-            });
+        TAG: /* Pctf_inherit */0,
+        _0: a
+      });
 }
 
 function val_(loc, attrs, a, b, c, d) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_val */1,
-              _0: [
-                a,
-                b,
-                c,
-                d
-              ]
-            });
+        TAG: /* Pctf_val */1,
+        _0: [
+          a,
+          b,
+          c,
+          d
+        ]
+      });
 }
 
 function method_(loc, attrs, a, b, c, d) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_method */2,
-              _0: [
-                a,
-                b,
-                c,
-                d
-              ]
-            });
+        TAG: /* Pctf_method */2,
+        _0: [
+          a,
+          b,
+          c,
+          d
+        ]
+      });
 }
 
 function constraint_$1(loc, attrs, a, b) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_constraint */3,
-              _0: [
-                a,
-                b
-              ]
-            });
+        TAG: /* Pctf_constraint */3,
+        _0: [
+          a,
+          b
+        ]
+      });
 }
 
 function extension$1(loc, attrs, a) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_extension */5,
-              _0: a
-            });
+        TAG: /* Pctf_extension */5,
+        _0: a
+      });
 }
 
 function attribute(loc, a) {
   return mk$9(loc, undefined, undefined, {
-              TAG: /* Pctf_attribute */4,
-              _0: a
-            });
+        TAG: /* Pctf_attribute */4,
+        _0: a
+      });
 }
 
 function text$2(txt) {
   return Stdlib__List.map((function (ds) {
-                return attribute(ds.ds_loc, text_attr(ds));
-              }), txt);
+          return attribute(ds.ds_loc, text_attr(ds));
+        }), txt);
 }
 
 function attr$7(d, a) {
   return {
-          pctf_desc: d.pctf_desc,
-          pctf_loc: d.pctf_loc,
-          pctf_attributes: Stdlib.$at(d.pctf_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pctf_desc: d.pctf_desc,
+    pctf_loc: d.pctf_loc,
+    pctf_attributes: Stdlib.$at(d.pctf_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function mk$10(locOpt, attrsOpt, docsOpt, d) {
@@ -3189,104 +3189,104 @@ function mk$10(locOpt, attrsOpt, docsOpt, d) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   return {
-          pcf_desc: d,
-          pcf_loc: loc,
-          pcf_attributes: add_docs_attrs(docs, attrs)
-        };
+    pcf_desc: d,
+    pcf_loc: loc,
+    pcf_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 function inherit_$1(loc, attrs, a, b, c) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_inherit */0,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pcf_inherit */0,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function val_$1(loc, attrs, a, b, c) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_val */1,
-              _0: [
-                a,
-                b,
-                c
-              ]
-            });
+        TAG: /* Pcf_val */1,
+        _0: [
+          a,
+          b,
+          c
+        ]
+      });
 }
 
 function method_$1(loc, attrs, a, b, c) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_method */2,
-              _0: [
-                a,
-                b,
-                c
-              ]
-            });
+        TAG: /* Pcf_method */2,
+        _0: [
+          a,
+          b,
+          c
+        ]
+      });
 }
 
 function constraint_$2(loc, attrs, a, b) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_constraint */3,
-              _0: [
-                a,
-                b
-              ]
-            });
+        TAG: /* Pcf_constraint */3,
+        _0: [
+          a,
+          b
+        ]
+      });
 }
 
 function initializer_(loc, attrs, a) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_initializer */4,
-              _0: a
-            });
+        TAG: /* Pcf_initializer */4,
+        _0: a
+      });
 }
 
 function extension$2(loc, attrs, a) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_extension */6,
-              _0: a
-            });
+        TAG: /* Pcf_extension */6,
+        _0: a
+      });
 }
 
 function attribute$1(loc, a) {
   return mk$10(loc, undefined, undefined, {
-              TAG: /* Pcf_attribute */5,
-              _0: a
-            });
+        TAG: /* Pcf_attribute */5,
+        _0: a
+      });
 }
 
 function text$3(txt) {
   return Stdlib__List.map((function (ds) {
-                return attribute$1(ds.ds_loc, text_attr(ds));
-              }), txt);
+          return attribute$1(ds.ds_loc, text_attr(ds));
+        }), txt);
 }
 
 function virtual_(ct) {
   return {
-          TAG: /* Cfk_virtual */0,
-          _0: ct
-        };
+    TAG: /* Cfk_virtual */0,
+    _0: ct
+  };
 }
 
 function concrete(o, e) {
   return {
-          TAG: /* Cfk_concrete */1,
-          _0: o,
-          _1: e
-        };
+    TAG: /* Cfk_concrete */1,
+    _0: o,
+    _1: e
+  };
 }
 
 function attr$8(d, a) {
   return {
-          pcf_desc: d.pcf_desc,
-          pcf_loc: d.pcf_loc,
-          pcf_attributes: Stdlib.$at(d.pcf_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pcf_desc: d.pcf_desc,
+    pcf_loc: d.pcf_loc,
+    pcf_attributes: Stdlib.$at(d.pcf_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function mk$11(locOpt, attrsOpt, docsOpt, primOpt, name, typ) {
@@ -3295,12 +3295,12 @@ function mk$11(locOpt, attrsOpt, docsOpt, primOpt, name, typ) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const prim = primOpt !== undefined ? primOpt : /* [] */0;
   return {
-          pval_name: name,
-          pval_type: typ,
-          pval_prim: prim,
-          pval_attributes: add_docs_attrs(docs, attrs),
-          pval_loc: loc
-        };
+    pval_name: name,
+    pval_type: typ,
+    pval_prim: prim,
+    pval_attributes: add_docs_attrs(docs, attrs),
+    pval_loc: loc
+  };
 }
 
 function mk$12(locOpt, attrsOpt, docsOpt, textOpt, name, typ) {
@@ -3309,11 +3309,11 @@ function mk$12(locOpt, attrsOpt, docsOpt, textOpt, name, typ) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const text = textOpt !== undefined ? textOpt : /* [] */0;
   return {
-          pmd_name: name,
-          pmd_type: typ,
-          pmd_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          pmd_loc: loc
-        };
+    pmd_name: name,
+    pmd_type: typ,
+    pmd_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    pmd_loc: loc
+  };
 }
 
 function mk$13(locOpt, attrsOpt, docsOpt, textOpt, typ, name) {
@@ -3322,11 +3322,11 @@ function mk$13(locOpt, attrsOpt, docsOpt, textOpt, typ, name) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const text = textOpt !== undefined ? textOpt : /* [] */0;
   return {
-          pmtd_name: name,
-          pmtd_type: typ,
-          pmtd_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          pmtd_loc: loc
-        };
+    pmtd_name: name,
+    pmtd_type: typ,
+    pmtd_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    pmtd_loc: loc
+  };
 }
 
 function mk$14(locOpt, attrsOpt, docsOpt, textOpt, name, expr) {
@@ -3335,11 +3335,11 @@ function mk$14(locOpt, attrsOpt, docsOpt, textOpt, name, expr) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const text = textOpt !== undefined ? textOpt : /* [] */0;
   return {
-          pmb_name: name,
-          pmb_expr: expr,
-          pmb_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          pmb_loc: loc
-        };
+    pmb_name: name,
+    pmb_expr: expr,
+    pmb_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    pmb_loc: loc
+  };
 }
 
 function mk$15(locOpt, attrsOpt, docsOpt, overrideOpt, lid) {
@@ -3348,11 +3348,11 @@ function mk$15(locOpt, attrsOpt, docsOpt, overrideOpt, lid) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const override = overrideOpt !== undefined ? overrideOpt : /* Fresh */1;
   return {
-          popen_lid: lid,
-          popen_override: override,
-          popen_loc: loc,
-          popen_attributes: add_docs_attrs(docs, attrs)
-        };
+    popen_lid: lid,
+    popen_override: override,
+    popen_loc: loc,
+    popen_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 function mk$16(locOpt, attrsOpt, docsOpt, mexpr) {
@@ -3360,10 +3360,10 @@ function mk$16(locOpt, attrsOpt, docsOpt, mexpr) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   return {
-          pincl_mod: mexpr,
-          pincl_loc: loc,
-          pincl_attributes: add_docs_attrs(docs, attrs)
-        };
+    pincl_mod: mexpr,
+    pincl_loc: loc,
+    pincl_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 function mk$17(locOpt, attrsOpt, docsOpt, textOpt, pat, expr) {
@@ -3372,11 +3372,11 @@ function mk$17(locOpt, attrsOpt, docsOpt, textOpt, pat, expr) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const text = textOpt !== undefined ? textOpt : /* [] */0;
   return {
-          pvb_pat: pat,
-          pvb_expr: expr,
-          pvb_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          pvb_loc: loc
-        };
+    pvb_pat: pat,
+    pvb_expr: expr,
+    pvb_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    pvb_loc: loc
+  };
 }
 
 function mk$18(locOpt, attrsOpt, docsOpt, textOpt, virtOpt, paramsOpt, name, expr) {
@@ -3387,13 +3387,13 @@ function mk$18(locOpt, attrsOpt, docsOpt, textOpt, virtOpt, paramsOpt, name, exp
   const virt = virtOpt !== undefined ? virtOpt : /* Concrete */1;
   const params = paramsOpt !== undefined ? paramsOpt : /* [] */0;
   return {
-          pci_virt: virt,
-          pci_params: params,
-          pci_name: name,
-          pci_expr: expr,
-          pci_loc: loc,
-          pci_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs))
-        };
+    pci_virt: virt,
+    pci_params: params,
+    pci_name: name,
+    pci_expr: expr,
+    pci_loc: loc,
+    pci_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs))
+  };
 }
 
 function mk$19(locOpt, attrsOpt, docsOpt, textOpt, paramsOpt, cstrsOpt, kindOpt, privOpt, manifest, name) {
@@ -3406,15 +3406,15 @@ function mk$19(locOpt, attrsOpt, docsOpt, textOpt, paramsOpt, cstrsOpt, kindOpt,
   const kind = kindOpt !== undefined ? kindOpt : /* Ptype_abstract */0;
   const priv = privOpt !== undefined ? privOpt : /* Public */1;
   return {
-          ptype_name: name,
-          ptype_params: params,
-          ptype_cstrs: cstrs,
-          ptype_kind: kind,
-          ptype_private: priv,
-          ptype_manifest: manifest,
-          ptype_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          ptype_loc: loc
-        };
+    ptype_name: name,
+    ptype_params: params,
+    ptype_cstrs: cstrs,
+    ptype_kind: kind,
+    ptype_private: priv,
+    ptype_manifest: manifest,
+    ptype_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    ptype_loc: loc
+  };
 }
 
 function constructor(locOpt, attrsOpt, infoOpt, argsOpt, res, name) {
@@ -3423,12 +3423,12 @@ function constructor(locOpt, attrsOpt, infoOpt, argsOpt, res, name) {
   const info = infoOpt !== undefined ? Caml_option.valFromOption(infoOpt) : undefined;
   const args = argsOpt !== undefined ? argsOpt : /* [] */0;
   return {
-          pcd_name: name,
-          pcd_args: args,
-          pcd_res: res,
-          pcd_loc: loc,
-          pcd_attributes: add_info_attrs(info, attrs)
-        };
+    pcd_name: name,
+    pcd_args: args,
+    pcd_res: res,
+    pcd_loc: loc,
+    pcd_attributes: add_info_attrs(info, attrs)
+  };
 }
 
 function field$1(locOpt, attrsOpt, infoOpt, mutOpt, name, typ) {
@@ -3437,12 +3437,12 @@ function field$1(locOpt, attrsOpt, infoOpt, mutOpt, name, typ) {
   const info = infoOpt !== undefined ? Caml_option.valFromOption(infoOpt) : undefined;
   const mut = mutOpt !== undefined ? mutOpt : /* Immutable */0;
   return {
-          pld_name: name,
-          pld_mutable: mut,
-          pld_type: typ,
-          pld_loc: loc,
-          pld_attributes: add_info_attrs(info, attrs)
-        };
+    pld_name: name,
+    pld_mutable: mut,
+    pld_type: typ,
+    pld_loc: loc,
+    pld_attributes: add_info_attrs(info, attrs)
+  };
 }
 
 function mk$20(attrsOpt, docsOpt, paramsOpt, privOpt, path, constructors) {
@@ -3451,12 +3451,12 @@ function mk$20(attrsOpt, docsOpt, paramsOpt, privOpt, path, constructors) {
   const params = paramsOpt !== undefined ? paramsOpt : /* [] */0;
   const priv = privOpt !== undefined ? privOpt : /* Public */1;
   return {
-          ptyext_path: path,
-          ptyext_params: params,
-          ptyext_constructors: constructors,
-          ptyext_private: priv,
-          ptyext_attributes: add_docs_attrs(docs, attrs)
-        };
+    ptyext_path: path,
+    ptyext_params: params,
+    ptyext_constructors: constructors,
+    ptyext_private: priv,
+    ptyext_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 function decl(locOpt, attrsOpt, docsOpt, infoOpt, argsOpt, res, name) {
@@ -3466,15 +3466,15 @@ function decl(locOpt, attrsOpt, docsOpt, infoOpt, argsOpt, res, name) {
   const info = infoOpt !== undefined ? Caml_option.valFromOption(infoOpt) : undefined;
   const args = argsOpt !== undefined ? argsOpt : /* [] */0;
   return {
-          pext_name: name,
-          pext_kind: {
-            TAG: /* Pext_decl */0,
-            _0: args,
-            _1: res
-          },
-          pext_loc: loc,
-          pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
-        };
+    pext_name: name,
+    pext_kind: {
+      TAG: /* Pext_decl */0,
+      _0: args,
+      _1: res
+    },
+    pext_loc: loc,
+    pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
+  };
 }
 
 function rebind(locOpt, attrsOpt, docsOpt, infoOpt, name, lid) {
@@ -3483,14 +3483,14 @@ function rebind(locOpt, attrsOpt, docsOpt, infoOpt, name, lid) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const info = infoOpt !== undefined ? Caml_option.valFromOption(infoOpt) : undefined;
   return {
-          pext_name: name,
-          pext_kind: {
-            TAG: /* Pext_rebind */1,
-            _0: lid
-          },
-          pext_loc: loc,
-          pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
-        };
+    pext_name: name,
+    pext_kind: {
+      TAG: /* Pext_rebind */1,
+      _0: lid
+    },
+    pext_loc: loc,
+    pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
+  };
 }
 
 const Ast_helper_Exp = {
@@ -3570,162 +3570,162 @@ function prepare_error(loc) {
         const closing = loc._3;
         const opening = loc._1;
         return Curry._1(errorf(loc._2, {
-                        hd: Curry._1(errorf(loc._0, undefined, undefined, {
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* String_literal */11,
-                                    _0: "This '",
-                                    _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: {
-                                        TAG: /* String_literal */11,
-                                        _0: "' might be unmatched",
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  },
-                                  _1: "This '%s' might be unmatched"
-                                }), opening),
-                        tl: /* [] */0
-                      }, Curry._2(Stdlib__Printf.sprintf({
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "Syntax error: '",
-                                  _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: {
-                                      TAG: /* String_literal */11,
-                                      _0: "' expected, the highlighted '",
-                                      _1: {
-                                        TAG: /* String */2,
-                                        _0: /* No_padding */0,
-                                        _1: {
-                                          TAG: /* String_literal */11,
-                                          _0: "' might be unmatched",
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
-                                  }
-                                },
-                                _1: "Syntax error: '%s' expected, the highlighted '%s' might be unmatched"
-                              }), closing, opening), {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Syntax error: '",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: "' expected",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "Syntax error: '%s' expected"
-                      }), closing);
-    case /* Expecting */1 :
-        return Curry._1(errorf(loc._0, undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Syntax error: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: " expected.",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "Syntax error: %s expected."
-                      }), loc._1);
-    case /* Not_expecting */2 :
-        return Curry._1(errorf(loc._0, undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Syntax error: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: " not expected.",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "Syntax error: %s not expected."
-                      }), loc._1);
-    case /* Applicative_path */3 :
-        return errorf(loc._0, undefined, undefined, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "Syntax error: applicative paths of the form F(X).t are not supported when the option -no-app-func is set.",
-                      _1: /* End_of_format */0
-                    },
-                    _1: "Syntax error: applicative paths of the form F(X).t are not supported when the option -no-app-func is set."
-                  });
-    case /* Variable_in_scope */4 :
-        const $$var = loc._1;
-        return Curry._2(errorf(loc._0, undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "In this scoped type, variable '",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
+                  hd: Curry._1(errorf(loc._0, undefined, undefined, {
+                            TAG: /* Format */0,
+                            _0: {
                               TAG: /* String_literal */11,
-                              _0: " is reserved for the local type ",
+                              _0: "This '",
                               _1: {
                                 TAG: /* String */2,
                                 _0: /* No_padding */0,
                                 _1: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* '.' */46,
+                                  TAG: /* String_literal */11,
+                                  _0: "' might be unmatched",
                                   _1: /* End_of_format */0
                                 }
                               }
+                            },
+                            _1: "This '%s' might be unmatched"
+                          }), opening),
+                  tl: /* [] */0
+                }, Curry._2(Stdlib__Printf.sprintf({
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* String_literal */11,
+                            _0: "Syntax error: '",
+                            _1: {
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
+                              _1: {
+                                TAG: /* String_literal */11,
+                                _0: "' expected, the highlighted '",
+                                _1: {
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
+                                  _1: {
+                                    TAG: /* String_literal */11,
+                                    _0: "' might be unmatched",
+                                    _1: /* End_of_format */0
+                                  }
+                                }
+                              }
                             }
-                          }
-                        },
-                        _1: "In this scoped type, variable '%s is reserved for the local type %s."
-                      }), $$var, $$var);
-    case /* Other */5 :
-        return errorf(loc._0, undefined, undefined, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "Syntax error",
-                      _1: /* End_of_format */0
-                    },
-                    _1: "Syntax error"
-                  });
-    case /* Ill_formed_ast */6 :
+                          },
+                          _1: "Syntax error: '%s' expected, the highlighted '%s' might be unmatched"
+                        }), closing, opening), {
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Syntax error: '",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "' expected",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Syntax error: '%s' expected"
+                }), closing);
+    case /* Expecting */1 :
         return Curry._1(errorf(loc._0, undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "broken invariant in parsetree: ",
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Syntax error: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " expected.",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Syntax error: %s expected."
+                }), loc._1);
+    case /* Not_expecting */2 :
+        return Curry._1(errorf(loc._0, undefined, undefined, {
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Syntax error: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " not expected.",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Syntax error: %s not expected."
+                }), loc._1);
+    case /* Applicative_path */3 :
+        return errorf(loc._0, undefined, undefined, {
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "Syntax error: applicative paths of the form F(X).t are not supported when the option -no-app-func is set.",
+                _1: /* End_of_format */0
+              },
+              _1: "Syntax error: applicative paths of the form F(X).t are not supported when the option -no-app-func is set."
+            });
+    case /* Variable_in_scope */4 :
+        const $$var = loc._1;
+        return Curry._2(errorf(loc._0, undefined, undefined, {
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "In this scoped type, variable '",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " is reserved for the local type ",
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
                           _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
+                            TAG: /* Char_literal */12,
+                            _0: /* '.' */46,
                             _1: /* End_of_format */0
                           }
-                        },
-                        _1: "broken invariant in parsetree: %s"
-                      }), loc._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "In this scoped type, variable '%s is reserved for the local type %s."
+                }), $$var, $$var);
+    case /* Other */5 :
+        return errorf(loc._0, undefined, undefined, {
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "Syntax error",
+                _1: /* End_of_format */0
+              },
+              _1: "Syntax error"
+            });
+    case /* Ill_formed_ast */6 :
+        return Curry._1(errorf(loc._0, undefined, undefined, {
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "broken invariant in parsetree: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "broken invariant in parsetree: %s"
+                }), loc._1);
     
   }
 }
@@ -3791,63 +3791,63 @@ function mkoption(d) {
     loc_ghost: true
   };
   return mk(loc, undefined, {
-              TAG: /* Ptyp_constr */3,
-              _0: {
-                txt: {
-                  TAG: /* Ldot */1,
-                  _0: {
-                    TAG: /* Lident */0,
-                    _0: "*predef*"
-                  },
-                  _1: "option"
-                },
-                loc: loc
-              },
-              _1: {
-                hd: d,
-                tl: /* [] */0
-              }
-            });
+        TAG: /* Ptyp_constr */3,
+        _0: {
+          txt: {
+            TAG: /* Ldot */1,
+            _0: {
+              TAG: /* Lident */0,
+              _0: "*predef*"
+            },
+            _1: "option"
+          },
+          loc: loc
+        },
+        _1: {
+          hd: d,
+          tl: /* [] */0
+        }
+      });
 }
 
 function reloc_pat(x) {
   return {
-          ppat_desc: x.ppat_desc,
-          ppat_loc: symbol_rloc(undefined),
-          ppat_attributes: x.ppat_attributes
-        };
+    ppat_desc: x.ppat_desc,
+    ppat_loc: symbol_rloc(undefined),
+    ppat_attributes: x.ppat_attributes
+  };
 }
 
 function reloc_exp(x) {
   return {
-          pexp_desc: x.pexp_desc,
-          pexp_loc: symbol_rloc(undefined),
-          pexp_attributes: x.pexp_attributes
-        };
+    pexp_desc: x.pexp_desc,
+    pexp_loc: symbol_rloc(undefined),
+    pexp_attributes: x.pexp_attributes
+  };
 }
 
 function mkoperator(name, pos) {
   const loc = rhs_loc(pos);
   return Curry._3(Ast_helper_Exp.mk, loc, undefined, {
-              TAG: /* Pexp_ident */0,
-              _0: {
-                txt: {
-                  TAG: /* Lident */0,
-                  _0: name
-                },
-                loc: loc
-              }
-            });
+        TAG: /* Pexp_ident */0,
+        _0: {
+          txt: {
+            TAG: /* Lident */0,
+            _0: name
+          },
+          loc: loc
+        }
+      });
 }
 
 function mkpatvar(name, pos) {
   return mk$1(rhs_loc(pos), undefined, {
-              TAG: /* Ppat_var */0,
-              _0: {
-                txt: name,
-                loc: rhs_loc(pos)
-              }
-            });
+        TAG: /* Ppat_var */0,
+        _0: {
+          txt: name,
+          loc: rhs_loc(pos)
+        }
+      });
 }
 
 function ghexp(d) {
@@ -3864,22 +3864,22 @@ function ghtyp(d) {
 
 function mkinfix(arg1, name, arg2) {
   return mkexp({
-              TAG: /* Pexp_apply */5,
-              _0: mkoperator(name, 2),
-              _1: {
-                hd: [
-                  "",
-                  arg1
-                ],
-                tl: {
-                  hd: [
-                    "",
-                    arg2
-                  ],
-                  tl: /* [] */0
-                }
-              }
-            });
+        TAG: /* Pexp_apply */5,
+        _0: mkoperator(name, 2),
+        _1: {
+          hd: [
+            "",
+            arg1
+          ],
+          tl: {
+            hd: [
+              "",
+              arg2
+            ],
+            tl: /* [] */0
+          }
+        }
+      });
 }
 
 function neg_float_string(f) {
@@ -3892,30 +3892,30 @@ function neg_float_string(f) {
 
 function mkexp_cons(consloc, args, loc) {
   return Curry._3(Ast_helper_Exp.mk, loc, undefined, {
-              TAG: /* Pexp_construct */9,
-              _0: {
-                txt: {
-                  TAG: /* Lident */0,
-                  _0: "::"
-                },
-                loc: consloc
-              },
-              _1: args
-            });
+        TAG: /* Pexp_construct */9,
+        _0: {
+          txt: {
+            TAG: /* Lident */0,
+            _0: "::"
+          },
+          loc: consloc
+        },
+        _1: args
+      });
 }
 
 function mkpat_cons(consloc, args, loc) {
   return mk$1(loc, undefined, {
-              TAG: /* Ppat_construct */5,
-              _0: {
-                txt: {
-                  TAG: /* Lident */0,
-                  _0: "::"
-                },
-                loc: consloc
-              },
-              _1: args
-            });
+        TAG: /* Ppat_construct */5,
+        _0: {
+          txt: {
+            TAG: /* Lident */0,
+            _0: "::"
+          },
+          loc: consloc
+        },
+        _1: args
+      });
 }
 
 function mktailexp(nilloc, param) {
@@ -3940,10 +3940,10 @@ function mktailexp(nilloc, param) {
           }
         });
     return mkexp_cons({
-                loc_start: loc_loc_start,
-                loc_end: loc_loc_end,
-                loc_ghost: true
-              }, arg, loc);
+          loc_start: loc_loc_start,
+          loc_end: loc_loc_end,
+          loc_ghost: true
+        }, arg, loc);
   }
   const loc_loc_start$1 = nilloc.loc_start;
   const loc_loc_end$1 = nilloc.loc_end;
@@ -3961,10 +3961,10 @@ function mktailexp(nilloc, param) {
     loc: loc$1
   };
   return Curry._3(Ast_helper_Exp.mk, loc$1, undefined, {
-              TAG: /* Pexp_construct */9,
-              _0: nil,
-              _1: undefined
-            });
+        TAG: /* Pexp_construct */9,
+        _0: nil,
+        _1: undefined
+      });
 }
 
 function mktailpat(nilloc, param) {
@@ -3989,10 +3989,10 @@ function mktailpat(nilloc, param) {
           }
         });
     return mkpat_cons({
-                loc_start: loc_loc_start,
-                loc_end: loc_loc_end,
-                loc_ghost: true
-              }, arg, loc);
+          loc_start: loc_loc_start,
+          loc_end: loc_loc_end,
+          loc_ghost: true
+        }, arg, loc);
   }
   const loc_loc_start$1 = nilloc.loc_start;
   const loc_loc_end$1 = nilloc.loc_end;
@@ -4010,21 +4010,21 @@ function mktailpat(nilloc, param) {
     loc: loc$1
   };
   return mk$1(loc$1, undefined, {
-              TAG: /* Ppat_construct */5,
-              _0: nil,
-              _1: undefined
-            });
+        TAG: /* Ppat_construct */5,
+        _0: nil,
+        _1: undefined
+      });
 }
 
 function mkstrexp(e, attrs) {
   return {
-          pstr_desc: {
-            TAG: /* Pstr_eval */0,
-            _0: e,
-            _1: attrs
-          },
-          pstr_loc: e.pexp_loc
-        };
+    pstr_desc: {
+      TAG: /* Pstr_eval */0,
+      _0: e,
+      _1: attrs
+    },
+    pstr_loc: e.pexp_loc
+  };
 }
 
 function mkexp_constraint(e, param) {
@@ -4033,102 +4033,102 @@ function mkexp_constraint(e, param) {
   if (t1 !== undefined) {
     if (t2 !== undefined) {
       return ghexp({
-                  TAG: /* Pexp_coerce */20,
-                  _0: e,
-                  _1: t1,
-                  _2: t2
-                });
+            TAG: /* Pexp_coerce */20,
+            _0: e,
+            _1: t1,
+            _2: t2
+          });
     } else {
       return ghexp({
-                  TAG: /* Pexp_constraint */19,
-                  _0: e,
-                  _1: t1
-                });
+            TAG: /* Pexp_constraint */19,
+            _0: e,
+            _1: t1
+          });
     }
   }
   if (t2 !== undefined) {
     return ghexp({
-                TAG: /* Pexp_coerce */20,
-                _0: e,
-                _1: t1,
-                _2: t2
-              });
+          TAG: /* Pexp_coerce */20,
+          _0: e,
+          _1: t1,
+          _2: t2
+        });
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "parsing/parser.mly",
-              153,
-              18
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "parsing/parser.mly",
+          153,
+          18
+        ]
+      });
 }
 
 function array_function(str, name) {
   return {
-          txt: {
-            TAG: /* Ldot */1,
-            _0: {
-              TAG: /* Lident */0,
-              _0: str
-            },
-            _1: fast.contents ? "unsafe_" + name : name
-          },
-          loc: symbol_gloc(undefined)
-        };
+    txt: {
+      TAG: /* Ldot */1,
+      _0: {
+        TAG: /* Lident */0,
+        _0: str
+      },
+      _1: fast.contents ? "unsafe_" + name : name
+    },
+    loc: symbol_gloc(undefined)
+  };
 }
 
 function unclosed(opening_name, opening_num, closing_name, closing_num) {
   throw new Caml_js_exceptions.MelangeError($$Error$1, {
-            MEL_EXN_ID: $$Error$1,
-            _1: {
-              TAG: /* Unclosed */0,
-              _0: rhs_loc(opening_num),
-              _1: opening_name,
-              _2: rhs_loc(closing_num),
-              _3: closing_name
-            }
-          });
+        MEL_EXN_ID: $$Error$1,
+        _1: {
+          TAG: /* Unclosed */0,
+          _0: rhs_loc(opening_num),
+          _1: opening_name,
+          _2: rhs_loc(closing_num),
+          _3: closing_name
+        }
+      });
 }
 
 function expecting(pos, nonterm) {
   throw new Caml_js_exceptions.MelangeError($$Error$1, {
-            MEL_EXN_ID: $$Error$1,
-            _1: {
-              TAG: /* Expecting */1,
-              _0: rhs_loc(pos),
-              _1: nonterm
-            }
-          });
+        MEL_EXN_ID: $$Error$1,
+        _1: {
+          TAG: /* Expecting */1,
+          _0: rhs_loc(pos),
+          _1: nonterm
+        }
+      });
 }
 
 function not_expecting(pos, nonterm) {
   throw new Caml_js_exceptions.MelangeError($$Error$1, {
-            MEL_EXN_ID: $$Error$1,
-            _1: {
-              TAG: /* Not_expecting */2,
-              _0: rhs_loc(pos),
-              _1: nonterm
-            }
-          });
+        MEL_EXN_ID: $$Error$1,
+        _1: {
+          TAG: /* Not_expecting */2,
+          _0: rhs_loc(pos),
+          _1: nonterm
+        }
+      });
 }
 
 function bigarray_function(str, name) {
   return {
-          txt: {
-            TAG: /* Ldot */1,
-            _0: {
-              TAG: /* Ldot */1,
-              _0: {
-                TAG: /* Lident */0,
-                _0: "Bigarray"
-              },
-              _1: str
-            },
-            _1: name
-          },
-          loc: symbol_gloc(undefined)
-        };
+    txt: {
+      TAG: /* Ldot */1,
+      _0: {
+        TAG: /* Ldot */1,
+        _0: {
+          TAG: /* Lident */0,
+          _0: "Bigarray"
+        },
+        _1: str
+      },
+      _1: name
+    },
+    loc: symbol_gloc(undefined)
+  };
 }
 
 function bigarray_untuplify(exp) {
@@ -4137,9 +4137,9 @@ function bigarray_untuplify(exp) {
     return explist._0;
   } else {
     return {
-            hd: exp,
-            tl: /* [] */0
-          };
+      hd: exp,
+      tl: /* [] */0
+    };
   }
 }
 
@@ -4149,23 +4149,23 @@ function exp_of_label(lbl, pos) {
     _0: last(lbl)
   };
   return mkexp({
-              TAG: /* Pexp_ident */0,
-              _0: {
-                txt: rhs,
-                loc: rhs_loc(pos)
-              }
-            });
+        TAG: /* Pexp_ident */0,
+        _0: {
+          txt: rhs,
+          loc: rhs_loc(pos)
+        }
+      });
 }
 
 function pat_of_label(lbl, pos) {
   const rhs = last(lbl);
   return mkpat({
-              TAG: /* Ppat_var */0,
-              _0: {
-                txt: rhs,
-                loc: rhs_loc(pos)
-              }
-            });
+        TAG: /* Ppat_var */0,
+        _0: {
+          txt: rhs,
+          loc: rhs_loc(pos)
+        }
+      });
 }
 
 function check_variable(vl, loc, v) {
@@ -4173,13 +4173,13 @@ function check_variable(vl, loc, v) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError($$Error$1, {
-            MEL_EXN_ID: $$Error$1,
-            _1: {
-              TAG: /* Variable_in_scope */4,
-              _0: loc,
-              _1: v
-            }
-          });
+        MEL_EXN_ID: $$Error$1,
+        _1: {
+          TAG: /* Variable_in_scope */4,
+          _0: loc,
+          _1: v
+        }
+      });
 }
 
 function varify_constructors(var_names, t) {
@@ -4251,10 +4251,10 @@ function varify_constructors(var_names, t) {
               TAG: /* Ptyp_object */4,
               _0: Stdlib__List.map((function (param) {
                       return [
-                              param[0],
-                              param[1],
-                              loop(param[2])
-                            ];
+                        param[0],
+                        param[1],
+                        loop(param[2])
+                      ];
                     }), x._0),
               _1: x._1
             };
@@ -4303,9 +4303,9 @@ function varify_constructors(var_names, t) {
                 match[0],
                 Stdlib__List.map((function (param) {
                         return [
-                                param[0],
-                                loop(param[1])
-                              ];
+                          param[0],
+                          loop(param[1])
+                        ];
                       }), match[1])
               ]
             };
@@ -4324,25 +4324,25 @@ function varify_constructors(var_names, t) {
       }
     }
     return {
-            ptyp_desc: desc,
-            ptyp_loc: t.ptyp_loc,
-            ptyp_attributes: t.ptyp_attributes
-          };
+      ptyp_desc: desc,
+      ptyp_loc: t.ptyp_loc,
+      ptyp_attributes: t.ptyp_attributes
+    };
   };
   const loop_row_field = function (t) {
     if (t.TAG === /* Rtag */0) {
       return {
-              TAG: /* Rtag */0,
-              _0: t._0,
-              _1: t._1,
-              _2: t._2,
-              _3: Stdlib__List.map(loop, t._3)
-            };
+        TAG: /* Rtag */0,
+        _0: t._0,
+        _1: t._1,
+        _2: t._2,
+        _3: Stdlib__List.map(loop, t._3)
+      };
     } else {
       return {
-              TAG: /* Rinherit */1,
-              _0: loop(t._0)
-            };
+        TAG: /* Rinherit */1,
+        _0: loop(t._0)
+      };
     }
   };
   return loop(t);
@@ -4356,19 +4356,19 @@ function wrap_type_annotation(newtypes, core_type, body) {
       });
   const exp$1 = Stdlib__List.fold_right((function (newtype, exp) {
           return mkexp({
-                      TAG: /* Pexp_newtype */30,
-                      _0: newtype,
-                      _1: exp
-                    });
+                TAG: /* Pexp_newtype */30,
+                _0: newtype,
+                _1: exp
+              });
         }), newtypes, exp);
   return [
-          exp$1,
-          ghtyp({
-                TAG: /* Ptyp_poly */8,
-                _0: newtypes,
-                _1: varify_constructors(newtypes, core_type)
-              })
-        ];
+    exp$1,
+    ghtyp({
+          TAG: /* Ptyp_poly */8,
+          _0: newtypes,
+          _1: varify_constructors(newtypes, core_type)
+        })
+  ];
 }
 
 function wrap_exp_attrs(body, param) {
@@ -4383,18 +4383,18 @@ function wrap_exp_attrs(body, param) {
   };
   if (ext !== undefined) {
     return ghexp({
-                TAG: /* Pexp_extension */33,
-                _0: [
-                  ext,
-                  {
-                    TAG: /* PStr */0,
-                    _0: {
-                      hd: mkstrexp(body$1, /* [] */0),
-                      tl: /* [] */0
-                    }
-                  }
-                ]
-              });
+          TAG: /* Pexp_extension */33,
+          _0: [
+            ext,
+            {
+              TAG: /* PStr */0,
+              _0: {
+                hd: mkstrexp(body$1, /* [] */0),
+                tl: /* [] */0
+              }
+            }
+          ]
+        });
   } else {
     return body$1;
   }
@@ -4402,12 +4402,12 @@ function wrap_exp_attrs(body, param) {
 
 function text_def(pos) {
   return {
-          hd: {
-            TAG: /* Ptop_def */0,
-            _0: text$1(get_text(Stdlib__Parsing.rhs_start_pos(pos)))
-          },
-          tl: /* [] */0
-        };
+    hd: {
+      TAG: /* Ptop_def */0,
+      _0: text$1(get_text(Stdlib__Parsing.rhs_start_pos(pos)))
+    },
+    tl: /* [] */0
+  };
 }
 
 function extra_text(text, pos, items) {
@@ -4434,26 +4434,26 @@ function add_nonrec(rf, attrs, pos) {
     loc: name_loc
   };
   return {
-          hd: [
-            name,
-            {
-              TAG: /* PStr */0,
-              _0: /* [] */0
-            }
-          ],
-          tl: attrs
-        };
+    hd: [
+      name,
+      {
+        TAG: /* PStr */0,
+        _0: /* [] */0
+      }
+    ],
+    tl: attrs
+  };
 }
 
 function mklb(param, attrs) {
   return {
-          lb_pattern: param[0],
-          lb_expression: param[1],
-          lb_attributes: attrs,
-          lb_docs: symbol_docs_lazy(undefined),
-          lb_text: symbol_text_lazy(undefined),
-          lb_loc: symbol_rloc(undefined)
-        };
+    lb_pattern: param[0],
+    lb_expression: param[1],
+    lb_attributes: attrs,
+    lb_docs: symbol_docs_lazy(undefined),
+    lb_text: symbol_text_lazy(undefined),
+    lb_loc: symbol_rloc(undefined)
+  };
 }
 
 const yytransl_const = [
@@ -4588,9 +4588,9 @@ const yytransl_block = [
 const yyact = [
   (function (param) {
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: "parser"
-              });
+            MEL_EXN_ID: "Failure",
+            _1: "parser"
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -4603,25 +4603,25 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return {
-              TAG: /* Ptop_def */0,
-              _0: extra_text(text$1, 1, _1)
-            };
+        TAG: /* Ptop_def */0,
+        _0: extra_text(text$1, 1, _1)
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib.End_of_file, {
-                MEL_EXN_ID: Stdlib.End_of_file
-              });
+            MEL_EXN_ID: Stdlib.End_of_file
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text$1(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: mkstrexp(_1, _2),
-                  tl: /* [] */0
-                });
+            hd: mkstrexp(_1, _2),
+            tl: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -4633,22 +4633,22 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text$1(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: _1,
-                  tl: _2
-                });
+            hd: _1,
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       let pos = 1;
       return extra_text((function (txt) {
-                    return {
-                            hd: {
-                              TAG: /* Ptop_def */0,
-                              _0: text$1(txt)
-                            },
-                            tl: /* [] */0
-                          };
-                  }), pos, _1);
+              return {
+                hd: {
+                  TAG: /* Ptop_def */0,
+                  _0: text$1(txt)
+                },
+                tl: /* [] */0
+              };
+            }), pos, _1);
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -4658,15 +4658,15 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text_def(1), {
-                  hd: {
-                    TAG: /* Ptop_def */0,
-                    _0: {
-                      hd: mkstrexp(_1, _2),
-                      tl: /* [] */0
-                    }
-                  },
-                  tl: _3
-                });
+            hd: {
+              TAG: /* Ptop_def */0,
+              _0: {
+                hd: mkstrexp(_1, _2),
+                tl: /* [] */0
+              }
+            },
+            tl: _3
+          });
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -4680,61 +4680,61 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_rhs_docs(2, 3);
       return Stdlib.$at(text_def(1), Stdlib.$at(text_def(2), {
-                      hd: {
-                        TAG: /* Ptop_def */0,
-                        _0: {
-                          hd: mkstrexp(_2, _3),
-                          tl: /* [] */0
-                        }
-                      },
-                      tl: _4
-                    }));
+                hd: {
+                  TAG: /* Ptop_def */0,
+                  _0: {
+                    hd: mkstrexp(_2, _3),
+                    tl: /* [] */0
+                  }
+                },
+                tl: _4
+              }));
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text_def(1), Stdlib.$at(text_def(2), {
-                      hd: {
-                        TAG: /* Ptop_def */0,
-                        _0: {
-                          hd: _2,
-                          tl: /* [] */0
-                        }
-                      },
-                      tl: _3
-                    }));
+                hd: {
+                  TAG: /* Ptop_def */0,
+                  _0: {
+                    hd: _2,
+                    tl: /* [] */0
+                  }
+                },
+                tl: _3
+              }));
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_rhs_docs(2, 3);
       return Stdlib.$at(text_def(1), Stdlib.$at(text_def(2), {
-                      hd: _2,
-                      tl: _3
-                    }));
+                hd: _2,
+                tl: _3
+              }));
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text_def(1), {
-                  hd: {
-                    TAG: /* Ptop_def */0,
-                    _0: {
-                      hd: _1,
-                      tl: /* [] */0
-                    }
-                  },
-                  tl: _2
-                });
+            hd: {
+              TAG: /* Ptop_def */0,
+              _0: {
+                hd: _1,
+                tl: /* [] */0
+              }
+            },
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_rhs_docs(1, 1);
       return Stdlib.$at(text_def(1), {
-                  hd: _1,
-                  tl: _2
-                });
+            hd: _1,
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -4747,23 +4747,23 @@ const yyact = [
     }),
   (function (__caml_parser_env) {
       return [
-              {
-                txt: "*",
-                loc: rhs_loc(2)
-              },
-              undefined
-            ];
+        {
+          txt: "*",
+          loc: rhs_loc(2)
+        },
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              {
-                txt: _2,
-                loc: rhs_loc(2)
-              },
-              _4
-            ];
+        {
+          txt: _2,
+          loc: rhs_loc(2)
+        },
+        _4
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -4775,33 +4775,33 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmod({
-                  TAG: /* Pmod_ident */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Pmod_ident */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_structure */1,
-                  _0: extra_text(text$1, 2, _2)
-                });
+            TAG: /* Pmod_structure */1,
+            _0: extra_text(text$1, 2, _2)
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -4811,33 +4811,33 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib__List.fold_left((function (acc, param) {
-                    return mkmod({
-                                TAG: /* Pmod_functor */2,
-                                _0: param[0],
-                                _1: param[1],
-                                _2: acc
-                              });
-                  }), _4, _2);
+              return mkmod({
+                    TAG: /* Pmod_functor */2,
+                    _0: param[0],
+                    _1: param[1],
+                    _2: acc
+                  });
+            }), _4, _2);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_apply */3,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Pmod_apply */3,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       return mkmod({
-                  TAG: /* Pmod_apply */3,
-                  _0: _1,
-                  _1: mkmod({
-                        TAG: /* Pmod_structure */1,
-                        _0: /* [] */0
-                      })
-                });
+            TAG: /* Pmod_apply */3,
+            _0: _1,
+            _1: mkmod({
+                  TAG: /* Pmod_structure */1,
+                  _0: /* [] */0
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -4848,10 +4848,10 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_constraint */4,
-                  _0: _2,
-                  _1: _4
-                });
+            TAG: /* Pmod_constraint */4,
+            _0: _2,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -4868,60 +4868,60 @@ const yyact = [
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_unpack */5,
-                  _0: _3
-                });
+            TAG: /* Pmod_unpack */5,
+            _0: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_unpack */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_constraint */19,
-                        _0: _3,
-                        _1: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _5
-                            })
+            TAG: /* Pmod_unpack */5,
+            _0: ghexp({
+                  TAG: /* Pexp_constraint */19,
+                  _0: _3,
+                  _1: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _5
                       })
-                });
+                })
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_unpack */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_coerce */20,
-                        _0: _3,
-                        _1: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _5
-                            }),
-                        _2: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _7
-                            })
+            TAG: /* Pmod_unpack */5,
+            _0: ghexp({
+                  TAG: /* Pexp_coerce */20,
+                  _0: _3,
+                  _1: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _5
+                      }),
+                  _2: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _7
                       })
-                });
+                })
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_unpack */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_coerce */20,
-                        _0: _3,
-                        _1: undefined,
-                        _2: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _5
-                            })
+            TAG: /* Pmod_unpack */5,
+            _0: ghexp({
+                  TAG: /* Pexp_coerce */20,
+                  _0: _3,
+                  _1: undefined,
+                  _2: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _5
                       })
-                });
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -4943,9 +4943,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmod({
-                  TAG: /* Pmod_extension */6,
-                  _0: _1
-                });
+            TAG: /* Pmod_extension */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -4953,9 +4953,9 @@ const yyact = [
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_rhs_docs(1, 2);
       return Stdlib.$at(text$1(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: mkstrexp(_1, _2),
-                  tl: _3
-                });
+            hd: mkstrexp(_1, _2),
+            tl: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -4971,9 +4971,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text$1(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: _1,
-                  tl: _2
-                });
+            hd: _1,
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       let lbs = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -5002,13 +5002,13 @@ const yyact = [
       if (exit === 1) {
         if (Caml_obj.caml_notequal(lbs.lbs_attributes, /* [] */0)) {
           throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                    MEL_EXN_ID: $$Error$1,
-                    _1: {
-                      TAG: /* Not_expecting */2,
-                      _0: lbs.lbs_loc,
-                      _1: "attributes"
-                    }
-                  });
+                MEL_EXN_ID: $$Error$1,
+                _1: {
+                  TAG: /* Not_expecting */2,
+                  _0: lbs.lbs_loc,
+                  _1: "attributes"
+                }
+              });
         }
         const bindings$1 = Stdlib__List.map((function (lb) {
                 return mk$17(lb.lb_loc, lb.lb_attributes, CamlinternalLazy.force(lb.lb_docs), CamlinternalLazy.force(lb.lb_text), lb.lb_pattern, lb.lb_expression);
@@ -5043,96 +5043,96 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_primitive */2,
-                  _0: _1
-                });
+            TAG: /* Pstr_primitive */2,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_type */3,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pstr_type */3,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_typext */4,
-                  _0: _1
-                });
+            TAG: /* Pstr_typext */4,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_exception */5,
-                  _0: _1
-                });
+            TAG: /* Pstr_exception */5,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_module */6,
-                  _0: _1
-                });
+            TAG: /* Pstr_module */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_recmodule */7,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pstr_recmodule */7,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_modtype */8,
-                  _0: _1
-                });
+            TAG: /* Pstr_modtype */8,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_open */9,
-                  _0: _1
-                });
+            TAG: /* Pstr_open */9,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_class */10,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pstr_class */10,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_class_type */11,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pstr_class_type */11,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_include */12,
-                  _0: _1
-                });
+            TAG: /* Pstr_include */12,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_extension */14,
-                  _0: _1,
-                  _1: add_docs_attrs(symbol_docs(undefined), _2)
-                });
+            TAG: /* Pstr_extension */14,
+            _0: _1,
+            _1: add_docs_attrs(symbol_docs(undefined), _2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_symbol_docs(undefined);
       return mkstr({
-                  TAG: /* Pstr_attribute */13,
-                  _0: _1
-                });
+            TAG: /* Pstr_attribute */13,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -5146,79 +5146,79 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmod({
-                  TAG: /* Pmod_constraint */4,
-                  _0: _4,
-                  _1: _2
-                });
+            TAG: /* Pmod_constraint */4,
+            _0: _4,
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmod({
-                  TAG: /* Pmod_functor */2,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _2
-                });
+            TAG: /* Pmod_functor */2,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$14(symbol_rloc(undefined), _4, symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _3);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _3);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$14(symbol_rloc(undefined), _5, symbol_docs(undefined), undefined, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                }, _4);
+            txt: _3,
+            loc: rhs_loc(3)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$14(symbol_rloc(undefined), _4, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _3);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _3);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_ident */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Pmty_ident */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmty({
-                  TAG: /* Pmty_signature */1,
-                  _0: extra_text(text, 2, _2)
-                });
+            TAG: /* Pmty_signature */1,
+            _0: extra_text(text, 2, _2)
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -5228,29 +5228,29 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib__List.fold_left((function (acc, param) {
-                    return mkmty({
-                                TAG: /* Pmty_functor */2,
-                                _0: param[0],
-                                _1: param[1],
-                                _2: acc
-                              });
-                  }), _4, _2);
+              return mkmty({
+                    TAG: /* Pmty_functor */2,
+                    _0: param[0],
+                    _1: param[1],
+                    _2: acc
+                  });
+            }), _4, _2);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_with */3,
-                  _0: _1,
-                  _1: Stdlib__List.rev(_3)
-                });
+            TAG: /* Pmty_with */3,
+            _0: _1,
+            _1: Stdlib__List.rev(_3)
+          });
     }),
   (function (__caml_parser_env) {
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_typeof */4,
-                  _0: _4
-                });
+            TAG: /* Pmty_typeof */4,
+            _0: _4
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -5262,9 +5262,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_extension */5,
-                  _0: _1
-                });
+            TAG: /* Pmty_extension */5,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -5282,126 +5282,126 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: _1,
-                  tl: _2
-                });
+            hd: _1,
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_value */0,
-                  _0: _1
-                });
+            TAG: /* Psig_value */0,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_value */0,
-                  _0: _1
-                });
+            TAG: /* Psig_value */0,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_type */1,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Psig_type */1,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_typext */2,
-                  _0: _1
-                });
+            TAG: /* Psig_typext */2,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_exception */3,
-                  _0: _1
-                });
+            TAG: /* Psig_exception */3,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_module */4,
-                  _0: _1
-                });
+            TAG: /* Psig_module */4,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_module */4,
-                  _0: _1
-                });
+            TAG: /* Psig_module */4,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_recmodule */5,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Psig_recmodule */5,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_modtype */6,
-                  _0: _1
-                });
+            TAG: /* Psig_modtype */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_open */7,
-                  _0: _1
-                });
+            TAG: /* Psig_open */7,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_include */8,
-                  _0: _1
-                });
+            TAG: /* Psig_include */8,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_class */9,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Psig_class */9,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_class_type */10,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Psig_class_type */10,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_extension */12,
-                  _0: _1,
-                  _1: add_docs_attrs(symbol_docs(undefined), _2)
-                });
+            TAG: /* Psig_extension */12,
+            _0: _1,
+            _1: add_docs_attrs(symbol_docs(undefined), _2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_symbol_docs(undefined);
       return mksig({
-                  TAG: /* Psig_attribute */11,
-                  _0: _1
-                });
+            TAG: /* Psig_attribute */11,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$15(symbol_rloc(undefined), _4, symbol_docs(undefined), _2, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                });
+            txt: _3,
+            loc: rhs_loc(3)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -5416,80 +5416,80 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_functor */2,
-                  _0: {
-                    txt: _2,
-                    loc: rhs_loc(2)
-                  },
-                  _1: _4,
-                  _2: _6
-                });
+            TAG: /* Pmty_functor */2,
+            _0: {
+              txt: _2,
+              loc: rhs_loc(2)
+            },
+            _1: _4,
+            _2: _6
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_functor */2,
-                  _0: {
-                    txt: "*",
-                    loc: rhs_loc(1)
-                  },
-                  _1: undefined,
-                  _2: _3
-                });
+            TAG: /* Pmty_functor */2,
+            _0: {
+              txt: "*",
+              loc: rhs_loc(1)
+            },
+            _1: undefined,
+            _2: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$12(symbol_rloc(undefined), _4, symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _3);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _3);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$12(symbol_rloc(undefined), _5, symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, alias(rhs_loc(4), undefined, {
-                      txt: _4,
-                      loc: rhs_loc(4)
-                    }));
+            txt: _2,
+            loc: rhs_loc(2)
+          }, alias(rhs_loc(4), undefined, {
+                txt: _4,
+                loc: rhs_loc(4)
+              }));
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$12(symbol_rloc(undefined), _6, symbol_docs(undefined), undefined, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                }, _5);
+            txt: _3,
+            loc: rhs_loc(3)
+          }, _5);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$12(symbol_rloc(undefined), _5, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       
@@ -5502,24 +5502,24 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$13(symbol_rloc(undefined), _5, symbol_docs(undefined), undefined, _4, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                });
+            txt: _3,
+            loc: rhs_loc(3)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -5528,9 +5528,9 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _6, symbol_docs(undefined), undefined, _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _5);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _5);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -5539,9 +5539,9 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _6, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _5);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _5);
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -5550,21 +5550,21 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_constraint */5,
-                  _0: _4,
-                  _1: _2
-                });
+            TAG: /* Pcl_constraint */5,
+            _0: _4,
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_fun */2,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _2
-                });
+            TAG: /* Pcl_fun */2,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _2
+          });
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -5576,23 +5576,23 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_fun */2,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _3
-                });
+            TAG: /* Pcl_fun */2,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_fun */2,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _2
-                });
+            TAG: /* Pcl_fun */2,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _2
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -5604,10 +5604,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_apply */3,
-                  _0: _1,
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pcl_apply */3,
+            _0: _1,
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -5615,42 +5615,42 @@ const yyact = [
       const bindings = Stdlib__List.map((function (lb) {
               if (Caml_obj.caml_notequal(lb.lb_attributes, /* [] */0)) {
                 throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                          MEL_EXN_ID: $$Error$1,
-                          _1: {
-                            TAG: /* Not_expecting */2,
-                            _0: lb.lb_loc,
-                            _1: "item attribute"
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$1,
+                      _1: {
+                        TAG: /* Not_expecting */2,
+                        _0: lb.lb_loc,
+                        _1: "item attribute"
+                      }
+                    });
               }
               return mk$17(lb.lb_loc, undefined, undefined, undefined, lb.lb_pattern, lb.lb_expression);
             }), _1.lbs_bindings);
       if (_1.lbs_extension !== undefined) {
         throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                  MEL_EXN_ID: $$Error$1,
-                  _1: {
-                    TAG: /* Not_expecting */2,
-                    _0: _1.lbs_loc,
-                    _1: "extension"
-                  }
-                });
+              MEL_EXN_ID: $$Error$1,
+              _1: {
+                TAG: /* Not_expecting */2,
+                _0: _1.lbs_loc,
+                _1: "extension"
+              }
+            });
       }
       if (Caml_obj.caml_notequal(_1.lbs_attributes, /* [] */0)) {
         throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                  MEL_EXN_ID: $$Error$1,
-                  _1: {
-                    TAG: /* Not_expecting */2,
-                    _0: _1.lbs_loc,
-                    _1: "attributes"
-                  }
-                });
+              MEL_EXN_ID: $$Error$1,
+              _1: {
+                TAG: /* Not_expecting */2,
+                _0: _1.lbs_loc,
+                _1: "attributes"
+              }
+            });
       }
       return mkclass({
-                  TAG: /* Pcl_let */4,
-                  _0: _1.lbs_rec,
-                  _1: Stdlib__List.rev(bindings),
-                  _2: _3
-                });
+            TAG: /* Pcl_let */4,
+            _0: _1.lbs_rec,
+            _1: Stdlib__List.rev(bindings),
+            _2: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -5660,39 +5660,39 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_extension */6,
-                  _0: _1
-                });
+            TAG: /* Pcl_extension */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_constr */0,
-                  _0: {
-                    txt: _4,
-                    loc: rhs_loc(4)
-                  },
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pcl_constr */0,
+            _0: {
+              txt: _4,
+              loc: rhs_loc(4)
+            },
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_constr */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: /* [] */0
-                });
+            TAG: /* Pcl_constr */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkclass({
-                  TAG: /* Pcl_structure */1,
-                  _0: _2
-                });
+            TAG: /* Pcl_structure */1,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -5702,10 +5702,10 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkclass({
-                  TAG: /* Pcl_constraint */5,
-                  _0: _2,
-                  _1: _4
-                });
+            TAG: /* Pcl_constraint */5,
+            _0: _2,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -5723,9 +5723,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              pcstr_self: _1,
-              pcstr_fields: extra_cstr(2, Stdlib__List.rev(_2))
-            };
+        pcstr_self: _1,
+        pcstr_fields: extra_cstr(2, Stdlib__List.rev(_2))
+      };
     }),
   (function (__caml_parser_env) {
       return reloc_pat(Stdlib__Parsing.peek_val(__caml_parser_env, 1));
@@ -5734,10 +5734,10 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_constraint */10,
-                  _0: _2,
-                  _1: _4
-                });
+            TAG: /* Ppat_constraint */10,
+            _0: _2,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       return ghpat(/* Ppat_any */0);
@@ -5749,9 +5749,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at({
-                  hd: _2,
-                  tl: Curry._1(Ast_helper_Cf.text, get_text(Stdlib__Parsing.rhs_start_pos(2)))
-                }, _1);
+            hd: _2,
+            tl: Curry._1(Ast_helper_Cf.text, get_text(Stdlib__Parsing.rhs_start_pos(2)))
+          }, _1);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -5759,59 +5759,59 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_5, symbol_docs(undefined), {
-                  TAG: /* Pcf_inherit */0,
-                  _0: _2,
-                  _1: _3,
-                  _2: _4
-                });
+            TAG: /* Pcf_inherit */0,
+            _0: _2,
+            _1: _3,
+            _2: _4
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_3, symbol_docs(undefined), {
-                  TAG: /* Pcf_val */1,
-                  _0: _2
-                });
+            TAG: /* Pcf_val */1,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_3, symbol_docs(undefined), {
-                  TAG: /* Pcf_method */2,
-                  _0: _2
-                });
+            TAG: /* Pcf_method */2,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_3, symbol_docs(undefined), {
-                  TAG: /* Pcf_constraint */3,
-                  _0: _2
-                });
+            TAG: /* Pcf_constraint */3,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_3, symbol_docs(undefined), {
-                  TAG: /* Pcf_initializer */4,
-                  _0: _2
-                });
+            TAG: /* Pcf_initializer */4,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_2, symbol_docs(undefined), {
-                  TAG: /* Pcf_extension */6,
-                  _0: _1
-                });
+            TAG: /* Pcf_extension */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_symbol_docs(undefined);
       return mkcf(undefined, undefined, {
-                  TAG: /* Pcf_attribute */5,
-                  _0: _1
-                });
+            TAG: /* Pcf_attribute */5,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -5825,36 +5825,36 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       if (_1 === /* Override */0) {
         throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                  MEL_EXN_ID: Escape_error
-                });
+              MEL_EXN_ID: Escape_error
+            });
       }
       return [
-              {
-                txt: _4,
-                loc: rhs_loc(4)
-              },
-              /* Mutable */1,
-              {
-                TAG: /* Cfk_virtual */0,
-                _0: _6
-              }
-            ];
+        {
+          txt: _4,
+          loc: rhs_loc(4)
+        },
+        /* Mutable */1,
+        {
+          TAG: /* Cfk_virtual */0,
+          _0: _6
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_virtual */0,
-                _0: _5
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_virtual */0,
+          _0: _5
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -5862,17 +5862,17 @@ const yyact = [
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: _5
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: _5
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -5882,17 +5882,17 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       const e = mkexp_constraint(_6, _4);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: e
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: e
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -5900,20 +5900,20 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       if (_1 === /* Override */0) {
         throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                  MEL_EXN_ID: Escape_error
-                });
+              MEL_EXN_ID: Escape_error
+            });
       }
       return [
-              {
-                txt: _4,
-                loc: rhs_loc(4)
-              },
-              /* Private */0,
-              {
-                TAG: /* Cfk_virtual */0,
-                _0: _6
-              }
-            ];
+        {
+          txt: _4,
+          loc: rhs_loc(4)
+        },
+        /* Private */0,
+        {
+          TAG: /* Cfk_virtual */0,
+          _0: _6
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -5922,20 +5922,20 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       if (_1 === /* Override */0) {
         throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                  MEL_EXN_ID: Escape_error
-                });
+              MEL_EXN_ID: Escape_error
+            });
       }
       return [
-              {
-                txt: _4,
-                loc: rhs_loc(4)
-              },
-              _3,
-              {
-                TAG: /* Cfk_virtual */0,
-                _0: _6
-              }
-            ];
+        {
+          txt: _4,
+          loc: rhs_loc(4)
+        },
+        _3,
+        {
+          TAG: /* Cfk_virtual */0,
+          _0: _6
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -5943,21 +5943,21 @@ const yyact = [
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: ghexp({
-                      TAG: /* Pexp_poly */28,
-                      _0: _4,
-                      _1: undefined
-                    })
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: ghexp({
+                TAG: /* Pexp_poly */28,
+                _0: _4,
+                _1: undefined
+              })
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -5966,21 +5966,21 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: ghexp({
-                      TAG: /* Pexp_poly */28,
-                      _0: _7,
-                      _1: _5
-                    })
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: ghexp({
+                TAG: /* Pexp_poly */28,
+                _0: _7,
+                _1: _5
+              })
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 9);
@@ -5991,21 +5991,21 @@ const yyact = [
       const _10 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       const match = wrap_type_annotation(_6, _8, _10);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: ghexp({
-                      TAG: /* Pexp_poly */28,
-                      _0: match[0],
-                      _1: match[1]
-                    })
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: ghexp({
+                TAG: /* Pexp_poly */28,
+                _0: match[0],
+                _1: match[1]
+              })
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -6015,73 +6015,73 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_arrow */2,
-                  _0: "?" + _2,
-                  _1: mkoption(_4),
-                  _2: _6
-                });
+            TAG: /* Pcty_arrow */2,
+            _0: "?" + _2,
+            _1: mkoption(_4),
+            _2: _6
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_arrow */2,
-                  _0: "?" + _1,
-                  _1: mkoption(_2),
-                  _2: _4
-                });
+            TAG: /* Pcty_arrow */2,
+            _0: "?" + _1,
+            _1: mkoption(_2),
+            _2: _4
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_arrow */2,
-                  _0: _1,
-                  _1: _3,
-                  _2: _5
-                });
+            TAG: /* Pcty_arrow */2,
+            _0: _1,
+            _1: _3,
+            _2: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_arrow */2,
-                  _0: "",
-                  _1: _1,
-                  _2: _3
-                });
+            TAG: /* Pcty_arrow */2,
+            _0: "",
+            _1: _1,
+            _2: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_constr */0,
-                  _0: {
-                    txt: _4,
-                    loc: rhs_loc(4)
-                  },
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pcty_constr */0,
+            _0: {
+              txt: _4,
+              loc: rhs_loc(4)
+            },
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_constr */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: /* [] */0
-                });
+            TAG: /* Pcty_constr */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkcty({
-                  TAG: /* Pcty_signature */1,
-                  _0: _2
-                });
+            TAG: /* Pcty_signature */1,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -6095,17 +6095,17 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_extension */3,
-                  _0: _1
-                });
+            TAG: /* Pcty_extension */3,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              pcsig_self: _1,
-              pcsig_fields: extra_csig(2, Stdlib__List.rev(_2))
-            };
+        pcsig_self: _1,
+        pcsig_fields: extra_csig(2, Stdlib__List.rev(_2))
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -6120,25 +6120,25 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at({
-                  hd: _2,
-                  tl: Curry._1(Ast_helper_Ctf.text, get_text(Stdlib__Parsing.rhs_start_pos(2)))
-                }, _1);
+            hd: _2,
+            tl: Curry._1(Ast_helper_Ctf.text, get_text(Stdlib__Parsing.rhs_start_pos(2)))
+          }, _1);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_3, symbol_docs(undefined), {
-                  TAG: /* Pctf_inherit */0,
-                  _0: _2
-                });
+            TAG: /* Pctf_inherit */0,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_3, symbol_docs(undefined), {
-                  TAG: /* Pctf_val */1,
-                  _0: _2
-                });
+            TAG: /* Pctf_val */1,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -6146,102 +6146,102 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_6, symbol_docs(undefined), {
-                  TAG: /* Pctf_method */2,
-                  _0: [
-                    _3,
-                    _2[0],
-                    _2[1],
-                    _5
-                  ]
-                });
+            TAG: /* Pctf_method */2,
+            _0: [
+              _3,
+              _2[0],
+              _2[1],
+              _5
+            ]
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_3, symbol_docs(undefined), {
-                  TAG: /* Pctf_constraint */3,
-                  _0: _2
-                });
+            TAG: /* Pctf_constraint */3,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_2, symbol_docs(undefined), {
-                  TAG: /* Pctf_extension */5,
-                  _0: _1
-                });
+            TAG: /* Pctf_extension */5,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_symbol_docs(undefined);
       return mkctf(undefined, undefined, {
-                  TAG: /* Pctf_attribute */4,
-                  _0: _1
-                });
+            TAG: /* Pctf_attribute */4,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _3,
-              _2,
-              /* Virtual */0,
-              _5
-            ];
+        _3,
+        _2,
+        /* Virtual */0,
+        _5
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _3,
-              /* Mutable */1,
-              _2,
-              _5
-            ];
+        _3,
+        /* Mutable */1,
+        _2,
+        _5
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              /* Immutable */0,
-              /* Concrete */1,
-              _3
-            ];
+        _1,
+        /* Immutable */0,
+        /* Concrete */1,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _3,
-              symbol_rloc(undefined)
-            ];
+        _1,
+        _3,
+        symbol_rloc(undefined)
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _3
-            ];
+        _1,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -6250,9 +6250,9 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _7, symbol_docs(undefined), undefined, _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _6);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _6);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -6261,24 +6261,24 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _7, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _6);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _6);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -6287,9 +6287,9 @@ const yyact = [
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _8 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _8, symbol_docs(undefined), undefined, _3, _4, {
-                  txt: _5,
-                  loc: rhs_loc(5)
-                }, _7);
+            txt: _5,
+            loc: rhs_loc(5)
+          }, _7);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -6298,9 +6298,9 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _7, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _6);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _6);
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -6312,89 +6312,89 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_sequence */16,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Pexp_sequence */16,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              "?" + _3[0],
-              _4,
-              _3[1]
-            ];
+        "?" + _3[0],
+        _4,
+        _3[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "?" + _2[0],
-              undefined,
-              _2[1]
-            ];
+        "?" + _2[0],
+        undefined,
+        _2[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              "?" + _1,
-              _4,
-              _3
-            ];
+        "?" + _1,
+        _4,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "?" + _1,
-              undefined,
-              _2
-            ];
+        "?" + _1,
+        undefined,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _3[0],
-              undefined,
-              _3[1]
-            ];
+        _3[0],
+        undefined,
+        _3[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2[0],
-              undefined,
-              _2[1]
-            ];
+        _2[0],
+        undefined,
+        _2[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              undefined,
-              _2
-            ];
+        _1,
+        undefined,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "",
-              undefined,
-              _1
-            ];
+        "",
+        undefined,
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_var */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Ppat_var */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       return mkpat(/* Ppat_any */0);
@@ -6412,26 +6412,26 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1[0],
-              mkpat({
-                    TAG: /* Ppat_constraint */10,
-                    _0: _1[1],
-                    _1: _3
-                  })
-            ];
+        _1[0],
+        mkpat({
+              TAG: /* Ppat_constraint */10,
+              _0: _1[1],
+              _1: _3
+            })
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              mkpat({
-                    TAG: /* Ppat_var */0,
-                    _0: {
-                      txt: _1,
-                      loc: rhs_loc(1)
-                    }
-                  })
-            ];
+        _1,
+        mkpat({
+              TAG: /* Ppat_var */0,
+              _0: {
+                txt: _1,
+                loc: rhs_loc(1)
+              }
+            })
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -6440,10 +6440,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_constraint */10,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Ppat_constraint */10,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -6452,10 +6452,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: _1,
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pexp_apply */5,
+            _0: _1,
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -6463,13 +6463,13 @@ const yyact = [
       const bindings = Stdlib__List.map((function (lb) {
               if (Caml_obj.caml_notequal(lb.lb_attributes, /* [] */0)) {
                 throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                          MEL_EXN_ID: $$Error$1,
-                          _1: {
-                            TAG: /* Not_expecting */2,
-                            _0: lb.lb_loc,
-                            _1: "item attribute"
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$1,
+                      _1: {
+                        TAG: /* Not_expecting */2,
+                        _0: lb.lb_loc,
+                        _1: "item attribute"
+                      }
+                    });
               }
               return mk$17(lb.lb_loc, undefined, undefined, undefined, lb.lb_pattern, lb.lb_expression);
             }), _1.lbs_bindings);
@@ -6482,9 +6482,9 @@ const yyact = [
         _2: _3
       };
       return wrap_exp_attrs(mkexp(d), [
-                  _1.lbs_extension,
-                  _1.lbs_attributes
-                ]);
+            _1.lbs_extension,
+            _1.lbs_attributes
+          ]);
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -6535,22 +6535,22 @@ const yyact = [
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_fun */4,
-                      _0: _3[0],
-                      _1: _3[1],
-                      _2: _3[2],
-                      _3: _4
-                    }), _2);
+                TAG: /* Pexp_fun */4,
+                _0: _3[0],
+                _1: _3[1],
+                _2: _3[2],
+                _3: _4
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_newtype */30,
-                      _0: _5,
-                      _1: _7
-                    }), _2);
+                TAG: /* Pexp_newtype */30,
+                _0: _5,
+                _1: _7
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -6582,36 +6582,36 @@ const yyact = [
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                MEL_EXN_ID: Escape_error
-              });
+            MEL_EXN_ID: Escape_error
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_tuple */8,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pexp_tuple */8,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_construct */9,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: _2
-                });
+            TAG: /* Pexp_construct */9,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_variant */10,
-                  _0: _1,
-                  _1: _2
-                });
+            TAG: /* Pexp_variant */10,
+            _0: _1,
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -6619,32 +6619,32 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_ifthenelse */15,
-                      _0: _3,
-                      _1: _5,
-                      _2: _7
-                    }), _2);
+                TAG: /* Pexp_ifthenelse */15,
+                _0: _3,
+                _1: _5,
+                _2: _7
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_ifthenelse */15,
-                      _0: _3,
-                      _1: _5,
-                      _2: undefined
-                    }), _2);
+                TAG: /* Pexp_ifthenelse */15,
+                _0: _3,
+                _1: _5,
+                _2: undefined
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_while */17,
-                      _0: _3,
-                      _1: _5
-                    }), _2);
+                TAG: /* Pexp_while */17,
+                _0: _3,
+                _1: _5
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 8);
@@ -6654,41 +6654,41 @@ const yyact = [
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _9 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_for */18,
-                      _0: _3,
-                      _1: _5,
-                      _2: _7,
-                      _3: _6,
-                      _4: _9
-                    }), _2);
+                TAG: /* Pexp_for */18,
+                _0: _3,
+                _1: _5,
+                _2: _7,
+                _3: _6,
+                _4: _9
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp_cons(rhs_loc(2), ghexp({
-                      TAG: /* Pexp_tuple */8,
-                      _0: {
-                        hd: _1,
-                        tl: {
-                          hd: _3,
-                          tl: /* [] */0
-                        }
-                      }
-                    }), symbol_rloc(undefined));
+                TAG: /* Pexp_tuple */8,
+                _0: {
+                  hd: _1,
+                  tl: {
+                    hd: _3,
+                    tl: /* [] */0
+                  }
+                }
+              }), symbol_rloc(undefined));
     }),
   (function (__caml_parser_env) {
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp_cons(rhs_loc(2), ghexp({
-                      TAG: /* Pexp_tuple */8,
-                      _0: {
-                        hd: _5,
-                        tl: {
-                          hd: _7,
-                          tl: /* [] */0
-                        }
-                      }
-                    }), symbol_rloc(undefined));
+                TAG: /* Pexp_tuple */8,
+                _0: {
+                  hd: _5,
+                  tl: {
+                    hd: _7,
+                    tl: /* [] */0
+                  }
+                }
+              }), symbol_rloc(undefined));
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -6807,36 +6807,36 @@ const yyact = [
               switch (n.TAG) {
                 case /* Const_int */0 :
                     return mkexp({
-                                TAG: /* Pexp_constant */1,
-                                _0: {
-                                  TAG: /* Const_int */0,
-                                  _0: -n._0 | 0
-                                }
-                              });
+                          TAG: /* Pexp_constant */1,
+                          _0: {
+                            TAG: /* Const_int */0,
+                            _0: -n._0 | 0
+                          }
+                        });
                 case /* Const_int32 */4 :
                     return mkexp({
-                                TAG: /* Pexp_constant */1,
-                                _0: {
-                                  TAG: /* Const_int32 */4,
-                                  _0: -n._0 | 0
-                                }
-                              });
+                          TAG: /* Pexp_constant */1,
+                          _0: {
+                            TAG: /* Const_int32 */4,
+                            _0: -n._0 | 0
+                          }
+                        });
                 case /* Const_int64 */5 :
                     return mkexp({
-                                TAG: /* Pexp_constant */1,
-                                _0: {
-                                  TAG: /* Const_int64 */5,
-                                  _0: Caml_int64.neg(n._0)
-                                }
-                              });
+                          TAG: /* Pexp_constant */1,
+                          _0: {
+                            TAG: /* Const_int64 */5,
+                            _0: Caml_int64.neg(n._0)
+                          }
+                        });
                 case /* Const_nativeint */6 :
                     return mkexp({
-                                TAG: /* Pexp_constant */1,
-                                _0: {
-                                  TAG: /* Const_nativeint */6,
-                                  _0: Caml_external_polyfill.resolve("nativeint_neg")(n._0)
-                                }
-                              });
+                          TAG: /* Pexp_constant */1,
+                          _0: {
+                            TAG: /* Const_nativeint */6,
+                            _0: Caml_external_polyfill.resolve("nativeint_neg")(n._0)
+                          }
+                        });
                 default:
                   exit = 2;
               }
@@ -6854,26 +6854,26 @@ const yyact = [
         const f = match._0;
         if (f.TAG === /* Const_float */3) {
           return mkexp({
-                      TAG: /* Pexp_constant */1,
-                      _0: {
-                        TAG: /* Const_float */3,
-                        _0: neg_float_string(f._0)
-                      }
-                    });
+                TAG: /* Pexp_constant */1,
+                _0: {
+                  TAG: /* Const_float */3,
+                  _0: neg_float_string(f._0)
+                }
+              });
         }
         
       }
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: mkoperator("~" + _1, 1),
-                  _1: {
-                    hd: [
-                      "",
-                      _2
-                    ],
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: mkoperator("~" + _1, 1),
+            _1: {
+              hd: [
+                "",
+                _2
+              ],
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -6906,92 +6906,92 @@ const yyact = [
         return mkexp(desc);
       }
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: mkoperator("~" + _1, 1),
-                  _1: {
-                    hd: [
-                      "",
-                      _2
-                    ],
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: mkoperator("~" + _1, 1),
+            _1: {
+              hd: [
+                "",
+                _2
+              ],
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_setfield */13,
-                  _0: _1,
-                  _1: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  },
-                  _2: _5
-                });
+            TAG: /* Pexp_setfield */13,
+            _0: _1,
+            _1: {
+              txt: _3,
+              loc: rhs_loc(3)
+            },
+            _2: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: array_function("Array", "set")
-                      }),
-                  _1: {
-                    hd: [
-                      "",
-                      _1
-                    ],
-                    tl: {
-                      hd: [
-                        "",
-                        _4
-                      ],
-                      tl: {
-                        hd: [
-                          "",
-                          _7
-                        ],
-                        tl: /* [] */0
-                      }
-                    }
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: array_function("Array", "set")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  _4
+                ],
+                tl: {
+                  hd: [
+                    "",
+                    _7
+                  ],
+                  tl: /* [] */0
+                }
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: array_function("String", "set")
-                      }),
-                  _1: {
-                    hd: [
-                      "",
-                      _1
-                    ],
-                    tl: {
-                      hd: [
-                        "",
-                        _4
-                      ],
-                      tl: {
-                        hd: [
-                          "",
-                          _7
-                        ],
-                        tl: /* [] */0
-                      }
-                    }
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: array_function("String", "set")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  _4
+                ],
+                tl: {
+                  hd: [
+                    "",
+                    _7
+                  ],
+                  tl: /* [] */0
+                }
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -7004,175 +7004,175 @@ const yyact = [
         const c1 = coords.hd;
         if (!match) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array1", set)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              _7
-                            ],
-                            tl: /* [] */0
-                          }
-                        }
-                      }
-                    });
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array1", set)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
+                    hd: [
+                      "",
+                      c1
+                    ],
+                    tl: {
+                      hd: [
+                        "",
+                        _7
+                      ],
+                      tl: /* [] */0
+                    }
+                  }
+                }
+              });
         }
         const match$1 = match.tl;
         const c2 = match.hd;
         if (!match$1) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array2", set)
-                          }),
-                      _1: {
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array2", set)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
+                    hd: [
+                      "",
+                      c1
+                    ],
+                    tl: {
+                      hd: [
+                        "",
+                        c2
+                      ],
+                      tl: {
                         hd: [
                           "",
-                          _1
+                          _7
                         ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              c2
-                            ],
-                            tl: {
-                              hd: [
-                                "",
-                                _7
-                              ],
-                              tl: /* [] */0
-                            }
-                          }
-                        }
+                        tl: /* [] */0
                       }
-                    });
+                    }
+                  }
+                }
+              });
         }
         if (!match$1.tl) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array3", set)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              c2
-                            ],
-                            tl: {
-                              hd: [
-                                "",
-                                match$1.hd
-                              ],
-                              tl: {
-                                hd: [
-                                  "",
-                                  _7
-                                ],
-                                tl: /* [] */0
-                              }
-                            }
-                          }
-                        }
-                      }
-                    });
-        }
-        
-      }
-      return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: bigarray_function("Genarray", "set")
-                      }),
-                  _1: {
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array3", set)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
                     hd: [
                       "",
-                      _1
+                      c1
                     ],
                     tl: {
                       hd: [
                         "",
-                        ghexp({
-                              TAG: /* Pexp_array */14,
-                              _0: coords
-                            })
+                        c2
                       ],
                       tl: {
                         hd: [
                           "",
-                          _7
+                          match$1.hd
                         ],
-                        tl: /* [] */0
+                        tl: {
+                          hd: [
+                            "",
+                            _7
+                          ],
+                          tl: /* [] */0
+                        }
                       }
                     }
                   }
-                });
+                }
+              });
+        }
+        
+      }
+      return mkexp({
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: bigarray_function("Genarray", "set")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  ghexp({
+                        TAG: /* Pexp_array */14,
+                        _0: coords
+                      })
+                ],
+                tl: {
+                  hd: [
+                    "",
+                    _7
+                  ],
+                  tl: /* [] */0
+                }
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_setinstvar */23,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: _3
-                });
+            TAG: /* Pexp_setinstvar */23,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_assert */26,
-                      _0: _3
-                    }), _2);
+                TAG: /* Pexp_assert */26,
+                _0: _3
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_lazy */27,
-                      _0: _3
-                    }), _2);
+                TAG: /* Pexp_lazy */27,
+                _0: _3
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_object */29,
-                      _0: _3
-                    }), _2);
+                TAG: /* Pexp_object */29,
+                _0: _3
+              }), _2);
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -7187,38 +7187,38 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_ident */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Pexp_ident */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_constant */1,
-                  _0: _1
-                });
+            TAG: /* Pexp_constant */1,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_construct */9,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: undefined
-                });
+            TAG: /* Pexp_construct */9,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_variant */10,
-                  _0: _1,
-                  _1: undefined
-                });
+            TAG: /* Pexp_variant */10,
+            _0: _1,
+            _1: undefined
+          });
     }),
   (function (__caml_parser_env) {
       return reloc_exp(Stdlib__Parsing.peek_val(__caml_parser_env, 1));
@@ -7262,26 +7262,26 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_field */12,
-                  _0: _1,
-                  _1: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  }
-                });
+            TAG: /* Pexp_field */12,
+            _0: _1,
+            _1: {
+              txt: _3,
+              loc: rhs_loc(3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: _4
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: _4
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -7292,25 +7292,25 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: array_function("Array", "get")
-                      }),
-                  _1: {
-                    hd: [
-                      "",
-                      _1
-                    ],
-                    tl: {
-                      hd: [
-                        "",
-                        _4
-                      ],
-                      tl: /* [] */0
-                    }
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: array_function("Array", "get")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  _4
+                ],
+                tl: /* [] */0
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -7321,25 +7321,25 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: array_function("String", "get")
-                      }),
-                  _1: {
-                    hd: [
-                      "",
-                      _1
-                    ],
-                    tl: {
-                      hd: [
-                        "",
-                        _4
-                      ],
-                      tl: /* [] */0
-                    }
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: array_function("String", "get")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  _4
+                ],
+                tl: /* [] */0
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -7356,115 +7356,115 @@ const yyact = [
         const c1 = coords.hd;
         if (!match) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array1", get)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: /* [] */0
-                        }
-                      }
-                    });
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array1", get)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
+                    hd: [
+                      "",
+                      c1
+                    ],
+                    tl: /* [] */0
+                  }
+                }
+              });
         }
         const match$1 = match.tl;
         const c2 = match.hd;
         if (!match$1) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array2", get)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              c2
-                            ],
-                            tl: /* [] */0
-                          }
-                        }
-                      }
-                    });
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array2", get)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
+                    hd: [
+                      "",
+                      c1
+                    ],
+                    tl: {
+                      hd: [
+                        "",
+                        c2
+                      ],
+                      tl: /* [] */0
+                    }
+                  }
+                }
+              });
         }
         if (!match$1.tl) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array3", get)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              c2
-                            ],
-                            tl: {
-                              hd: [
-                                "",
-                                match$1.hd
-                              ],
-                              tl: /* [] */0
-                            }
-                          }
-                        }
-                      }
-                    });
-        }
-        
-      }
-      return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: bigarray_function("Genarray", "get")
-                      }),
-                  _1: {
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array3", get)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
                     hd: [
                       "",
-                      _1
+                      c1
                     ],
                     tl: {
                       hd: [
                         "",
-                        ghexp({
-                              TAG: /* Pexp_array */14,
-                              _0: coords
-                            })
+                        c2
                       ],
-                      tl: /* [] */0
+                      tl: {
+                        hd: [
+                          "",
+                          match$1.hd
+                        ],
+                        tl: /* [] */0
+                      }
                     }
                   }
-                });
+                }
+              });
+        }
+        
+      }
+      return mkexp({
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: bigarray_function("Genarray", "get")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  ghexp({
+                        TAG: /* Pexp_array */14,
+                        _0: coords
+                      })
+                ],
+                tl: /* [] */0
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -7474,10 +7474,10 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_record */11,
-                  _0: _2[1],
-                  _1: _2[0]
-                });
+            TAG: /* Pexp_record */11,
+            _0: _2[1],
+            _1: _2[0]
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -7492,14 +7492,14 @@ const yyact = [
             _1: _4[0]
           });
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: rec_exp
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: rec_exp
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -7510,9 +7510,9 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_array */14,
-                  _0: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pexp_array */14,
+            _0: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -7521,26 +7521,26 @@ const yyact = [
     }),
   (function (__caml_parser_env) {
       return mkexp({
-                  TAG: /* Pexp_array */14,
-                  _0: /* [] */0
-                });
+            TAG: /* Pexp_array */14,
+            _0: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: mkexp({
-                        TAG: /* Pexp_array */14,
-                        _0: Stdlib__List.rev(_4)
-                      })
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: mkexp({
+                  TAG: /* Pexp_array */14,
+                  _0: Stdlib__List.rev(_4)
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -7564,14 +7564,14 @@ const yyact = [
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const list_exp = reloc_exp(mktailexp(rhs_loc(6), Stdlib__List.rev(_4)));
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: list_exp
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: list_exp
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -7583,30 +7583,30 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: mkoperator(_1, 1),
-                  _1: {
-                    hd: [
-                      "",
-                      _2
-                    ],
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: mkoperator(_1, 1),
+            _1: {
+              hd: [
+                "",
+                _2
+              ],
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: mkoperator("!", 1),
-                  _1: {
-                    hd: [
-                      "",
-                      _2
-                    ],
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: mkoperator("!", 1),
+            _1: {
+              hd: [
+                "",
+                _2
+              ],
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -7624,9 +7624,9 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_override */24,
-                  _0: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pexp_override */24,
+            _0: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -7635,26 +7635,26 @@ const yyact = [
     }),
   (function (__caml_parser_env) {
       return mkexp({
-                  TAG: /* Pexp_override */24,
-                  _0: /* [] */0
-                });
+            TAG: /* Pexp_override */24,
+            _0: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: mkexp({
-                        TAG: /* Pexp_override */24,
-                        _0: Stdlib__List.rev(_4)
-                      })
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: mkexp({
+                  TAG: /* Pexp_override */24,
+                  _0: Stdlib__List.rev(_4)
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -7666,10 +7666,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_send */21,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Pexp_send */21,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -7680,24 +7680,24 @@ const yyact = [
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_pack */31,
-                  _0: _3
-                });
+            TAG: /* Pexp_pack */31,
+            _0: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_constraint */19,
-                  _0: ghexp({
-                        TAG: /* Pexp_pack */31,
-                        _0: _3
-                      }),
-                  _1: ghtyp({
-                        TAG: /* Ptyp_package */9,
-                        _0: _5
-                      })
-                });
+            TAG: /* Pexp_constraint */19,
+            _0: ghexp({
+                  TAG: /* Pexp_pack */31,
+                  _0: _3
+                }),
+            _1: ghtyp({
+                  TAG: /* Ptyp_package */9,
+                  _0: _5
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -7708,24 +7708,24 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: mkexp({
-                        TAG: /* Pexp_constraint */19,
-                        _0: ghexp({
-                              TAG: /* Pexp_pack */31,
-                              _0: _5
-                            }),
-                        _1: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _7
-                            })
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: mkexp({
+                  TAG: /* Pexp_constraint */19,
+                  _0: ghexp({
+                        TAG: /* Pexp_pack */31,
+                        _0: _5
+                      }),
+                  _1: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _7
                       })
-                });
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -7735,31 +7735,31 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_extension */33,
-                  _0: _1
-                });
+            TAG: /* Pexp_extension */33,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "",
-              _1
-            ];
+        "",
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -7768,9 +7768,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _2
-            ];
+        _1,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -7778,56 +7778,56 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "?" + _2[0],
-              _2[1]
-            ];
+        "?" + _2[0],
+        _2[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "?" + _1,
-              _2
-            ];
+        "?" + _1,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              mkexp({
-                    TAG: /* Pexp_ident */0,
-                    _0: {
-                      txt: {
-                        TAG: /* Lident */0,
-                        _0: _1
-                      },
-                      loc: rhs_loc(1)
-                    }
-                  })
-            ];
+        _1,
+        mkexp({
+              TAG: /* Pexp_ident */0,
+              _0: {
+                txt: {
+                  TAG: /* Lident */0,
+                  _0: _1
+                },
+                loc: rhs_loc(1)
+              }
+            })
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              mkpatvar(_1, 1),
-              _2
-            ];
+        mkpatvar(_1, 1),
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -7835,17 +7835,17 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              ghpat({
-                    TAG: /* Ppat_constraint */10,
-                    _0: mkpatvar(_1, 1),
-                    _1: ghtyp({
-                          TAG: /* Ptyp_poly */8,
-                          _0: Stdlib__List.rev(_3),
-                          _1: _5
-                        })
-                  }),
-              _7
-            ];
+        ghpat({
+              TAG: /* Ppat_constraint */10,
+              _0: mkpatvar(_1, 1),
+              _1: ghtyp({
+                    TAG: /* Ptyp_poly */8,
+                    _0: Stdlib__List.rev(_3),
+                    _1: _5
+                  })
+            }),
+        _7
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 7);
@@ -7854,34 +7854,34 @@ const yyact = [
       const _8 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       const match = wrap_type_annotation(_4, _6, _8);
       return [
-              ghpat({
-                    TAG: /* Ppat_constraint */10,
-                    _0: mkpatvar(_1, 1),
-                    _1: match[1]
-                  }),
-              match[0]
-            ];
+        ghpat({
+              TAG: /* Ppat_constraint */10,
+              _0: mkpatvar(_1, 1),
+              _1: match[1]
+            }),
+        match[0]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _3
-            ];
+        _1,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              ghpat({
-                    TAG: /* Ppat_constraint */10,
-                    _0: _1,
-                    _1: _3
-                  }),
-              _5
-            ];
+        ghpat({
+              TAG: /* Ppat_constraint */10,
+              _0: _1,
+              _1: _3
+            }),
+        _5
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -7890,15 +7890,15 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              lbs_bindings: {
-                hd: _2,
-                tl: _1.lbs_bindings
-              },
-              lbs_rec: _1.lbs_rec,
-              lbs_extension: _1.lbs_extension,
-              lbs_attributes: _1.lbs_attributes,
-              lbs_loc: _1.lbs_loc
-            };
+        lbs_bindings: {
+          hd: _2,
+          tl: _1.lbs_bindings
+        },
+        lbs_rec: _1.lbs_rec,
+        lbs_extension: _1.lbs_extension,
+        lbs_attributes: _1.lbs_attributes,
+        lbs_loc: _1.lbs_loc
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -7907,15 +7907,15 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       let lb = mklb(_4, _5);
       return {
-              lbs_bindings: {
-                hd: lb,
-                tl: /* [] */0
-              },
-              lbs_rec: _3,
-              lbs_extension: _2[0],
-              lbs_attributes: _2[1],
-              lbs_loc: symbol_rloc(undefined)
-            };
+        lbs_bindings: {
+          hd: lb,
+          tl: /* [] */0
+        },
+        lbs_rec: _3,
+        lbs_extension: _2[0],
+        lbs_attributes: _2[1],
+        lbs_loc: symbol_rloc(undefined)
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -7937,36 +7937,36 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return ghexp({
-                  TAG: /* Pexp_fun */4,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _2
-                });
+            TAG: /* Pexp_fun */4,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_newtype */30,
-                  _0: _3,
-                  _1: _5
-                });
+            TAG: /* Pexp_newtype */30,
+            _0: _3,
+            _1: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -7986,174 +7986,174 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return ghexp({
-                  TAG: /* Pexp_fun */4,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _2
-                });
+            TAG: /* Pexp_fun */4,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_newtype */30,
-                  _0: _3,
-                  _1: _5
-                });
+            TAG: /* Pexp_newtype */30,
+            _0: _3,
+            _1: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: {
-                hd: _1,
-                tl: /* [] */0
-              }
-            };
+        hd: _3,
+        tl: {
+          hd: _1,
+          tl: /* [] */0
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _3
-            ];
+        _1,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              undefined,
-              _1
-            ];
+        undefined,
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _3
-            };
+        hd: _1,
+        tl: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              _3
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              exp_of_label(_1, 1)
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        exp_of_label(_1, 1)
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: [
-                {
-                  txt: _1,
-                  loc: rhs_loc(1)
-                },
-                _3
-              ],
-              tl: /* [] */0
-            };
+        hd: [
+          {
+            txt: _1,
+            loc: rhs_loc(1)
+          },
+          _3
+        ],
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: [
-                {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                },
-                _5
-              ],
-              tl: _1
-            };
+        hd: [
+          {
+            txt: _3,
+            loc: rhs_loc(3)
+          },
+          _5
+        ],
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              undefined
-            ];
+        _2,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              _4
-            ];
+        _2,
+        _4
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              undefined,
-              _2
-            ];
+        undefined,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                MEL_EXN_ID: Escape_error
-              });
+            MEL_EXN_ID: Escape_error
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                MEL_EXN_ID: Escape_error
-              });
+            MEL_EXN_ID: Escape_error
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -8162,13 +8162,13 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_alias */1,
-                  _0: _1,
-                  _1: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  }
-                });
+            TAG: /* Ppat_alias */1,
+            _0: _1,
+            _1: {
+              txt: _3,
+              loc: rhs_loc(3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -8177,44 +8177,44 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_tuple */4,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Ppat_tuple */4,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_construct */5,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: _2
-                });
+            TAG: /* Ppat_construct */5,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_variant */6,
-                  _0: _1,
-                  _1: _2
-                });
+            TAG: /* Ppat_variant */6,
+            _0: _1,
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat_cons(rhs_loc(2), ghpat({
-                      TAG: /* Ppat_tuple */4,
-                      _0: {
-                        hd: _1,
-                        tl: {
-                          hd: _3,
-                          tl: /* [] */0
-                        }
-                      }
-                    }), symbol_rloc(undefined));
+                TAG: /* Ppat_tuple */4,
+                _0: {
+                  hd: _1,
+                  tl: {
+                    hd: _3,
+                    tl: /* [] */0
+                  }
+                }
+              }), symbol_rloc(undefined));
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -8224,15 +8224,15 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat_cons(rhs_loc(2), ghpat({
-                      TAG: /* Ppat_tuple */4,
-                      _0: {
-                        hd: _5,
-                        tl: {
-                          hd: _7,
-                          tl: /* [] */0
-                        }
-                      }
-                    }), symbol_rloc(undefined));
+                TAG: /* Ppat_tuple */4,
+                _0: {
+                  hd: _5,
+                  tl: {
+                    hd: _7,
+                    tl: /* [] */0
+                  }
+                }
+              }), symbol_rloc(undefined));
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -8243,10 +8243,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_or */9,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Ppat_or */9,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -8255,16 +8255,16 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_lazy */12,
-                  _0: _2
-                });
+            TAG: /* Ppat_lazy */12,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_exception */14,
-                  _0: _2
-                });
+            TAG: /* Ppat_exception */14,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -8274,12 +8274,12 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_var */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Ppat_var */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -8290,55 +8290,55 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_constant */2,
-                  _0: _1
-                });
+            TAG: /* Ppat_constant */2,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_interval */3,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Ppat_interval */3,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_construct */5,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: undefined
-                });
+            TAG: /* Ppat_construct */5,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_variant */6,
-                  _0: _1,
-                  _1: undefined
-                });
+            TAG: /* Ppat_variant */6,
+            _0: _1,
+            _1: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_type */11,
-                  _0: {
-                    txt: _2,
-                    loc: rhs_loc(2)
-                  }
-                });
+            TAG: /* Ppat_type */11,
+            _0: {
+              txt: _2,
+              loc: rhs_loc(2)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_record */7,
-                  _0: _2[0],
-                  _1: _2[1]
-                });
+            TAG: /* Ppat_record */7,
+            _0: _2[0],
+            _1: _2[1]
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -8358,15 +8358,15 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_array */8,
-                  _0: Stdlib__List.rev(_2)
-                });
+            TAG: /* Ppat_array */8,
+            _0: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       return mkpat({
-                  TAG: /* Ppat_array */8,
-                  _0: /* [] */0
-                });
+            TAG: /* Ppat_array */8,
+            _0: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -8384,10 +8384,10 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_constraint */10,
-                  _0: _2,
-                  _1: _4
-                });
+            TAG: /* Ppat_constraint */10,
+            _0: _2,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -8401,30 +8401,30 @@ const yyact = [
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_unpack */13,
-                  _0: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  }
-                });
+            TAG: /* Ppat_unpack */13,
+            _0: {
+              txt: _3,
+              loc: rhs_loc(3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_constraint */10,
-                  _0: mkpat({
-                        TAG: /* Ppat_unpack */13,
-                        _0: {
-                          txt: _3,
-                          loc: rhs_loc(3)
-                        }
-                      }),
-                  _1: ghtyp({
-                        TAG: /* Ptyp_package */9,
-                        _0: _5
-                      })
-                });
+            TAG: /* Ppat_constraint */10,
+            _0: mkpat({
+                  TAG: /* Ppat_unpack */13,
+                  _0: {
+                    txt: _3,
+                    loc: rhs_loc(3)
+                  }
+                }),
+            _1: ghtyp({
+                  TAG: /* Ptyp_package */9,
+                  _0: _5
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -8434,28 +8434,28 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_extension */15,
-                  _0: _1
-                });
+            TAG: /* Ppat_extension */15,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: {
-                hd: _1,
-                tl: /* [] */0
-              }
-            };
+        hd: _3,
+        tl: {
+          hd: _1,
+          tl: /* [] */0
+        }
+      };
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -8464,104 +8464,104 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: /* [] */0
-              },
-              /* Closed */0
-            ];
+        {
+          hd: _1,
+          tl: /* [] */0
+        },
+        /* Closed */0
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              {
-                hd: _1,
-                tl: /* [] */0
-              },
-              /* Closed */0
-            ];
+        {
+          hd: _1,
+          tl: /* [] */0
+        },
+        /* Closed */0
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: /* [] */0
-              },
-              /* Open */1
-            ];
+        {
+          hd: _1,
+          tl: /* [] */0
+        },
+        /* Open */1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: _3[0]
-              },
-              _3[1]
-            ];
+        {
+          hd: _1,
+          tl: _3[0]
+        },
+        _3[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              _3
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              pat_of_label(_1, 1)
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        pat_of_label(_1, 1)
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$11(symbol_rloc(undefined), _5, symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1[0],
-              tl: /* [] */0
-            };
+        hd: _1[0],
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1[0],
-              tl: _2
-            };
+        hd: _1[0],
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -8569,24 +8569,24 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$11(symbol_rloc(undefined), _7, symbol_docs(undefined), _6, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -8596,9 +8596,9 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$19(symbol_rloc(undefined), add_nonrec(_2, _7, 2), symbol_docs(undefined), undefined, _3, Stdlib__List.rev(_6), _5[0], _5[1], _5[2], {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                });
+            txt: _4,
+            loc: rhs_loc(4)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -8607,118 +8607,118 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$19(symbol_rloc(undefined), _6, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), _2, Stdlib__List.rev(_5), _4[0], _4[1], _4[2], {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                });
+            txt: _3,
+            loc: rhs_loc(3)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
     }),
   (function (__caml_parser_env) {
       return [
-              /* Ptype_abstract */0,
-              /* Public */1,
-              undefined
-            ];
+        /* Ptype_abstract */0,
+        /* Public */1,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              /* Ptype_abstract */0,
-              /* Public */1,
-              _2
-            ];
+        /* Ptype_abstract */0,
+        /* Public */1,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              /* Ptype_abstract */0,
-              /* Private */0,
-              _3
-            ];
+        /* Ptype_abstract */0,
+        /* Private */0,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                TAG: /* Ptype_variant */0,
-                _0: Stdlib__List.rev(_2)
-              },
-              /* Public */1,
-              undefined
-            ];
+        {
+          TAG: /* Ptype_variant */0,
+          _0: Stdlib__List.rev(_2)
+        },
+        /* Public */1,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                TAG: /* Ptype_variant */0,
-                _0: Stdlib__List.rev(_3)
-              },
-              /* Private */0,
-              undefined
-            ];
+        {
+          TAG: /* Ptype_variant */0,
+          _0: Stdlib__List.rev(_3)
+        },
+        /* Private */0,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Ptype_open */1,
-              /* Public */1,
-              undefined
-            ];
+        /* Ptype_open */1,
+        /* Public */1,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              {
-                TAG: /* Ptype_record */1,
-                _0: _4
-              },
-              _2,
-              undefined
-            ];
+        {
+          TAG: /* Ptype_record */1,
+          _0: _4
+        },
+        _2,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                TAG: /* Ptype_variant */0,
-                _0: Stdlib__List.rev(_5)
-              },
-              _4,
-              _2
-            ];
+        {
+          TAG: /* Ptype_variant */0,
+          _0: Stdlib__List.rev(_5)
+        },
+        _4,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       return [
-              /* Ptype_open */1,
-              /* Public */1,
-              _2
-            ];
+        /* Ptype_open */1,
+        /* Public */1,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              {
-                TAG: /* Ptype_record */1,
-                _0: _6
-              },
-              _4,
-              _2
-            ];
+        {
+          TAG: /* Ptype_record */1,
+          _0: _6
+        },
+        _4,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -8726,9 +8726,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__List.rev(Stdlib__Parsing.peek_val(__caml_parser_env, 1));
@@ -8737,31 +8737,31 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              _1
-            ];
+        _2,
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_var */0,
-                  _0: _2
-                });
+            TAG: /* Ptyp_var */0,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       return mktyp(/* Ptyp_any */0);
@@ -8772,9 +8772,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__List.rev(Stdlib__Parsing.peek_val(__caml_parser_env, 1));
@@ -8783,9 +8783,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              _1
-            ];
+        _2,
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       return /* Invariant */2;
@@ -8799,64 +8799,64 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_var */0,
-                  _0: _2
-                });
+            TAG: /* Ptyp_var */0,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return constructor(symbol_rloc(undefined), _3, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _2[0], _2[1], {
-                  txt: _1,
-                  loc: rhs_loc(1)
-                });
+            txt: _1,
+            loc: rhs_loc(1)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return constructor(symbol_rloc(undefined), _4, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _3[0], _3[1], {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -8867,12 +8867,12 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return rebind(symbol_rloc(undefined), Stdlib.$at(_5, _6), symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          }, {
+            txt: _4,
+            loc: rhs_loc(4)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -8880,59 +8880,59 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return decl(symbol_rloc(undefined), Stdlib.$at(_4, _5), symbol_docs(undefined), undefined, _3[0], _3[1], {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          });
     }),
   (function (__caml_parser_env) {
       return [
-              /* [] */0,
-              undefined
-            ];
+        /* [] */0,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              Stdlib__List.rev(_2),
-              undefined
-            ];
+        Stdlib__List.rev(_2),
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              Stdlib__List.rev(_2),
-              _4
-            ];
+        Stdlib__List.rev(_2),
+        _4
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              /* [] */0,
-              _2
-            ];
+        /* [] */0,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -8940,9 +8940,9 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return field$1(symbol_rloc(undefined), _5, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _1, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -8953,9 +8953,9 @@ const yyact = [
       const info_before_semi = get_info(Stdlib__Parsing.rhs_end_pos(5));
       const info = info_before_semi !== undefined ? info_before_semi : get_info(Stdlib__Parsing.symbol_end_pos(undefined));
       return field$1(symbol_rloc(undefined), Stdlib.$at(_5, _7), Caml_option.some(info), _1, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -8968,9 +8968,9 @@ const yyact = [
         not_expecting(2, "nonrec flag");
       }
       return mk$20(_8, symbol_docs(undefined), _3, _6, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, Stdlib__List.rev(_7));
+            txt: _4,
+            loc: rhs_loc(4)
+          }, Stdlib__List.rev(_7));
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -8983,132 +8983,132 @@ const yyact = [
         not_expecting(2, "nonrec flag");
       }
       return mk$20(_8, symbol_docs(undefined), _3, _6, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, Stdlib__List.rev(_7));
+            txt: _4,
+            loc: rhs_loc(4)
+          }, Stdlib__List.rev(_7));
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return decl(symbol_rloc(undefined), _3, undefined, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _2[0], _2[1], {
-                  txt: _1,
-                  loc: rhs_loc(1)
-                });
+            txt: _1,
+            loc: rhs_loc(1)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return decl(symbol_rloc(undefined), _4, undefined, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _3[0], _3[1], {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return rebind(symbol_rloc(undefined), _4, undefined, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), {
-                  txt: _1,
-                  loc: rhs_loc(1)
-                }, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                });
+            txt: _1,
+            loc: rhs_loc(1)
+          }, {
+            txt: _3,
+            loc: rhs_loc(3)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return rebind(symbol_rloc(undefined), _5, undefined, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          }, {
+            txt: _4,
+            loc: rhs_loc(4)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -9118,58 +9118,58 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       const rhs = last(_3);
       return {
-              TAG: /* Pwith_type */0,
-              _0: {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _1: mk$19(symbol_rloc(undefined), undefined, undefined, undefined, _2, Stdlib__List.rev(_6), undefined, _4, _5, {
-                    txt: rhs,
-                    loc: rhs_loc(3)
-                  })
-            };
+        TAG: /* Pwith_type */0,
+        _0: {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _1: mk$19(symbol_rloc(undefined), undefined, undefined, undefined, _2, Stdlib__List.rev(_6), undefined, _4, _5, {
+              txt: rhs,
+              loc: rhs_loc(3)
+            })
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Pwith_typesubst */2,
-              _0: mk$19(symbol_rloc(undefined), undefined, undefined, undefined, _2, undefined, undefined, undefined, _5, {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  })
-            };
+        TAG: /* Pwith_typesubst */2,
+        _0: mk$19(symbol_rloc(undefined), undefined, undefined, undefined, _2, undefined, undefined, undefined, _5, {
+              txt: _3,
+              loc: rhs_loc(3)
+            })
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Pwith_module */1,
-              _0: {
-                txt: _2,
-                loc: rhs_loc(2)
-              },
-              _1: {
-                txt: _4,
-                loc: rhs_loc(4)
-              }
-            };
+        TAG: /* Pwith_module */1,
+        _0: {
+          txt: _2,
+          loc: rhs_loc(2)
+        },
+        _1: {
+          txt: _4,
+          loc: rhs_loc(4)
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Pwith_modsubst */3,
-              _0: {
-                txt: _2,
-                loc: rhs_loc(2)
-              },
-              _1: {
-                txt: _4,
-                loc: rhs_loc(4)
-              }
-            };
+        TAG: /* Pwith_modsubst */3,
+        _0: {
+          txt: _2,
+          loc: rhs_loc(2)
+        },
+        _1: {
+          txt: _4,
+          loc: rhs_loc(4)
+        }
+      };
     }),
   (function (__caml_parser_env) {
       return /* Public */1;
@@ -9180,17 +9180,17 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: /* [] */0
-            };
+        hd: _2,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9199,10 +9199,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_poly */8,
-                  _0: Stdlib__List.rev(_1),
-                  _1: _3
-                });
+            TAG: /* Ptyp_poly */8,
+            _0: Stdlib__List.rev(_1),
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9211,10 +9211,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_poly */8,
-                  _0: Stdlib__List.rev(_1),
-                  _1: _3
-                });
+            TAG: /* Ptyp_poly */8,
+            _0: Stdlib__List.rev(_1),
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9231,10 +9231,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_alias */6,
-                  _0: _1,
-                  _1: _4
-                });
+            TAG: /* Ptyp_alias */6,
+            _0: _1,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9244,43 +9244,43 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_arrow */1,
-                  _0: "?" + _2,
-                  _1: mkoption(_4),
-                  _2: _6
-                });
+            TAG: /* Ptyp_arrow */1,
+            _0: "?" + _2,
+            _1: mkoption(_4),
+            _2: _6
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_arrow */1,
-                  _0: "?" + _1,
-                  _1: mkoption(_2),
-                  _2: _4
-                });
+            TAG: /* Ptyp_arrow */1,
+            _0: "?" + _1,
+            _1: mkoption(_2),
+            _2: _4
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_arrow */1,
-                  _0: _1,
-                  _1: _3,
-                  _2: _5
-                });
+            TAG: /* Ptyp_arrow */1,
+            _0: _1,
+            _1: _3,
+            _2: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_arrow */1,
-                  _0: "",
-                  _1: _1,
-                  _2: _3
-                });
+            TAG: /* Ptyp_arrow */1,
+            _0: "",
+            _1: _1,
+            _2: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9290,14 +9290,14 @@ const yyact = [
       if (_2) {
         if (_2.tl) {
           throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.Parse_error, {
-                    MEL_EXN_ID: Stdlib__Parsing.Parse_error
-                  });
+                MEL_EXN_ID: Stdlib__Parsing.Parse_error
+              });
         }
         return _2.hd;
       }
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.Parse_error, {
-                MEL_EXN_ID: Stdlib__Parsing.Parse_error
-              });
+            MEL_EXN_ID: Stdlib__Parsing.Parse_error
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9307,21 +9307,21 @@ const yyact = [
       if (_2) {
         if (_2.tl) {
           throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.Parse_error, {
-                    MEL_EXN_ID: Stdlib__Parsing.Parse_error
-                  });
+                MEL_EXN_ID: Stdlib__Parsing.Parse_error
+              });
         }
         return _2.hd;
       }
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.Parse_error, {
-                MEL_EXN_ID: Stdlib__Parsing.Parse_error
-              });
+            MEL_EXN_ID: Stdlib__Parsing.Parse_error
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_var */0,
-                  _0: _2
-                });
+            TAG: /* Ptyp_var */0,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       return mktyp(/* Ptyp_any */0);
@@ -9329,242 +9329,242 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_constr */3,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: /* [] */0
-                });
+            TAG: /* Ptyp_constr */3,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_constr */3,
-                  _0: {
-                    txt: _2,
-                    loc: rhs_loc(2)
-                  },
-                  _1: {
-                    hd: _1,
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Ptyp_constr */3,
+            _0: {
+              txt: _2,
+              loc: rhs_loc(2)
+            },
+            _1: {
+              hd: _1,
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_constr */3,
-                  _0: {
-                    txt: _4,
-                    loc: rhs_loc(4)
-                  },
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Ptyp_constr */3,
+            _0: {
+              txt: _4,
+              loc: rhs_loc(4)
+            },
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_object */4,
-                  _0: _2[0],
-                  _1: _2[1]
-                });
+            TAG: /* Ptyp_object */4,
+            _0: _2[0],
+            _1: _2[1]
+          });
     }),
   (function (__caml_parser_env) {
       return mktyp({
-                  TAG: /* Ptyp_object */4,
-                  _0: /* [] */0,
-                  _1: /* Closed */0
-                });
+            TAG: /* Ptyp_object */4,
+            _0: /* [] */0,
+            _1: /* Closed */0
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_class */5,
-                  _0: {
-                    txt: _2,
-                    loc: rhs_loc(2)
-                  },
-                  _1: /* [] */0
-                });
+            TAG: /* Ptyp_class */5,
+            _0: {
+              txt: _2,
+              loc: rhs_loc(2)
+            },
+            _1: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_class */5,
-                  _0: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  },
-                  _1: {
-                    hd: _1,
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Ptyp_class */5,
+            _0: {
+              txt: _3,
+              loc: rhs_loc(3)
+            },
+            _1: {
+              hd: _1,
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_class */5,
-                  _0: {
-                    txt: _5,
-                    loc: rhs_loc(5)
-                  },
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Ptyp_class */5,
+            _0: {
+              txt: _5,
+              loc: rhs_loc(5)
+            },
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: {
-                    hd: _2,
-                    tl: /* [] */0
-                  },
-                  _1: /* Closed */0,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: {
+              hd: _2,
+              tl: /* [] */0
+            },
+            _1: /* Closed */0,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: Stdlib__List.rev(_3),
-                  _1: /* Closed */0,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: Stdlib__List.rev(_3),
+            _1: /* Closed */0,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: {
-                    hd: _2,
-                    tl: Stdlib__List.rev(_4)
-                  },
-                  _1: /* Closed */0,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: {
+              hd: _2,
+              tl: Stdlib__List.rev(_4)
+            },
+            _1: /* Closed */0,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: Stdlib__List.rev(_3),
-                  _1: /* Open */1,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: Stdlib__List.rev(_3),
+            _1: /* Open */1,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: /* [] */0,
-                  _1: /* Open */1,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: /* [] */0,
+            _1: /* Open */1,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: Stdlib__List.rev(_3),
-                  _1: /* Closed */0,
-                  _2: /* [] */0
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: Stdlib__List.rev(_3),
+            _1: /* Closed */0,
+            _2: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: Stdlib__List.rev(_3),
-                  _1: /* Closed */0,
-                  _2: Stdlib__List.rev(_5)
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: Stdlib__List.rev(_3),
+            _1: /* Closed */0,
+            _2: Stdlib__List.rev(_5)
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_package */9,
-                  _0: _3
-                });
+            TAG: /* Ptyp_package */9,
+            _0: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_extension */10,
-                  _0: _1
-                });
+            TAG: /* Ptyp_extension */10,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              /* [] */0
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        /* [] */0
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              _3
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _2,
-                loc: rhs_loc(2)
-              },
-              _4
-            ];
+        {
+          txt: _2,
+          loc: rhs_loc(2)
+        },
+        _4
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _3
-            };
+        hd: _1,
+        tl: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9572,9 +9572,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Rinherit */1,
-              _0: _1
-            };
+        TAG: /* Rinherit */1,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -9582,23 +9582,23 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Rtag */0,
-              _0: _1,
-              _1: _5,
-              _2: _3,
-              _3: Stdlib__List.rev(_4)
-            };
+        TAG: /* Rtag */0,
+        _0: _1,
+        _1: _5,
+        _2: _3,
+        _3: Stdlib__List.rev(_4)
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Rtag */0,
-              _0: _1,
-              _1: _2,
-              _2: true,
-              _3: /* [] */0
-            };
+        TAG: /* Rtag */0,
+        _0: _1,
+        _1: _2,
+        _2: true,
+        _3: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       return true;
@@ -9609,32 +9609,32 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9643,12 +9643,12 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_tuple */2,
-                  _0: {
-                    hd: _1,
-                    tl: Stdlib__List.rev(_3)
-                  }
-                });
+            TAG: /* Ptyp_tuple */2,
+            _0: {
+              hd: _1,
+              tl: Stdlib__List.rev(_3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9657,95 +9657,95 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_tuple */2,
-                  _0: {
-                    hd: _1,
-                    tl: Stdlib__List.rev(_3)
-                  }
-                });
+            TAG: /* Ptyp_tuple */2,
+            _0: {
+              hd: _1,
+              tl: Stdlib__List.rev(_3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: _3[0]
-              },
-              _3[1]
-            ];
+        {
+          hd: _1,
+          tl: _3[0]
+        },
+        _3[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: /* [] */0
-              },
-              /* Closed */0
-            ];
+        {
+          hd: _1,
+          tl: /* [] */0
+        },
+        /* Closed */0
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* [] */0,
-              /* Open */1
-            ];
+        /* [] */0,
+        /* Open */1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _4,
-              _3
-            ];
+        _1,
+        _4,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9753,52 +9753,52 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int */0,
-              _0: _1
-            };
+        TAG: /* Const_int */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_char */1,
-              _0: _1
-            };
+        TAG: /* Const_char */1,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_string */2,
-              _0: _1[0],
-              _1: _1[1]
-            };
+        TAG: /* Const_string */2,
+        _0: _1[0],
+        _1: _1[1]
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_float */3,
-              _0: _1
-            };
+        TAG: /* Const_float */3,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int32 */4,
-              _0: _1
-            };
+        TAG: /* Const_int32 */4,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int64 */5,
-              _0: _1
-            };
+        TAG: /* Const_int64 */5,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_nativeint */6,
-              _0: _1
-            };
+        TAG: /* Const_nativeint */6,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9806,72 +9806,72 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int */0,
-              _0: -_2 | 0
-            };
+        TAG: /* Const_int */0,
+        _0: -_2 | 0
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_float */3,
-              _0: "-" + _2
-            };
+        TAG: /* Const_float */3,
+        _0: "-" + _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int32 */4,
-              _0: -_2 | 0
-            };
+        TAG: /* Const_int32 */4,
+        _0: -_2 | 0
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int64 */5,
-              _0: Caml_int64.neg(_2)
-            };
+        TAG: /* Const_int64 */5,
+        _0: Caml_int64.neg(_2)
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_nativeint */6,
-              _0: Caml_external_polyfill.resolve("nativeint_neg")(_2)
-            };
+        TAG: /* Const_nativeint */6,
+        _0: Caml_external_polyfill.resolve("nativeint_neg")(_2)
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int */0,
-              _0: _2
-            };
+        TAG: /* Const_int */0,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_float */3,
-              _0: _2
-            };
+        TAG: /* Const_float */3,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int32 */4,
-              _0: _2
-            };
+        TAG: /* Const_int32 */4,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int64 */5,
-              _0: _2
-            };
+        TAG: /* Const_int64 */5,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_nativeint */6,
-              _0: _2
-            };
+        TAG: /* Const_nativeint */6,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9982,253 +9982,253 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Lident */0,
-              _0: "[]"
-            };
+        TAG: /* Lident */0,
+        _0: "[]"
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Lident */0,
-              _0: "()"
-            };
+        TAG: /* Lident */0,
+        _0: "()"
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Lident */0,
-              _0: "false"
-            };
+        TAG: /* Lident */0,
+        _0: "false"
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Lident */0,
-              _0: "true"
-            };
+        TAG: /* Lident */0,
+        _0: "true"
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       if (applicative_functors.contents) {
         return {
-                TAG: /* Lapply */2,
-                _0: _1,
-                _1: _3
-              };
+          TAG: /* Lapply */2,
+          _0: _1,
+          _1: _3
+        };
       }
       throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                MEL_EXN_ID: $$Error$1,
-                _1: {
-                  TAG: /* Applicative_path */3,
-                  _0: symbol_rloc(undefined)
-                }
-              });
+            MEL_EXN_ID: $$Error$1,
+            _1: {
+              TAG: /* Applicative_path */3,
+              _0: symbol_rloc(undefined)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: /* Pdir_none */0
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: /* Pdir_none */0
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_string */0,
-                _0: _3[0]
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_string */0,
+          _0: _3[0]
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_int */1,
-                _0: _3
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_int */1,
+          _0: _3
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_ident */2,
-                _0: _3
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_ident */2,
+          _0: _3
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_ident */2,
-                _0: _3
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_ident */2,
+          _0: _3
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_bool */3,
-                _0: false
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_bool */3,
+          _0: false
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_bool */3,
-                _0: true
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_bool */3,
+          _0: true
+        }
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -10271,33 +10271,33 @@ const yyact = [
     }),
   (function (__caml_parser_env) {
       return [
-              /* Public */1,
-              /* Concrete */1
-            ];
+        /* Public */1,
+        /* Concrete */1
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Private */0,
-              /* Concrete */1
-            ];
+        /* Private */0,
+        /* Concrete */1
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Public */1,
-              /* Virtual */0
-            ];
+        /* Public */1,
+        /* Virtual */0
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Private */0,
-              /* Virtual */0
-            ];
+        /* Private */0,
+        /* Virtual */0
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Private */0,
-              /* Virtual */0
-            ];
+        /* Private */0,
+        /* Virtual */0
+      ];
     }),
   (function (__caml_parser_env) {
       return /* Fresh */1;
@@ -10482,41 +10482,41 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              txt: _1,
-              loc: symbol_rloc(undefined)
-            };
+        txt: _1,
+        loc: symbol_rloc(undefined)
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              txt: _1 + ("." + _3.txt),
-              loc: symbol_rloc(undefined)
-            };
+        txt: _1 + ("." + _3.txt),
+        loc: symbol_rloc(undefined)
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -10525,9 +10525,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -10536,123 +10536,123 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       return [
-              undefined,
-              /* [] */0
-            ];
+        undefined,
+        /* [] */0
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              undefined,
-              {
-                hd: _1,
-                tl: _2
-              }
-            ];
+        undefined,
+        {
+          hd: _1,
+          tl: _2
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* PStr */0,
-              _0: _1
-            };
+        TAG: /* PStr */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* PTyp */1,
-              _0: _2
-            };
+        TAG: /* PTyp */1,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* PPat */2,
-              _0: _2,
-              _1: undefined
-            };
+        TAG: /* PPat */2,
+        _0: _2,
+        _1: undefined
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* PPat */2,
-              _0: _2,
-              _1: _4
-            };
+        TAG: /* PPat */2,
+        _0: _2,
+        _1: _4
+      };
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     })
 ];
 
@@ -10719,14 +10719,14 @@ function assert_same_type(lexbuf, x, y) {
   const rhs = type_of_directive(y);
   if (lhs !== rhs) {
     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-              MEL_EXN_ID: $$Error$2,
-              _1: {
-                TAG: /* Conditional_expr_expected_type */7,
-                _0: lhs,
-                _1: rhs
-              },
-              _2: curr(lexbuf)
-            });
+          MEL_EXN_ID: $$Error$2,
+          _1: {
+            TAG: /* Conditional_expr_expected_type */7,
+            _0: lhs,
+            _1: rhs
+          },
+          _2: curr(lexbuf)
+        });
   }
   return y;
 }
@@ -10788,23 +10788,23 @@ function semantic_version_parse(str, start, last_index) {
       const start = _start;
       if (start > last_index) {
         return [
-                acc,
-                start
-              ];
+          acc,
+          start
+        ];
       }
       const c = str.charCodeAt(start);
       if (c === /* '.' */46) {
         return [
-                acc,
-                start + 1 | 0
-              ];
+          acc,
+          start + 1 | 0
+        ];
       }
       const v = c - /* '0' */48 | 0;
       if (!(v >= 0 && v <= 9)) {
         return [
-                acc,
-                start
-              ];
+          acc,
+          start
+        ];
       }
       _acc = Math.imul(acc, 10) + v | 0;
       _start = start + 1 | 0;
@@ -10817,13 +10817,13 @@ function semantic_version_parse(str, start, last_index) {
   const patch_end = match$2[1];
   const additional = Stdlib__String.sub(str, patch_end, (last_index - patch_end | 0) + 1 | 0);
   return [
-          [
-            match[0],
-            match$1[0],
-            match$2[0]
-          ],
-          additional
-        ];
+    [
+      match[0],
+      match$1[0],
+      match$2[0]
+    ],
+    additional
+  ];
 }
 
 function defined(str) {
@@ -10865,38 +10865,38 @@ function query(loc, str) {
         const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
         if (exn$1.MEL_EXN_ID === Stdlib.Not_found) {
           return {
-                  TAG: /* Dir_bool */0,
-                  _0: false
-                };
+            TAG: /* Dir_bool */0,
+            _0: false
+          };
         }
         throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
       }
       if (exit === 2) {
         try {
           return {
-                  TAG: /* Dir_bool */0,
-                  _0: Stdlib.bool_of_string(v$1)
-                };
+            TAG: /* Dir_bool */0,
+            _0: Stdlib.bool_of_string(v$1)
+          };
         }
         catch (exn$2){
           try {
             return {
-                    TAG: /* Dir_int */2,
-                    _0: Caml_format.caml_int_of_string(v$1)
-                  };
+              TAG: /* Dir_int */2,
+              _0: Caml_format.caml_int_of_string(v$1)
+            };
           }
           catch (exn$3){
             try {
               return {
-                      TAG: /* Dir_float */1,
-                      _0: Caml_format.caml_float_of_string(v$1)
-                    };
+                TAG: /* Dir_float */1,
+                _0: Caml_format.caml_float_of_string(v$1)
+              };
             }
             catch (exn$4){
               return {
-                      TAG: /* Dir_string */3,
-                      _0: v$1
-                    };
+                TAG: /* Dir_string */3,
+                _0: v$1
+              };
             }
           }
         }
@@ -10908,9 +10908,9 @@ function query(loc, str) {
   }
   if (/* tag */typeof v === "number" || typeof v === "string") {
     return {
-            TAG: /* Dir_bool */0,
-            _0: false
-          };
+      TAG: /* Dir_bool */0,
+      _0: false
+    };
   } else {
     return v;
   }
@@ -10921,46 +10921,46 @@ function value_of_token(loc, t) {
     switch (t) {
       case /* FALSE */29 :
           return {
-                  TAG: /* Dir_bool */0,
-                  _0: false
-                };
+            TAG: /* Dir_bool */0,
+            _0: false
+          };
       case /* TRUE */91 :
           return {
-                  TAG: /* Dir_bool */0,
-                  _0: true
-                };
+            TAG: /* Dir_bool */0,
+            _0: true
+          };
       default:
         throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                  MEL_EXN_ID: $$Error$2,
-                  _1: /* Unexpected_token_in_conditional */4,
-                  _2: loc
-                });
+              MEL_EXN_ID: $$Error$2,
+              _1: /* Unexpected_token_in_conditional */4,
+              _2: loc
+            });
     }
   } else {
     switch (t.TAG) {
       case /* FLOAT */1 :
           return {
-                  TAG: /* Dir_float */1,
-                  _0: Caml_format.caml_float_of_string(t._0)
-                };
+            TAG: /* Dir_float */1,
+            _0: Caml_format.caml_float_of_string(t._0)
+          };
       case /* INT */7 :
           return {
-                  TAG: /* Dir_int */2,
-                  _0: t._0
-                };
+            TAG: /* Dir_int */2,
+            _0: t._0
+          };
       case /* STRING */16 :
           return {
-                  TAG: /* Dir_string */3,
-                  _0: t._0[0]
-                };
+            TAG: /* Dir_string */3,
+            _0: t._0[0]
+          };
       case /* UIDENT */17 :
           return query(loc, t._0);
       default:
         throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                  MEL_EXN_ID: $$Error$2,
-                  _1: /* Unexpected_token_in_conditional */4,
-                  _2: loc
-                });
+              MEL_EXN_ID: $$Error$2,
+              _1: /* Unexpected_token_in_conditional */4,
+              _2: loc
+            });
     }
   }
 }
@@ -10982,10 +10982,10 @@ function directive_parse(token_with_comments, lexbuf) {
         switch (t) {
           case /* EOF */25 :
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: /* Unterminated_if */2,
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: /* Unterminated_if */2,
+                    _2: curr(lexbuf)
+                  });
           case /* EOL */100 :
               _param = undefined;
               continue ;
@@ -11007,13 +11007,13 @@ function directive_parse(token_with_comments, lexbuf) {
   const push = function (e) {
     if (look_ahead.contents !== undefined) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "parsing/lexer.mll",
-                  312,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "parsing/lexer.mll",
+              312,
+              4
+            ]
+          });
     }
     look_ahead.contents = e;
   };
@@ -11055,13 +11055,13 @@ function directive_parse(token_with_comments, lexbuf) {
                   const last_index = str.length - 1 | 0;
                   if (last_index < 0) {
                     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                              MEL_EXN_ID: $$Error$2,
-                              _1: {
-                                TAG: /* Illegal_semver */6,
-                                _0: str
-                              },
-                              _2: curr_loc
-                            });
+                          MEL_EXN_ID: $$Error$2,
+                          _1: {
+                            TAG: /* Illegal_semver */6,
+                            _0: str
+                          },
+                          _2: curr_loc
+                        });
                   }
                   const v = str.charCodeAt(0);
                   let match;
@@ -11081,13 +11081,13 @@ function directive_parse(token_with_comments, lexbuf) {
                         case 60 :
                             if (last_index === 0) {
                               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                        MEL_EXN_ID: $$Error$2,
-                                        _1: {
-                                          TAG: /* Illegal_semver */6,
-                                          _0: str
-                                        },
-                                        _2: curr_loc
-                                      });
+                                    MEL_EXN_ID: $$Error$2,
+                                    _1: {
+                                      TAG: /* Illegal_semver */6,
+                                      _0: str
+                                    },
+                                    _2: curr_loc
+                                  });
                             }
                             match = str[1] === "=" ? [
                                 "Le",
@@ -11103,13 +11103,13 @@ function directive_parse(token_with_comments, lexbuf) {
                         case 62 :
                             if (last_index === 0) {
                               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                        MEL_EXN_ID: $$Error$2,
-                                        _1: {
-                                          TAG: /* Illegal_semver */6,
-                                          _0: str
-                                        },
-                                        _2: curr_loc
-                                      });
+                                    MEL_EXN_ID: $$Error$2,
+                                    _1: {
+                                      TAG: /* Illegal_semver */6,
+                                      _0: str
+                                    },
+                                    _2: curr_loc
+                                  });
                             }
                             match = str[1] === "=" ? [
                                 "Ge",
@@ -11169,27 +11169,27 @@ function directive_parse(token_with_comments, lexbuf) {
               }
               if (exit$2 === 3) {
                 throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                          MEL_EXN_ID: $$Error$2,
-                          _1: {
-                            TAG: /* Conditional_expr_expected_type */7,
-                            _0: /* Dir_type_string */3,
-                            _1: type_of_directive(lhs)
-                          },
-                          _2: curr(lexbuf)
-                        });
+                      MEL_EXN_ID: $$Error$2,
+                      _1: {
+                        TAG: /* Conditional_expr_expected_type */7,
+                        _0: /* Dir_type_string */3,
+                        _1: type_of_directive(lhs)
+                      },
+                      _2: curr(lexbuf)
+                    });
               }
               
             }
             if (exit$1 === 2) {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: {
-                          TAG: /* Conditional_expr_expected_type */7,
-                          _0: /* Dir_type_string */3,
-                          _1: type_of_directive(lhs)
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: {
+                      TAG: /* Conditional_expr_expected_type */7,
+                      _0: /* Dir_type_string */3,
+                      _1: type_of_directive(lhs)
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             break;
         case "<=" :
@@ -11234,13 +11234,13 @@ function directive_parse(token_with_comments, lexbuf) {
       }
       if (exit$4 === 2) {
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "parsing/lexer.mll",
-                    331,
-                    17
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "parsing/lexer.mll",
+                331,
+                17
+              ]
+            });
       }
       const curr_loc$1 = curr(lexbuf);
       const rhs$1 = value_of_token(curr_loc$1, token(undefined));
@@ -11305,52 +11305,52 @@ function directive_parse(token_with_comments, lexbuf) {
                 return v;
               }
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: /* Unterminated_paren_in_conditional */1,
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: /* Unterminated_paren_in_conditional */1,
+                    _2: curr(lexbuf)
+                  });
             } else {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: /* Unterminated_paren_in_conditional */1,
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: /* Unterminated_paren_in_conditional */1,
+                    _2: curr(lexbuf)
+                  });
             }
         case /* TRUE */91 :
             return true;
         default:
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: /* Unexpected_token_in_conditional */4,
-                    _2: curr_loc
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: /* Unexpected_token_in_conditional */4,
+                _2: curr_loc
+              });
       }
     } else {
       switch (curr_token.TAG) {
         case /* FLOAT */1 :
             return token_op(calc, (function (e) {
-                          throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                    MEL_EXN_ID: $$Error$2,
-                                    _1: {
-                                      TAG: /* Conditional_expr_expected_type */7,
-                                      _0: /* Dir_type_bool */0,
-                                      _1: /* Dir_type_float */1
-                                    },
-                                    _2: curr_loc
-                                  });
-                        }), {
-                        TAG: /* Dir_float */1,
-                        _0: Caml_format.caml_float_of_string(curr_token._0)
-                      });
+                    throw new Caml_js_exceptions.MelangeError($$Error$2, {
+                          MEL_EXN_ID: $$Error$2,
+                          _1: {
+                            TAG: /* Conditional_expr_expected_type */7,
+                            _0: /* Dir_type_bool */0,
+                            _1: /* Dir_type_float */1
+                          },
+                          _2: curr_loc
+                        });
+                  }), {
+                  TAG: /* Dir_float */1,
+                  _0: Caml_format.caml_float_of_string(curr_token._0)
+                });
         case /* INT */7 :
             const v$1 = curr_token._0;
             return token_op(calc, (function (e) {
-                          push(e);
-                          return v$1 !== 0;
-                        }), {
-                        TAG: /* Dir_int */2,
-                        _0: v$1
-                      });
+                    push(e);
+                    return v$1 !== 0;
+                  }), {
+                  TAG: /* Dir_int */2,
+                  _0: v$1
+                });
         case /* LIDENT */11 :
             const r = curr_token._0;
             switch (r) {
@@ -11359,19 +11359,19 @@ function directive_parse(token_with_comments, lexbuf) {
                   break;
               default:
                 throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                          MEL_EXN_ID: $$Error$2,
-                          _1: /* Unexpected_token_in_conditional */4,
-                          _2: curr_loc
-                        });
+                      MEL_EXN_ID: $$Error$2,
+                      _1: /* Unexpected_token_in_conditional */4,
+                      _2: curr_loc
+                    });
             }
             const t = token(undefined);
             const loc = curr(lexbuf);
             if (/* tag */typeof t === "number" || typeof t === "string") {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: /* Unexpected_token_in_conditional */4,
-                        _2: loc
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: /* Unexpected_token_in_conditional */4,
+                    _2: loc
+                  });
             }
             if (t.TAG === /* UIDENT */17) {
               const s = t._0;
@@ -11386,50 +11386,50 @@ function directive_parse(token_with_comments, lexbuf) {
               }
             }
             throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                      MEL_EXN_ID: $$Error$2,
-                      _1: /* Unexpected_token_in_conditional */4,
-                      _2: loc
-                    });
+                  MEL_EXN_ID: $$Error$2,
+                  _1: /* Unexpected_token_in_conditional */4,
+                  _2: loc
+                });
             break;
         case /* STRING */16 :
             return token_op(calc, (function (e) {
-                          throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                    MEL_EXN_ID: $$Error$2,
-                                    _1: {
-                                      TAG: /* Conditional_expr_expected_type */7,
-                                      _0: /* Dir_type_bool */0,
-                                      _1: /* Dir_type_string */3
-                                    },
-                                    _2: curr_loc
-                                  });
-                        }), {
-                        TAG: /* Dir_string */3,
-                        _0: curr_token._0[0]
-                      });
+                    throw new Caml_js_exceptions.MelangeError($$Error$2, {
+                          MEL_EXN_ID: $$Error$2,
+                          _1: {
+                            TAG: /* Conditional_expr_expected_type */7,
+                            _0: /* Dir_type_bool */0,
+                            _1: /* Dir_type_string */3
+                          },
+                          _2: curr_loc
+                        });
+                  }), {
+                  TAG: /* Dir_string */3,
+                  _0: curr_token._0[0]
+                });
         case /* UIDENT */17 :
             const value_v = query(curr_loc, curr_token._0);
             return token_op(calc, (function (e) {
-                          push(e);
-                          if (!/* tag */(typeof value_v === "number" || typeof value_v === "string") && value_v.TAG === /* Dir_bool */0) {
-                            return value_v._0;
-                          }
-                          const ty = type_of_directive(value_v);
-                          throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                    MEL_EXN_ID: $$Error$2,
-                                    _1: {
-                                      TAG: /* Conditional_expr_expected_type */7,
-                                      _0: /* Dir_type_bool */0,
-                                      _1: ty
-                                    },
-                                    _2: curr_loc
-                                  });
-                        }), value_v);
+                    push(e);
+                    if (!/* tag */(typeof value_v === "number" || typeof value_v === "string") && value_v.TAG === /* Dir_bool */0) {
+                      return value_v._0;
+                    }
+                    const ty = type_of_directive(value_v);
+                    throw new Caml_js_exceptions.MelangeError($$Error$2, {
+                          MEL_EXN_ID: $$Error$2,
+                          _1: {
+                            TAG: /* Conditional_expr_expected_type */7,
+                            _0: /* Dir_type_bool */0,
+                            _1: ty
+                          },
+                          _2: curr_loc
+                        });
+                  }), value_v);
         default:
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: /* Unexpected_token_in_conditional */4,
-                    _2: curr_loc
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: /* Unexpected_token_in_conditional */4,
+                _2: curr_loc
+              });
       }
     }
   };
@@ -11440,16 +11440,16 @@ function directive_parse(token_with_comments, lexbuf) {
       return v;
     }
     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-              MEL_EXN_ID: $$Error$2,
-              _1: /* Expect_hash_then_in_conditional */5,
-              _2: curr(lexbuf)
-            });
+          MEL_EXN_ID: $$Error$2,
+          _1: /* Expect_hash_then_in_conditional */5,
+          _2: curr(lexbuf)
+        });
   } else {
     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-              MEL_EXN_ID: $$Error$2,
-              _1: /* Expect_hash_then_in_conditional */5,
-              _2: curr(lexbuf)
-            });
+          MEL_EXN_ID: $$Error$2,
+          _1: /* Expect_hash_then_in_conditional */5,
+          _2: curr(lexbuf)
+        });
   }
 }
 
@@ -11900,9 +11900,9 @@ function with_comment_buffer(comment, lexbuf) {
     loc_ghost: loc_loc_ghost
   };
   return [
-          s,
-          loc
-        ];
+    s,
+    loc
+  ];
 }
 
 function char_for_backslash(c) {
@@ -11941,13 +11941,13 @@ function char_for_decimal_code(lexbuf, i) {
     return /* 'x' */120;
   }
   throw new Caml_js_exceptions.MelangeError($$Error$2, {
-            MEL_EXN_ID: $$Error$2,
-            _1: {
-              TAG: /* Illegal_escape */1,
-              _0: Stdlib__Lexing.lexeme(lexbuf)
-            },
-            _2: curr(lexbuf)
-          });
+        MEL_EXN_ID: $$Error$2,
+        _1: {
+          TAG: /* Illegal_escape */1,
+          _0: Stdlib__Lexing.lexeme(lexbuf)
+        },
+        _2: curr(lexbuf)
+      });
 }
 
 function char_for_hexadecimal_code(lexbuf, i) {
@@ -11976,13 +11976,13 @@ function cvt_int64_literal(s) {
 
 function cvt_nativeint_literal(s) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "parsing/lexer.mll",
-              622,
-              30
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "parsing/lexer.mll",
+          622,
+          30
+        ]
+      });
 }
 
 function remove_underscores(s) {
@@ -12017,13 +12017,13 @@ function get_label_name(lexbuf) {
   const name = Stdlib__String.sub(s, 1, s.length - 2 | 0);
   if (Stdlib__Hashtbl.mem(keyword_table, name)) {
     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-              MEL_EXN_ID: $$Error$2,
-              _1: {
-                TAG: /* Keyword_as_label */4,
-                _0: name
-              },
-              _2: curr(lexbuf)
-            });
+          MEL_EXN_ID: $$Error$2,
+          _1: {
+            TAG: /* Keyword_as_label */4,
+            _0: name
+          },
+          _2: curr(lexbuf)
+        });
   }
   return name;
 }
@@ -12070,217 +12070,217 @@ function report_error(ppf, c) {
     switch (c) {
       case /* Unterminated_string */0 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "String literal not terminated",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "String literal not terminated"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "String literal not terminated",
+                  _1: /* End_of_format */0
+                },
+                _1: "String literal not terminated"
+              });
       case /* Unterminated_paren_in_conditional */1 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Unterminated parens in conditional predicate",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Unterminated parens in conditional predicate"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Unterminated parens in conditional predicate",
+                  _1: /* End_of_format */0
+                },
+                _1: "Unterminated parens in conditional predicate"
+              });
       case /* Unterminated_if */2 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "#if not terminated",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "#if not terminated"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "#if not terminated",
+                  _1: /* End_of_format */0
+                },
+                _1: "#if not terminated"
+              });
       case /* Unterminated_else */3 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "#else not terminated",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "#else not terminated"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "#else not terminated",
+                  _1: /* End_of_format */0
+                },
+                _1: "#else not terminated"
+              });
       case /* Unexpected_token_in_conditional */4 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Unexpected token in conditional predicate",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Unexpected token in conditional predicate"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Unexpected token in conditional predicate",
+                  _1: /* End_of_format */0
+                },
+                _1: "Unexpected token in conditional predicate"
+              });
       case /* Expect_hash_then_in_conditional */5 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Expect `then` after conditional predicate",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Expect `then` after conditional predicate"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Expect `then` after conditional predicate",
+                  _1: /* End_of_format */0
+                },
+                _1: "Expect `then` after conditional predicate"
+              });
       case /* Unexpected_directive */6 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Unexpected directive",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Unexpected directive"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Unexpected directive",
+                  _1: /* End_of_format */0
+                },
+                _1: "Unexpected directive"
+              });
       
     }
   } else {
     switch (c.TAG) {
       case /* Illegal_character */0 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Illegal character (",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ')' */41,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "Illegal character (%s)"
-                        }), Stdlib__Char.escaped(c._0));
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Illegal character (",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ')' */41,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "Illegal character (%s)"
+                  }), Stdlib__Char.escaped(c._0));
       case /* Illegal_escape */1 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Illegal backslash escape in string or character (",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ')' */41,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "Illegal backslash escape in string or character (%s)"
-                        }), c._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Illegal backslash escape in string or character (",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ')' */41,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "Illegal backslash escape in string or character (%s)"
+                  }), c._0);
       case /* Unterminated_comment */2 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Comment not terminated",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Comment not terminated"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Comment not terminated",
+                  _1: /* End_of_format */0
+                },
+                _1: "Comment not terminated"
+              });
       case /* Unterminated_string_in_comment */3 :
           return Curry._2(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "This comment contains an unterminated string literal",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: /* Flush_newline */4,
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
                             TAG: /* String_literal */11,
-                            _0: "This comment contains an unterminated string literal",
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: /* Flush_newline */4,
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "String literal begins here",
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          },
-                          _1: "This comment contains an unterminated string literal@.%aString literal begins here"
-                        }), print_error, c._1);
+                            _0: "String literal begins here",
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "This comment contains an unterminated string literal@.%aString literal begins here"
+                  }), print_error, c._1);
       case /* Keyword_as_label */4 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '`' */96,
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: "' is a keyword, it cannot be used as label name",
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "`%s' is a keyword, it cannot be used as label name"
-                        }), c._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '`' */96,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: "' is a keyword, it cannot be used as label name",
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "`%s' is a keyword, it cannot be used as label name"
+                  }), c._0);
       case /* Literal_overflow */5 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Integer literal exceeds the range of representable integers of type ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          },
-                          _1: "Integer literal exceeds the range of representable integers of type %s"
-                        }), c._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Integer literal exceeds the range of representable integers of type ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
+                      }
+                    },
+                    _1: "Integer literal exceeds the range of representable integers of type %s"
+                  }), c._0);
       case /* Illegal_semver */6 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Illegal semantic version string ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          },
-                          _1: "Illegal semantic version string %s"
-                        }), c._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Illegal semantic version string ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
+                      }
+                    },
+                    _1: "Illegal semantic version string %s"
+                  }), c._0);
       case /* Conditional_expr_expected_type */7 :
           return Curry._2(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Conditional expression type mismatch (",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Conditional expression type mismatch (",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ',' */44,
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ',' */44,
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* Char_literal */12,
-                                    _0: /* ')' */41,
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* Char_literal */12,
+                              _0: /* ')' */41,
+                              _1: /* End_of_format */0
                             }
-                          },
-                          _1: "Conditional expression type mismatch (%s,%s)"
-                        }), string_of_type_directive(c._0), string_of_type_directive(c._1));
+                          }
+                        }
+                      }
+                    },
+                    _1: "Conditional expression type mismatch (%s,%s)"
+                  }), string_of_type_directive(c._0), string_of_type_directive(c._1));
       
     }
   }
@@ -12317,13 +12317,13 @@ function token(lexbuf) {
       case 0 :
           if (!escaped_newlines.contents) {
             throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                      MEL_EXN_ID: $$Error$2,
-                      _1: {
-                        TAG: /* Illegal_character */0,
-                        _0: Stdlib__Lexing.lexeme_char(lexbuf, 0)
-                      },
-                      _2: curr(lexbuf)
-                    });
+                  MEL_EXN_ID: $$Error$2,
+                  _1: {
+                    TAG: /* Illegal_character */0,
+                    _0: Stdlib__Lexing.lexeme_char(lexbuf, 0)
+                  },
+                  _2: curr(lexbuf)
+                });
           }
           update_loc(lexbuf, undefined, 1, false, 0);
           return token(lexbuf);
@@ -12338,34 +12338,34 @@ function token(lexbuf) {
           return /* TILDE */89;
       case 5 :
           return {
-                  TAG: /* LABEL */10,
-                  _0: get_label_name(lexbuf)
-                };
+            TAG: /* LABEL */10,
+            _0: get_label_name(lexbuf)
+          };
       case 6 :
           prerr_warning(curr(lexbuf), {
                 TAG: /* Deprecated */0,
                 _0: "ISO-Latin1 characters in identifiers"
               });
           return {
-                  TAG: /* LABEL */10,
-                  _0: get_label_name(lexbuf)
-                };
+            TAG: /* LABEL */10,
+            _0: get_label_name(lexbuf)
+          };
       case 7 :
           return /* QUESTION */76;
       case 8 :
           return {
-                  TAG: /* OPTLABEL */13,
-                  _0: get_label_name(lexbuf)
-                };
+            TAG: /* OPTLABEL */13,
+            _0: get_label_name(lexbuf)
+          };
       case 9 :
           prerr_warning(curr(lexbuf), {
                 TAG: /* Deprecated */0,
                 _0: "ISO-Latin1 characters in identifiers"
               });
           return {
-                  TAG: /* OPTLABEL */13,
-                  _0: get_label_name(lexbuf)
-                };
+            TAG: /* OPTLABEL */13,
+            _0: get_label_name(lexbuf)
+          };
       case 10 :
           const s = Stdlib__Lexing.lexeme(lexbuf);
           try {
@@ -12375,9 +12375,9 @@ function token(lexbuf) {
             const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn.MEL_EXN_ID === Stdlib.Not_found) {
               return {
-                      TAG: /* LIDENT */11,
-                      _0: s
-                    };
+                TAG: /* LIDENT */11,
+                _0: s
+              };
             }
             throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
           }
@@ -12387,109 +12387,109 @@ function token(lexbuf) {
                 _0: "ISO-Latin1 characters in identifiers"
               });
           return {
-                  TAG: /* LIDENT */11,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* LIDENT */11,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 12 :
           return {
-                  TAG: /* UIDENT */17,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* UIDENT */17,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 13 :
           prerr_warning(curr(lexbuf), {
                 TAG: /* Deprecated */0,
                 _0: "ISO-Latin1 characters in identifiers"
               });
           return {
-                  TAG: /* UIDENT */17,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* UIDENT */17,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 14 :
           try {
             return {
-                    TAG: /* INT */7,
-                    _0: cvt_int_literal(Stdlib__Lexing.lexeme(lexbuf))
-                  };
+              TAG: /* INT */7,
+              _0: cvt_int_literal(Stdlib__Lexing.lexeme(lexbuf))
+            };
           }
           catch (raw_exn$1){
             const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
             if (exn$1.MEL_EXN_ID === Stdlib.Failure) {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: {
-                          TAG: /* Literal_overflow */5,
-                          _0: "int"
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: {
+                      TAG: /* Literal_overflow */5,
+                      _0: "int"
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
           }
       case 15 :
           return {
-                  TAG: /* FLOAT */1,
-                  _0: remove_underscores(Stdlib__Lexing.lexeme(lexbuf))
-                };
+            TAG: /* FLOAT */1,
+            _0: remove_underscores(Stdlib__Lexing.lexeme(lexbuf))
+          };
       case 16 :
           try {
             return {
-                    TAG: /* INT32 */8,
-                    _0: cvt_int32_literal(Stdlib__Lexing.lexeme(lexbuf))
-                  };
+              TAG: /* INT32 */8,
+              _0: cvt_int32_literal(Stdlib__Lexing.lexeme(lexbuf))
+            };
           }
           catch (raw_exn$2){
             const exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn$2);
             if (exn$2.MEL_EXN_ID === Stdlib.Failure) {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: {
-                          TAG: /* Literal_overflow */5,
-                          _0: "int32"
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: {
+                      TAG: /* Literal_overflow */5,
+                      _0: "int32"
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$2.MEL_EXN_ID, exn$2);
           }
       case 17 :
           try {
             return {
-                    TAG: /* INT64 */9,
-                    _0: cvt_int64_literal(Stdlib__Lexing.lexeme(lexbuf))
-                  };
+              TAG: /* INT64 */9,
+              _0: cvt_int64_literal(Stdlib__Lexing.lexeme(lexbuf))
+            };
           }
           catch (raw_exn$3){
             const exn$3 = Caml_js_exceptions.internalToOCamlException(raw_exn$3);
             if (exn$3.MEL_EXN_ID === Stdlib.Failure) {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: {
-                          TAG: /* Literal_overflow */5,
-                          _0: "int64"
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: {
+                      TAG: /* Literal_overflow */5,
+                      _0: "int64"
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$3.MEL_EXN_ID, exn$3);
           }
       case 18 :
           try {
             return {
-                    TAG: /* NATIVEINT */12,
-                    _0: cvt_nativeint_literal(Stdlib__Lexing.lexeme(lexbuf))
-                  };
+              TAG: /* NATIVEINT */12,
+              _0: cvt_nativeint_literal(Stdlib__Lexing.lexeme(lexbuf))
+            };
           }
           catch (raw_exn$4){
             const exn$4 = Caml_js_exceptions.internalToOCamlException(raw_exn$4);
             if (exn$4.MEL_EXN_ID === Stdlib.Failure) {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: {
-                          TAG: /* Literal_overflow */5,
-                          _0: "nativeint"
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: {
+                      TAG: /* Literal_overflow */5,
+                      _0: "nativeint"
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$4.MEL_EXN_ID, exn$4);
           }
@@ -12502,12 +12502,12 @@ function token(lexbuf) {
           is_in_string.contents = false;
           lexbuf.lex_start_p = string_start;
           return {
-                  TAG: /* STRING */16,
-                  _0: [
-                    get_stored_string(undefined),
-                    undefined
-                  ]
-                };
+            TAG: /* STRING */16,
+            _0: [
+              get_stored_string(undefined),
+              undefined
+            ]
+          };
       case 20 :
           reset_string_buffer(undefined);
           const delim = Stdlib__Lexing.lexeme(lexbuf);
@@ -12519,64 +12519,64 @@ function token(lexbuf) {
           is_in_string.contents = false;
           lexbuf.lex_start_p = string_start$1;
           return {
-                  TAG: /* STRING */16,
-                  _0: [
-                    get_stored_string(undefined),
-                    delim$1
-                  ]
-                };
+            TAG: /* STRING */16,
+            _0: [
+              get_stored_string(undefined),
+              delim$1
+            ]
+          };
       case 21 :
           update_loc(lexbuf, undefined, 1, false, 1);
           return {
-                  TAG: /* CHAR */0,
-                  _0: Stdlib__Lexing.lexeme_char(lexbuf, 1)
-                };
+            TAG: /* CHAR */0,
+            _0: Stdlib__Lexing.lexeme_char(lexbuf, 1)
+          };
       case 22 :
           return {
-                  TAG: /* CHAR */0,
-                  _0: Stdlib__Lexing.lexeme_char(lexbuf, 1)
-                };
+            TAG: /* CHAR */0,
+            _0: Stdlib__Lexing.lexeme_char(lexbuf, 1)
+          };
       case 23 :
           return {
-                  TAG: /* CHAR */0,
-                  _0: char_for_backslash(Stdlib__Lexing.lexeme_char(lexbuf, 2))
-                };
+            TAG: /* CHAR */0,
+            _0: char_for_backslash(Stdlib__Lexing.lexeme_char(lexbuf, 2))
+          };
       case 24 :
           return {
-                  TAG: /* CHAR */0,
-                  _0: char_for_decimal_code(lexbuf, 2)
-                };
+            TAG: /* CHAR */0,
+            _0: char_for_decimal_code(lexbuf, 2)
+          };
       case 25 :
           return {
-                  TAG: /* CHAR */0,
-                  _0: char_for_hexadecimal_code(lexbuf, 3)
-                };
+            TAG: /* CHAR */0,
+            _0: char_for_hexadecimal_code(lexbuf, 3)
+          };
       case 26 :
           const l = Stdlib__Lexing.lexeme(lexbuf);
           const esc = Stdlib__String.sub(l, 1, l.length - 1 | 0);
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: {
-                      TAG: /* Illegal_escape */1,
-                      _0: esc
-                    },
-                    _2: curr(lexbuf)
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: {
+                  TAG: /* Illegal_escape */1,
+                  _0: esc
+                },
+                _2: curr(lexbuf)
+              });
       case 27 :
           const match = with_comment_buffer(comment, lexbuf);
           return {
-                  TAG: /* COMMENT */18,
-                  _0: [
-                    match[0],
-                    match[1]
-                  ]
-                };
+            TAG: /* COMMENT */18,
+            _0: [
+              match[0],
+              match[1]
+            ]
+          };
       case 28 :
           const match$1 = with_comment_buffer(comment, lexbuf);
           return {
-                  TAG: /* DOCSTRING */19,
-                  _0: docstring(match$1[0], match$1[1])
-                };
+            TAG: /* DOCSTRING */19,
+            _0: docstring(match$1[0], match$1[1])
+          };
       case 29 :
           const stars = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos);
           const match$2 = with_comment_buffer((function (lexbuf) {
@@ -12584,33 +12584,33 @@ function token(lexbuf) {
                   return __ocaml_lex_comment_rec(lexbuf, 132);
                 }), lexbuf);
           return {
-                  TAG: /* COMMENT */18,
-                  _0: [
-                    match$2[0],
-                    match$2[1]
-                  ]
-                };
+            TAG: /* COMMENT */18,
+            _0: [
+              match$2[0],
+              match$2[1]
+            ]
+          };
       case 30 :
           if (print_warnings.contents) {
             prerr_warning(curr(lexbuf), /* Comment_start */0);
           }
           const match$3 = with_comment_buffer(comment, lexbuf);
           return {
-                  TAG: /* COMMENT */18,
-                  _0: [
-                    match$3[0],
-                    match$3[1]
-                  ]
-                };
+            TAG: /* COMMENT */18,
+            _0: [
+              match$3[0],
+              match$3[1]
+            ]
+          };
       case 31 :
           const stars$1 = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos - 2 | 0);
           return {
-                  TAG: /* COMMENT */18,
-                  _0: [
-                    stars$1,
-                    curr(lexbuf)
-                  ]
-                };
+            TAG: /* COMMENT */18,
+            _0: [
+              stars$1,
+              curr(lexbuf)
+            ]
+          };
       case 32 :
           const loc = curr(lexbuf);
           prerr_warning(loc, /* Comment_not_end */1);
@@ -12712,9 +12712,9 @@ function token(lexbuf) {
           return /* BANG */6;
       case 75 :
           return {
-                  TAG: /* INFIXOP0 */2,
-                  _0: "!="
-                };
+            TAG: /* INFIXOP0 */2,
+            _0: "!="
+          };
       case 76 :
           return /* PLUS */72;
       case 77 :
@@ -12728,66 +12728,66 @@ function token(lexbuf) {
       case 81 :
       case 82 :
           return {
-                  TAG: /* PREFIXOP */14,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* PREFIXOP */14,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 83 :
           return {
-                  TAG: /* INFIXOP0 */2,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP0 */2,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 84 :
           return {
-                  TAG: /* INFIXOP1 */3,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP1 */3,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 85 :
           return {
-                  TAG: /* INFIXOP2 */4,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP2 */4,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 86 :
           return {
-                  TAG: /* INFIXOP4 */6,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP4 */6,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 87 :
           return /* PERCENT */71;
       case 88 :
           return {
-                  TAG: /* INFIXOP3 */5,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP3 */5,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 89 :
           return {
-                  TAG: /* SHARPOP */15,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* SHARPOP */15,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 90 :
           if (if_then_else.contents === /* Dir_out */2) {
             return /* EOF */25;
           }
           if (if_then_else.contents === /* Dir_if_true */0) {
             throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                      MEL_EXN_ID: $$Error$2,
-                      _1: /* Unterminated_if */2,
-                      _2: curr(lexbuf)
-                    });
+                  MEL_EXN_ID: $$Error$2,
+                  _1: /* Unterminated_if */2,
+                  _2: curr(lexbuf)
+                });
           }
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: /* Unterminated_else */3,
-                    _2: curr(lexbuf)
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: /* Unterminated_else */3,
+                _2: curr(lexbuf)
+              });
       case 91 :
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: {
-                      TAG: /* Illegal_character */0,
-                      _0: Stdlib__Lexing.lexeme_char(lexbuf, 0)
-                    },
-                    _2: curr(lexbuf)
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: {
+                  TAG: /* Illegal_character */0,
+                  _0: Stdlib__Lexing.lexeme_char(lexbuf, 0)
+                },
+                _2: curr(lexbuf)
+              });
       default:
         Curry._1(lexbuf.refill_buff, lexbuf);
         ___ocaml_lex_state = __ocaml_lex_state$1;
@@ -12822,13 +12822,13 @@ function __ocaml_lex_comment_rec(lexbuf, ___ocaml_lex_state) {
             return curr(lexbuf);
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "parsing/lexer.mll",
-                      992,
-                      16
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "parsing/lexer.mll",
+                  992,
+                  16
+                ]
+              });
       case 2 :
           string_start_loc.contents = curr(lexbuf);
           store_string_char(/* '"' */34);
@@ -12847,23 +12847,23 @@ function __ocaml_lex_comment_rec(lexbuf, ___ocaml_lex_state) {
                     const start = Stdlib__List.hd(Stdlib__List.rev(comment_start_loc.contents));
                     comment_start_loc.contents = /* [] */0;
                     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                              MEL_EXN_ID: $$Error$2,
-                              _1: {
-                                TAG: /* Unterminated_string_in_comment */3,
-                                _0: start,
-                                _1: exn._2
-                              },
-                              _2: match$1.hd
-                            });
+                          MEL_EXN_ID: $$Error$2,
+                          _1: {
+                            TAG: /* Unterminated_string_in_comment */3,
+                            _0: start,
+                            _1: exn._2
+                          },
+                          _2: match$1.hd
+                        });
                   }
                   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                            MEL_EXN_ID: "Assert_failure",
-                            _1: [
-                              "parsing/lexer.mll",
-                              1006,
-                              18
-                            ]
-                          });
+                        MEL_EXN_ID: "Assert_failure",
+                        _1: [
+                          "parsing/lexer.mll",
+                          1006,
+                          18
+                        ]
+                      });
                 }
                 throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
               } else {
@@ -12897,23 +12897,23 @@ function __ocaml_lex_comment_rec(lexbuf, ___ocaml_lex_state) {
                     const start$1 = Stdlib__List.hd(Stdlib__List.rev(comment_start_loc.contents));
                     comment_start_loc.contents = /* [] */0;
                     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                              MEL_EXN_ID: $$Error$2,
-                              _1: {
-                                TAG: /* Unterminated_string_in_comment */3,
-                                _0: start$1,
-                                _1: exn$1._2
-                              },
-                              _2: match$2.hd
-                            });
+                          MEL_EXN_ID: $$Error$2,
+                          _1: {
+                            TAG: /* Unterminated_string_in_comment */3,
+                            _0: start$1,
+                            _1: exn$1._2
+                          },
+                          _2: match$2.hd
+                        });
                   }
                   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                            MEL_EXN_ID: "Assert_failure",
-                            _1: [
-                              "parsing/lexer.mll",
-                              1026,
-                              18
-                            ]
-                          });
+                        MEL_EXN_ID: "Assert_failure",
+                        _1: [
+                          "parsing/lexer.mll",
+                          1026,
+                          18
+                        ]
+                      });
                 }
                 throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
               } else {
@@ -12940,22 +12940,22 @@ function __ocaml_lex_comment_rec(lexbuf, ___ocaml_lex_state) {
             const start$2 = Stdlib__List.hd(Stdlib__List.rev(comment_start_loc.contents));
             comment_start_loc.contents = /* [] */0;
             throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                      MEL_EXN_ID: $$Error$2,
-                      _1: {
-                        TAG: /* Unterminated_comment */2,
-                        _0: start$2
-                      },
-                      _2: match$3.hd
-                    });
+                  MEL_EXN_ID: $$Error$2,
+                  _1: {
+                    TAG: /* Unterminated_comment */2,
+                    _0: start$2
+                  },
+                  _2: match$3.hd
+                });
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "parsing/lexer.mll",
-                      1056,
-                      16
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "parsing/lexer.mll",
+                  1056,
+                  16
+                ]
+              });
       case 11 :
           update_loc(lexbuf, undefined, 1, false, 0);
           store_string(Stdlib__Lexing.lexeme(lexbuf));
@@ -12991,10 +12991,10 @@ function __ocaml_lex_quoted_string_rec(delim, lexbuf, ___ocaml_lex_state) {
       case 1 :
           is_in_string.contents = false;
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: /* Unterminated_string */0,
-                    _2: string_start_loc.contents
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: /* Unterminated_string */0,
+                _2: string_start_loc.contents
+              });
       case 2 :
           const edelim = Stdlib__Lexing.lexeme(lexbuf);
           const edelim$1 = Stdlib__String.sub(edelim, 1, edelim.length - 2 | 0);
@@ -13061,10 +13061,10 @@ function string(lexbuf) {
       case 7 :
           is_in_string.contents = false;
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: /* Unterminated_string */0,
-                    _2: string_start_loc.contents
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: /* Unterminated_string */0,
+                _2: string_start_loc.contents
+              });
       case 8 :
           store_string_char(Stdlib__Lexing.lexeme_char(lexbuf, 0));
           return string(lexbuf);
@@ -13157,10 +13157,10 @@ function token$1(lexbuf) {
                           case /* Dir_if_false */1 :
                           case /* Dir_out */2 :
                               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                        MEL_EXN_ID: $$Error$2,
-                                        _1: /* Unexpected_directive */6,
-                                        _2: curr(lexbuf)
-                                      });
+                                    MEL_EXN_ID: $$Error$2,
+                                    _1: /* Unexpected_directive */6,
+                                    _2: curr(lexbuf)
+                                  });
                           
                         }
                         break;
@@ -13172,10 +13172,10 @@ function token$1(lexbuf) {
                               return Curry._1(cont, lexbuf);
                           case /* Dir_out */2 :
                               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                        MEL_EXN_ID: $$Error$2,
-                                        _1: /* Unexpected_directive */6,
-                                        _2: curr(lexbuf)
-                                      });
+                                    MEL_EXN_ID: $$Error$2,
+                                    _1: /* Unexpected_directive */6,
+                                    _2: curr(lexbuf)
+                                  });
                           
                         }
                     case /* IF */37 :
@@ -13183,10 +13183,10 @@ function token$1(lexbuf) {
                           case /* Dir_if_true */0 :
                           case /* Dir_if_false */1 :
                               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                        MEL_EXN_ID: $$Error$2,
-                                        _1: /* Unexpected_directive */6,
-                                        _2: curr(lexbuf)
-                                      });
+                                    MEL_EXN_ID: $$Error$2,
+                                    _1: /* Unexpected_directive */6,
+                                    _2: curr(lexbuf)
+                                  });
                           case /* Dir_out */2 :
                               if (directive_parse(token_with_comments, lexbuf)) {
                                 if_then_else.contents = /* Dir_if_true */0;
@@ -13197,10 +13197,10 @@ function token$1(lexbuf) {
                                   const token = token_with_comments(lexbuf);
                                   if (Caml_obj.caml_equal(token, /* EOF */25)) {
                                     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                              MEL_EXN_ID: $$Error$2,
-                                              _1: /* Unterminated_if */2,
-                                              _2: curr(lexbuf)
-                                            });
+                                          MEL_EXN_ID: $$Error$2,
+                                          _1: /* Unterminated_if */2,
+                                          _2: curr(lexbuf)
+                                        });
                                   }
                                   if (Caml_obj.caml_equal(token, /* SHARP */84) && at_bol(lexbuf)) {
                                     const token$1 = token_with_comments(lexbuf);
@@ -13214,10 +13214,10 @@ function token$1(lexbuf) {
                                             return Curry._1(cont, lexbuf);
                                         case /* IF */37 :
                                             throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                                      MEL_EXN_ID: $$Error$2,
-                                                      _1: /* Unexpected_directive */6,
-                                                      _2: curr(lexbuf)
-                                                    });
+                                                  MEL_EXN_ID: $$Error$2,
+                                                  _1: /* Unexpected_directive */6,
+                                                  _2: curr(lexbuf)
+                                                });
                                         default:
                                           
                                       }
@@ -13251,10 +13251,10 @@ function token$1(lexbuf) {
                     case /* Dir_if_false */1 :
                     case /* Dir_out */2 :
                         throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                  MEL_EXN_ID: $$Error$2,
-                                  _1: /* Unexpected_directive */6,
-                                  _2: curr(lexbuf)
-                                });
+                              MEL_EXN_ID: $$Error$2,
+                              _1: /* Unexpected_directive */6,
+                              _2: curr(lexbuf)
+                            });
                     
                   }
                 }
@@ -13266,10 +13266,10 @@ function token$1(lexbuf) {
                         const token$2 = token_with_comments(lexbuf);
                         if (Caml_obj.caml_equal(token$2, /* EOF */25)) {
                           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                    MEL_EXN_ID: $$Error$2,
-                                    _1: /* Unterminated_else */3,
-                                    _2: curr(lexbuf)
-                                  });
+                                MEL_EXN_ID: $$Error$2,
+                                _1: /* Unterminated_else */3,
+                                _2: curr(lexbuf)
+                              });
                         }
                         if (Caml_obj.caml_equal(token$2, /* SHARP */84) && at_bol(lexbuf)) {
                           const token$3 = token_with_comments(lexbuf);
@@ -13278,10 +13278,10 @@ function token$1(lexbuf) {
                               case /* ELSE */23 :
                                   if (else_seen) {
                                     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                              MEL_EXN_ID: $$Error$2,
-                                              _1: /* Unexpected_directive */6,
-                                              _2: curr(lexbuf)
-                                            });
+                                          MEL_EXN_ID: $$Error$2,
+                                          _1: /* Unexpected_directive */6,
+                                          _2: curr(lexbuf)
+                                        });
                                   }
                                   _else_seen = true;
                                   continue ;
@@ -13290,20 +13290,20 @@ function token$1(lexbuf) {
                                   return Curry._1(cont, lexbuf);
                               case /* IF */37 :
                                   throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                            MEL_EXN_ID: $$Error$2,
-                                            _1: /* Unexpected_directive */6,
-                                            _2: curr(lexbuf)
-                                          });
+                                        MEL_EXN_ID: $$Error$2,
+                                        _1: /* Unexpected_directive */6,
+                                        _2: curr(lexbuf)
+                                      });
                               default:
                                 
                             }
                           }
                           if (else_seen && is_elif(token$3)) {
                             throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                      MEL_EXN_ID: $$Error$2,
-                                      _1: /* Unexpected_directive */6,
-                                      _2: curr(lexbuf)
-                                    });
+                                  MEL_EXN_ID: $$Error$2,
+                                  _1: /* Unexpected_directive */6,
+                                  _2: curr(lexbuf)
+                                });
                           }
                           continue ;
                         }
@@ -13564,12 +13564,12 @@ function wrap(parsing_fun, lexbuf) {
       maybe_skip_phrase(lexbuf);
     }
     throw new Caml_js_exceptions.MelangeError($$Error$1, {
-              MEL_EXN_ID: $$Error$1,
-              _1: {
-                TAG: /* Other */5,
-                _0: loc
-              }
-            });
+          MEL_EXN_ID: $$Error$1,
+          _1: {
+            TAG: /* Other */5,
+            _0: loc
+          }
+        });
   }
 }
 
@@ -13588,10 +13588,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/ocaml_proto_test.js b/jscomp/test/dist/jscomp/test/ocaml_proto_test.js
index 749b07656..56f12f2c8 100644
--- a/jscomp/test/dist/jscomp/test/ocaml_proto_test.js
+++ b/jscomp/test/dist/jscomp/test/ocaml_proto_test.js
@@ -25,34 +25,34 @@ const Stdlib__String = require("melange/string.js");
 function field(optionsOpt, label, number, type_, name) {
   const options = optionsOpt !== undefined ? optionsOpt : /* [] */0;
   return {
-          field_name: name,
-          field_number: number,
-          field_label: label,
-          field_type: type_,
-          field_options: options
-        };
+    field_name: name,
+    field_number: number,
+    field_label: label,
+    field_type: type_,
+    field_options: options
+  };
 }
 
 function map(map_optionsOpt, number, key_type, value_type, name) {
   const map_options = map_optionsOpt !== undefined ? map_optionsOpt : /* [] */0;
   return {
-          map_name: name,
-          map_number: number,
-          map_key_type: key_type,
-          map_value_type: value_type,
-          map_options: map_options
-        };
+    map_name: name,
+    map_number: number,
+    map_key_type: key_type,
+    map_value_type: value_type,
+    map_options: map_options
+  };
 }
 
 function oneof_field(optionsOpt, number, type_, name) {
   const options = optionsOpt !== undefined ? optionsOpt : /* [] */0;
   return {
-          field_name: name,
-          field_number: number,
-          field_label: "Oneof",
-          field_type: type_,
-          field_options: options
-        };
+    field_name: name,
+    field_number: number,
+    field_label: "Oneof",
+    field_type: type_,
+    field_options: options
+  };
 }
 
 const message_counter = {
@@ -61,130 +61,130 @@ const message_counter = {
 
 function extension_range_range(from, to_) {
   const to_$1 = typeof to_ === "string" ? /* To_max */0 : ({
-        TAG: /* To_number */0,
-        _0: to_.VAL
-      });
+      TAG: /* To_number */0,
+      _0: to_.VAL
+    });
   return {
-          TAG: /* Extension_range */1,
-          _0: from,
-          _1: to_$1
-        };
+    TAG: /* Extension_range */1,
+    _0: from,
+    _1: to_$1
+  };
 }
 
 function message(content, message_name) {
   message_counter.contents = message_counter.contents + 1 | 0;
   return {
-          id: message_counter.contents,
-          message_name: message_name,
-          message_body: content
-        };
+    id: message_counter.contents,
+    message_name: message_name,
+    message_body: content
+  };
 }
 
 function $$import($$public, file_name) {
   return {
-          file_name: file_name,
-          public: $$public !== undefined
-        };
+    file_name: file_name,
+    public: $$public !== undefined
+  };
 }
 
 function extend(extend_name, extend_body) {
   message_counter.contents = message_counter.contents + 1 | 0;
   return {
-          id: message_counter.contents,
-          extend_name: extend_name,
-          extend_body: extend_body
-        };
+    id: message_counter.contents,
+    extend_name: extend_name,
+    extend_body: extend_body
+  };
 }
 
 function proto(syntax, file_option, $$package, $$import, message, $$enum, proto$1, extend, param) {
   const proto$2 = proto$1 !== undefined ? proto$1 : ({
-        syntax: syntax,
-        imports: /* [] */0,
-        file_options: /* [] */0,
-        package: undefined,
-        messages: /* [] */0,
-        enums: /* [] */0,
-        extends: /* [] */0
-      });
+      syntax: syntax,
+      imports: /* [] */0,
+      file_options: /* [] */0,
+      package: undefined,
+      messages: /* [] */0,
+      enums: /* [] */0,
+      extends: /* [] */0
+    });
   const proto$3 = syntax !== undefined ? ({
-        syntax: syntax,
-        imports: proto$2.imports,
-        file_options: proto$2.file_options,
-        package: proto$2.package,
-        messages: proto$2.messages,
-        enums: proto$2.enums,
-        extends: proto$2.extends
-      }) : proto$2;
+      syntax: syntax,
+      imports: proto$2.imports,
+      file_options: proto$2.file_options,
+      package: proto$2.package,
+      messages: proto$2.messages,
+      enums: proto$2.enums,
+      extends: proto$2.extends
+    }) : proto$2;
   const proto$4 = $$package !== undefined ? ({
-        syntax: proto$3.syntax,
-        imports: proto$3.imports,
-        file_options: proto$3.file_options,
-        package: $$package,
-        messages: proto$3.messages,
-        enums: proto$3.enums,
-        extends: proto$3.extends
-      }) : proto$3;
+      syntax: proto$3.syntax,
+      imports: proto$3.imports,
+      file_options: proto$3.file_options,
+      package: $$package,
+      messages: proto$3.messages,
+      enums: proto$3.enums,
+      extends: proto$3.extends
+    }) : proto$3;
   const proto$5 = message !== undefined ? ({
-        syntax: proto$4.syntax,
-        imports: proto$4.imports,
-        file_options: proto$4.file_options,
-        package: proto$4.package,
-        messages: {
-          hd: message,
-          tl: proto$2.messages
-        },
-        enums: proto$4.enums,
-        extends: proto$4.extends
-      }) : proto$4;
+      syntax: proto$4.syntax,
+      imports: proto$4.imports,
+      file_options: proto$4.file_options,
+      package: proto$4.package,
+      messages: {
+        hd: message,
+        tl: proto$2.messages
+      },
+      enums: proto$4.enums,
+      extends: proto$4.extends
+    }) : proto$4;
   const proto$6 = $$enum !== undefined ? ({
-        syntax: proto$5.syntax,
-        imports: proto$5.imports,
-        file_options: proto$5.file_options,
-        package: proto$5.package,
-        messages: proto$5.messages,
-        enums: {
-          hd: $$enum,
-          tl: proto$2.enums
-        },
-        extends: proto$5.extends
-      }) : proto$5;
+      syntax: proto$5.syntax,
+      imports: proto$5.imports,
+      file_options: proto$5.file_options,
+      package: proto$5.package,
+      messages: proto$5.messages,
+      enums: {
+        hd: $$enum,
+        tl: proto$2.enums
+      },
+      extends: proto$5.extends
+    }) : proto$5;
   const proto$7 = $$import !== undefined ? ({
-        syntax: proto$6.syntax,
-        imports: {
-          hd: $$import,
-          tl: proto$2.imports
-        },
-        file_options: proto$6.file_options,
-        package: proto$6.package,
-        messages: proto$6.messages,
-        enums: proto$6.enums,
-        extends: proto$6.extends
-      }) : proto$6;
+      syntax: proto$6.syntax,
+      imports: {
+        hd: $$import,
+        tl: proto$2.imports
+      },
+      file_options: proto$6.file_options,
+      package: proto$6.package,
+      messages: proto$6.messages,
+      enums: proto$6.enums,
+      extends: proto$6.extends
+    }) : proto$6;
   const proto$8 = file_option !== undefined ? ({
-        syntax: proto$7.syntax,
-        imports: proto$7.imports,
-        file_options: {
-          hd: file_option,
-          tl: proto$2.file_options
-        },
-        package: proto$7.package,
-        messages: proto$7.messages,
-        enums: proto$7.enums,
-        extends: proto$7.extends
-      }) : proto$7;
+      syntax: proto$7.syntax,
+      imports: proto$7.imports,
+      file_options: {
+        hd: file_option,
+        tl: proto$2.file_options
+      },
+      package: proto$7.package,
+      messages: proto$7.messages,
+      enums: proto$7.enums,
+      extends: proto$7.extends
+    }) : proto$7;
   if (extend !== undefined) {
     return {
-            syntax: proto$8.syntax,
-            imports: proto$8.imports,
-            file_options: proto$8.file_options,
-            package: proto$8.package,
-            messages: proto$8.messages,
-            enums: proto$8.enums,
-            extends: {
-              hd: extend,
-              tl: proto$2.extends
-            }
-          };
+      syntax: proto$8.syntax,
+      imports: proto$8.imports,
+      file_options: proto$8.file_options,
+      package: proto$8.package,
+      messages: proto$8.messages,
+      enums: proto$8.enums,
+      extends: {
+        hd: extend,
+        tl: proto$2.extends
+      }
+    };
   } else {
     return proto$8;
   }
@@ -211,17 +211,17 @@ function rev_split_by_char(c, s) {
       const i$p = Stdlib__String.index_from(s, i, c);
       const s$p = Stdlib__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){
       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
       if (exn.MEL_EXN_ID === Stdlib.Not_found) {
         return {
-                hd: Stdlib__String.sub(s, i, s.length - i | 0),
-                tl: l
-              };
+          hd: Stdlib__String.sub(s, i, s.length - i | 0),
+          tl: l
+        };
       }
       throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
     }
@@ -233,17 +233,17 @@ function pop_last(param) {
   if (param) {
     if (param.tl) {
       return {
-              hd: param.hd,
-              tl: pop_last(param.tl)
-            };
+        hd: param.hd,
+        tl: pop_last(param.tl)
+      };
     } else {
       return /* [] */0;
     }
   }
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: "Invalid argument [] for pop_last"
-          });
+        MEL_EXN_ID: "Failure",
+        _1: "Invalid argument [] for pop_last"
+      });
 }
 
 function apply_until(f, _param) {
@@ -263,22 +263,22 @@ function apply_until(f, _param) {
 
 function string_of_string_list(l) {
   return Curry._1(Stdlib__Printf.sprintf({
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Char_literal */12,
-                    _0: /* '[' */91,
-                    _1: {
-                      TAG: /* String */2,
-                      _0: /* No_padding */0,
-                      _1: {
-                        TAG: /* Char_literal */12,
-                        _0: /* ']' */93,
-                        _1: /* End_of_format */0
-                      }
-                    }
-                  },
-                  _1: "[%s]"
-                }), Stdlib__String.concat(",", l));
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Char_literal */12,
+              _0: /* '[' */91,
+              _1: {
+                TAG: /* String */2,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* Char_literal */12,
+                  _0: /* ']' */93,
+                  _1: /* End_of_format */0
+                }
+              }
+            },
+            _1: "[%s]"
+          }), Stdlib__String.concat(",", l));
 }
 
 function string_fold_lefti(f, e0, s) {
@@ -310,9 +310,9 @@ function from_lexbuf(lexbuf) {
   const file_name = x === "" ? undefined : x;
   const line = lexbuf.lex_curr_p.pos_lnum;
   return {
-          file_name: file_name,
-          line: line
-        };
+    file_name: file_name,
+    line: line
+  };
 }
 
 function file_name(param) {
@@ -325,32 +325,32 @@ function line(param) {
 
 function to_string(param) {
   return Curry._2(Stdlib__Printf.sprintf({
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* String_literal */11,
-                    _0: "File ",
-                    _1: {
-                      TAG: /* String */2,
-                      _0: /* No_padding */0,
-                      _1: {
-                        TAG: /* String_literal */11,
-                        _0: ", line ",
-                        _1: {
-                          TAG: /* Int */4,
-                          _0: /* Int_i */3,
-                          _1: /* No_padding */0,
-                          _2: /* No_precision */0,
-                          _3: {
-                            TAG: /* String_literal */11,
-                            _0: ":\n",
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      }
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* String_literal */11,
+              _0: "File ",
+              _1: {
+                TAG: /* String */2,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* String_literal */11,
+                  _0: ", line ",
+                  _1: {
+                    TAG: /* Int */4,
+                    _0: /* Int_i */3,
+                    _1: /* No_padding */0,
+                    _2: /* No_precision */0,
+                    _3: {
+                      TAG: /* String_literal */11,
+                      _0: ":\n",
+                      _1: /* End_of_format */0
                     }
-                  },
-                  _1: "File %s, line %i:\n"
-                }), option_default("", param.file_name), param.line);
+                  }
+                }
+              }
+            },
+            _1: "File %s, line %i:\n"
+          }), option_default("", param.file_name), param.line);
 }
 
 function string_of_programmatic_error(e) {
@@ -378,346 +378,346 @@ const Compilation_error = /* @__PURE__ */Caml_exceptions.create("Ocaml_proto_tes
 function prepare_error(e) {
   if (/* tag */typeof e === "number" || typeof e === "string") {
     return Stdlib__Printf.sprintf({
-                TAG: /* Format */0,
-                _0: {
-                  TAG: /* String_literal */11,
-                  _0: "Syntax error",
-                  _1: /* End_of_format */0
-                },
-                _1: "Syntax error"
-              });
+          TAG: /* Format */0,
+          _0: {
+            TAG: /* String_literal */11,
+            _0: "Syntax error",
+            _1: /* End_of_format */0
+          },
+          _1: "Syntax error"
+        });
   }
   switch (e.TAG) {
     case /* Unresolved_type */0 :
         const match = e._0;
         return Curry._3(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "unresolved type for field name : ",
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "unresolved type for field name : ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " (type:",
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
                           _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
+                            TAG: /* String_literal */11,
+                            _0: ", in message: ",
                             _1: {
-                              TAG: /* String_literal */11,
-                              _0: " (type:",
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
                               _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: ", in message: ",
-                                  _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* ')' */41,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* Char_literal */12,
+                                _0: /* ')' */41,
+                                _1: /* End_of_format */0
                               }
                             }
                           }
-                        },
-                        _1: "unresolved type for field name : %s (type:%s, in message: %s)"
-                      }), match.field_name, match.type_, match.message_name);
+                        }
+                      }
+                    }
+                  },
+                  _1: "unresolved type for field name : %s (type:%s, in message: %s)"
+                }), match.field_name, match.type_, match.message_name);
     case /* Duplicated_field_number */1 :
         const match$1 = e._0;
         return Curry._3(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "duplicated field number for field name: ",
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "duplicated field number for field name: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " (previous field name:",
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
                           _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
+                            TAG: /* String_literal */11,
+                            _0: ", message: ",
                             _1: {
-                              TAG: /* String_literal */11,
-                              _0: " (previous field name:",
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
                               _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: ", message: ",
-                                  _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* ')' */41,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* Char_literal */12,
+                                _0: /* ')' */41,
+                                _1: /* End_of_format */0
                               }
                             }
                           }
-                        },
-                        _1: "duplicated field number for field name: %s (previous field name:%s, message: %s)"
-                      }), match$1.field_name, match$1.previous_field_name, match$1.message_name);
+                        }
+                      }
+                    }
+                  },
+                  _1: "duplicated field number for field name: %s (previous field name:%s, message: %s)"
+                }), match$1.field_name, match$1.previous_field_name, match$1.message_name);
     case /* Invalid_default_value */2 :
         const match$2 = e._0;
         return Curry._2(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "invalid default value for field name:",
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "invalid default value for field name:",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " (info: ",
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
                           _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: " (info: ",
-                              _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* ')' */41,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Char_literal */12,
+                            _0: /* ')' */41,
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "invalid default value for field name:%s (info: %s)"
-                      }), option_default("", match$2.field_name), match$2.info);
+                        }
+                      }
+                    }
+                  },
+                  _1: "invalid default value for field name:%s (info: %s)"
+                }), option_default("", match$2.field_name), match$2.info);
     case /* Unsupported_field_type */3 :
         const match$3 = e._0;
         return Curry._3(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "unsupported field type for field name:",
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "unsupported field type for field name:",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " with type:",
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
                           _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
+                            TAG: /* String_literal */11,
+                            _0: " in bakend: ",
                             _1: {
-                              TAG: /* String_literal */11,
-                              _0: " with type:",
-                              _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: " in bakend: ",
-                                  _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
+                              _1: /* End_of_format */0
                             }
                           }
-                        },
-                        _1: "unsupported field type for field name:%s with type:%s in bakend: %s"
-                      }), option_default("", match$3.field_name), match$3.field_type, match$3.backend_name);
+                        }
+                      }
+                    }
+                  },
+                  _1: "unsupported field type for field name:%s with type:%s in bakend: %s"
+                }), option_default("", match$3.field_name), match$3.field_type, match$3.backend_name);
     case /* Programatic_error */4 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "programmatic error: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "programmatic error: %s"
-                      }), string_of_programmatic_error(e._0));
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "programmatic error: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "programmatic error: %s"
+                }), string_of_programmatic_error(e._0));
     case /* Invalid_import_qualifier */5 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Invalid import qualified, only 'public' supported",
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "%sInvalid import qualified, only 'public' supported"
-                      }), to_string(e._0));
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Invalid import qualified, only 'public' supported",
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "%sInvalid import qualified, only 'public' supported"
+                }), to_string(e._0));
     case /* Invalid_file_name */6 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Invalid file name: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: ", format must <name>.proto",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "Invalid file name: %s, format must <name>.proto"
-                      }), e._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Invalid file name: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: ", format must <name>.proto",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Invalid file name: %s, format must <name>.proto"
+                }), e._0);
     case /* Import_file_not_found */7 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "File: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: ", could not be found.",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "File: %s, could not be found."
-                      }), e._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "File: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: ", could not be found.",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "File: %s, could not be found."
+                }), e._0);
     case /* Invalid_packed_option */8 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Invalid packed option for field: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "Invalid packed option for field: %s"
-                      }), e._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Invalid packed option for field: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "Invalid packed option for field: %s"
+                }), e._0);
     case /* Missing_semicolon_for_enum_value */9 :
         return Curry._2(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Missing semicolon for enum value: ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "%sMissing semicolon for enum value: %s"
-                      }), to_string(e._1), e._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Missing semicolon for enum value: ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "%sMissing semicolon for enum value: %s"
+                }), to_string(e._1), e._0);
     case /* Invalid_enum_specification */10 :
         return Curry._2(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Missing enum specification (<identifier> = <id>;) for enum value: ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "%sMissing enum specification (<identifier> = <id>;) for enum value: %s"
-                      }), to_string(e._1), e._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Missing enum specification (<identifier> = <id>;) for enum value: ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "%sMissing enum specification (<identifier> = <id>;) for enum value: %s"
+                }), to_string(e._1), e._0);
     case /* Invalid_mutable_option */11 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Invalid mutable option for field ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "Invalid mutable option for field %s"
-                      }), option_default("", e._0));
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Invalid mutable option for field ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "Invalid mutable option for field %s"
+                }), option_default("", e._0));
     case /* Missing_one_of_name */12 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Missing oneof name",
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "%sMissing oneof name"
-                      }), to_string(e._0));
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Missing oneof name",
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "%sMissing oneof name"
+                }), to_string(e._0));
     case /* Invalid_field_label */13 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Invalid field label. [required|repeated|optional] expected",
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "%sInvalid field label. [required|repeated|optional] expected"
-                      }), to_string(e._0));
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Invalid field label. [required|repeated|optional] expected",
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "%sInvalid field label. [required|repeated|optional] expected"
+                }), to_string(e._0));
     case /* Missing_field_label */14 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Missing field label. [required|repeated|optional] expected",
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "%sMissing field label. [required|repeated|optional] expected"
-                      }), to_string(e._0));
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Missing field label. [required|repeated|optional] expected",
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "%sMissing field label. [required|repeated|optional] expected"
+                }), to_string(e._0));
     case /* Parsing_error */15 :
         return Curry._3(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "File ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "File ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: ", line ",
+                        _1: {
+                          TAG: /* Int */4,
+                          _0: /* Int_i */3,
+                          _1: /* No_padding */0,
+                          _2: /* No_precision */0,
+                          _3: {
+                            TAG: /* String_literal */11,
+                            _0: ":\n",
                             _1: {
-                              TAG: /* String_literal */11,
-                              _0: ", line ",
-                              _1: {
-                                TAG: /* Int */4,
-                                _0: /* Int_i */3,
-                                _1: /* No_padding */0,
-                                _2: /* No_precision */0,
-                                _3: {
-                                  TAG: /* String_literal */11,
-                                  _0: ":\n",
-                                  _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
+                              _1: /* End_of_format */0
                             }
                           }
-                        },
-                        _1: "File %s, line %i:\n%s"
-                      }), e._0, e._1, e._2);
+                        }
+                      }
+                    }
+                  },
+                  _1: "File %s, line %i:\n%s"
+                }), e._0, e._1, e._2);
     
   }
 }
@@ -744,14 +744,14 @@ function add_loc(loc, exn) {
   const line$1 = line(loc);
   const detail = Stdlib__Printexc.to_string(exn);
   return {
-          MEL_EXN_ID: Compilation_error,
-          _1: {
-            TAG: /* Parsing_error */15,
-            _0: file_name$1,
-            _1: line$1,
-            _2: detail
-          }
-        };
+    MEL_EXN_ID: Compilation_error,
+    _1: {
+      TAG: /* Parsing_error */15,
+      _0: file_name$1,
+      _1: line$1,
+      _2: detail
+    }
+  };
 }
 
 Stdlib__Printexc.register_printer(function (exn) {
@@ -763,40 +763,40 @@ Stdlib__Printexc.register_printer(function (exn) {
 
 function invalid_default_value(field_name, info, param) {
   throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-            MEL_EXN_ID: Compilation_error,
-            _1: {
-              TAG: /* Invalid_default_value */2,
-              _0: {
-                field_name: field_name,
-                info: info
-              }
-            }
-          });
+        MEL_EXN_ID: Compilation_error,
+        _1: {
+          TAG: /* Invalid_default_value */2,
+          _0: {
+            field_name: field_name,
+            info: info
+          }
+        }
+      });
 }
 
 function unsupported_field_type(field_name, field_type, backend_name, param) {
   throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-            MEL_EXN_ID: Compilation_error,
-            _1: {
-              TAG: /* Unsupported_field_type */3,
-              _0: {
-                field_name: field_name,
-                field_type: field_type,
-                backend_name: backend_name
-              }
-            }
-          });
+        MEL_EXN_ID: Compilation_error,
+        _1: {
+          TAG: /* Unsupported_field_type */3,
+          _0: {
+            field_name: field_name,
+            field_type: field_type,
+            backend_name: backend_name
+          }
+        }
+      });
 }
 
 function invalid_enum_specification(enum_name, loc) {
   throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-            MEL_EXN_ID: Compilation_error,
-            _1: {
-              TAG: /* Invalid_enum_specification */10,
-              _0: enum_name,
-              _1: loc
-            }
-          });
+        MEL_EXN_ID: Compilation_error,
+        _1: {
+          TAG: /* Invalid_enum_specification */10,
+          _0: enum_name,
+          _1: loc
+        }
+      });
 }
 
 const yytransl_const = [
@@ -842,9 +842,9 @@ const yytransl_block = [
 const yyact = [
   (function (param) {
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: "parser"
-              });
+            MEL_EXN_ID: "Failure",
+            _1: "parser"
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -967,12 +967,12 @@ const yyact = [
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-                MEL_EXN_ID: Compilation_error,
-                _1: {
-                  TAG: /* Invalid_import_qualifier */5,
-                  _0: _1
-                }
-              });
+            MEL_EXN_ID: Compilation_error,
+            _1: {
+              TAG: /* Invalid_import_qualifier */5,
+              _0: _1
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -993,59 +993,59 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Message_field */0,
-              _0: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-            };
+        TAG: /* Message_field */0,
+        _0: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Message_map_field */1,
-              _0: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-            };
+        TAG: /* Message_map_field */1,
+        _0: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Message_oneof_field */2,
-              _0: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-            };
+        TAG: /* Message_oneof_field */2,
+        _0: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Message_sub */3,
-              _0: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-            };
+        TAG: /* Message_sub */3,
+        _0: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Message_enum */4,
-              _0: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-            };
+        TAG: /* Message_enum */4,
+        _0: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Message_extension */5,
-              _0: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-            };
+        TAG: /* Message_extension */5,
+        _0: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+      };
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-                MEL_EXN_ID: Compilation_error,
-                _1: /* Syntax_error */0
-              });
+            MEL_EXN_ID: Compilation_error,
+            _1: /* Syntax_error */0
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -1061,17 +1061,17 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -1081,31 +1081,31 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _3
-            };
+        hd: _1,
+        tl: _3
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Extension_single_number */0,
-              _0: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-            };
+        TAG: /* Extension_single_number */0,
+        _0: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return extension_range_range(_1, {
-                  NAME: "Number",
-                  VAL: _3
-                });
+            NAME: "Number",
+            VAL: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -1117,21 +1117,21 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              oneof_name: _2[1],
-              oneof_fields: _4
-            };
+        oneof_name: _2[1],
+        oneof_fields: _4
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-                MEL_EXN_ID: Compilation_error,
-                _1: {
-                  TAG: /* Missing_one_of_name */12,
-                  _0: _1
-                }
-              });
+            MEL_EXN_ID: Compilation_error,
+            _1: {
+              TAG: /* Missing_one_of_name */12,
+              _0: _1
+            }
+          });
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -1140,9 +1140,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -1200,12 +1200,12 @@ const yyact = [
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-                MEL_EXN_ID: Compilation_error,
-                _1: {
-                  TAG: /* Missing_field_label */14,
-                  _0: _1[0]
-                }
-              });
+            MEL_EXN_ID: Compilation_error,
+            _1: {
+              TAG: /* Missing_field_label */14,
+              _0: _1[0]
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -1213,12 +1213,12 @@ const yyact = [
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-                MEL_EXN_ID: Compilation_error,
-                _1: {
-                  TAG: /* Missing_field_label */14,
-                  _0: _1[0]
-                }
-              });
+            MEL_EXN_ID: Compilation_error,
+            _1: {
+              TAG: /* Missing_field_label */14,
+              _0: _1[0]
+            }
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0)[1];
@@ -1285,12 +1285,12 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-                MEL_EXN_ID: Compilation_error,
-                _1: {
-                  TAG: /* Invalid_field_label */13,
-                  _0: _1[0]
-                }
-              });
+            MEL_EXN_ID: Compilation_error,
+            _1: {
+              TAG: /* Invalid_field_label */13,
+              _0: _1[0]
+            }
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -1301,33 +1301,33 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _3
-            };
+        hd: _1,
+        tl: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1[1],
-              _3
-            ];
+        _1[1],
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2[1],
-              _5
-            ];
+        _2[1],
+        _5
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0)[1];
@@ -1348,23 +1348,23 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              _4
-            ];
+        _2,
+        _4
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Constant_int */2,
-              _0: _1
-            };
+        TAG: /* Constant_int */2,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Constant_float */3,
-              _0: _1
-            };
+        TAG: /* Constant_float */3,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -1372,27 +1372,27 @@ const yyact = [
       switch (litteral) {
         case "false" :
             return {
-                    TAG: /* Constant_bool */1,
-                    _0: false
-                  };
+              TAG: /* Constant_bool */1,
+              _0: false
+            };
         case "true" :
             return {
-                    TAG: /* Constant_bool */1,
-                    _0: true
-                  };
+              TAG: /* Constant_bool */1,
+              _0: true
+            };
         default:
           return {
-                  TAG: /* Constant_litteral */4,
-                  _0: litteral
-                };
+            TAG: /* Constant_litteral */4,
+            _0: litteral
+          };
       }
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Constant_string */0,
-              _0: _1
-            };
+        TAG: /* Constant_string */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -1403,10 +1403,10 @@ const yyact = [
       const enum_values = enum_valuesOpt !== undefined ? enum_valuesOpt : /* [] */0;
       message_counter.contents = message_counter.contents + 1 | 0;
       return {
-              enum_id: message_counter.contents,
-              enum_name: enum_name,
-              enum_values: enum_values
-            };
+        enum_id: message_counter.contents,
+        enum_name: enum_name,
+        enum_values: enum_values
+      };
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -1415,18 +1415,18 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              enum_value_name: _1[1],
-              enum_value_int: _3
-            };
+        enum_value_name: _1[1],
+        enum_value_int: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -1434,13 +1434,13 @@ const yyact = [
       let enum_value = _1[1];
       let loc = _1[0];
       throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-                MEL_EXN_ID: Compilation_error,
-                _1: {
-                  TAG: /* Missing_semicolon_for_enum_value */9,
-                  _0: enum_value,
-                  _1: loc
-                }
-              });
+            MEL_EXN_ID: Compilation_error,
+            _1: {
+              TAG: /* Missing_semicolon_for_enum_value */9,
+              _0: enum_value,
+              _1: loc
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -1473,75 +1473,75 @@ const yyact = [
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     })
 ];
 
@@ -1605,9 +1605,9 @@ function __ocaml_lex_multi_line_comment_rec(_l, lexbuf, ___ocaml_lex_state) {
       case 1 :
           Stdlib__Lexing.lexeme(lexbuf);
           return {
-                  TAG: /* Comment_value */0,
-                  _0: Stdlib__String.concat("", Stdlib__List.rev(l))
-                };
+            TAG: /* Comment_value */0,
+            _0: Stdlib__String.concat("", Stdlib__List.rev(l))
+          };
       case 2 :
           ___ocaml_lex_state = 47;
           _l = {
@@ -1641,9 +1641,9 @@ function __ocaml_lex_string_rec(_l, lexbuf, ___ocaml_lex_state) {
           continue ;
       case 1 :
           return {
-                  TAG: /* String_value */0,
-                  _0: Stdlib__String.concat("", Stdlib__List.rev(l))
-                };
+            TAG: /* String_value */0,
+            _0: Stdlib__String.concat("", Stdlib__List.rev(l))
+          };
       case 2 :
           ___ocaml_lex_state = 55;
           _l = {
@@ -1670,9 +1670,9 @@ function __ocaml_lex_comment_rec(_l, lexbuf, ___ocaml_lex_state) {
       case 0 :
           update_loc(lexbuf);
           return {
-                  TAG: /* Comment_value */0,
-                  _0: Stdlib__String.concat("", Stdlib__List.rev(l))
-                };
+            TAG: /* Comment_value */0,
+            _0: Stdlib__String.concat("", Stdlib__List.rev(l))
+          };
       case 1 :
           ___ocaml_lex_state = 41;
           _l = {
@@ -1738,25 +1738,25 @@ function lexer(lexbuf) {
             return /* EOF */25;
           } else {
             return {
-                    TAG: /* STRING */2,
-                    _0: s._0
-                  };
+              TAG: /* STRING */2,
+              _0: s._0
+            };
           }
       case 14 :
           return {
-                  TAG: /* INT */3,
-                  _0: Caml_format.caml_int_of_string(Stdlib__Lexing.lexeme(lexbuf))
-                };
+            TAG: /* INT */3,
+            _0: Caml_format.caml_int_of_string(Stdlib__Lexing.lexeme(lexbuf))
+          };
       case 15 :
           return {
-                  TAG: /* FLOAT */4,
-                  _0: Caml_format.caml_float_of_string(Stdlib__Lexing.lexeme(lexbuf))
-                };
+            TAG: /* FLOAT */4,
+            _0: Caml_format.caml_float_of_string(Stdlib__Lexing.lexeme(lexbuf))
+          };
       case 16 :
           return {
-                  TAG: /* FLOAT */4,
-                  _0: Number.NaN
-                };
+            TAG: /* FLOAT */4,
+            _0: Number.NaN
+          };
       case 17 :
           update_loc(lexbuf);
           ___ocaml_lex_state = 0;
@@ -1776,9 +1776,9 @@ function lexer(lexbuf) {
                 return /* EXTENSIONS */8;
             case "import" :
                 return {
-                        TAG: /* IMPORT */1,
-                        _0: loc
-                      };
+                  TAG: /* IMPORT */1,
+                  _0: loc
+                };
             case "map" :
                 return /* MAP */13;
             case "max" :
@@ -1787,9 +1787,9 @@ function lexer(lexbuf) {
                 return /* MESSAGE */3;
             case "oneof" :
                 return {
-                        TAG: /* ONE_OF */0,
-                        _0: loc
-                      };
+                  TAG: /* ONE_OF */0,
+                  _0: loc
+                };
             case "option" :
                 return /* OPTION */7;
             case "optional" :
@@ -1808,12 +1808,12 @@ function lexer(lexbuf) {
                 return /* TO */11;
             default:
               return {
-                      TAG: /* IDENT */5,
-                      _0: [
-                        loc,
-                        ident
-                      ]
-                    };
+                TAG: /* IDENT */5,
+                _0: [
+                  loc,
+                  ident
+                ]
+              };
           }
       case 20 :
           return /* EOF */25;
@@ -1832,9 +1832,9 @@ function lexer(lexbuf) {
                     _1: "Unknown character found %s"
                   }), Stdlib__Lexing.lexeme(lexbuf));
           throw new Caml_js_exceptions.MelangeError("Failure", {
-                    MEL_EXN_ID: "Failure",
-                    _1: s$1
-                  });
+                MEL_EXN_ID: "Failure",
+                _1: s$1
+              });
       default:
         Curry._1(lexbuf.refill_buff, lexbuf);
         ___ocaml_lex_state = __ocaml_lex_state$1;
@@ -1908,64 +1908,64 @@ function string_of_record_field_type(param) {
         const match$1 = param._0;
         if (match$1[0] === /* At_list */0) {
           return Curry._3(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '(' */40,
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '(' */40,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " * ",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                              TAG: /* String_literal */11,
+                              _0: ") ",
                               _1: {
-                                TAG: /* String_literal */11,
-                                _0: " * ",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: ") ",
-                                    _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
+                                _1: /* End_of_format */0
                               }
                             }
-                          },
-                          _1: "(%s * %s) %s"
-                        }), string_of_basic_type(match$1[2][0]), string_of_field_type(match$1[3][0]), "list");
+                          }
+                        }
+                      }
+                    },
+                    _1: "(%s * %s) %s"
+                  }), string_of_basic_type(match$1[2][0]), string_of_field_type(match$1[3][0]), "list");
         } else {
           return Curry._3(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '(' */40,
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '(' */40,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: ", ",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                              TAG: /* String_literal */11,
+                              _0: ") ",
                               _1: {
-                                TAG: /* String_literal */11,
-                                _0: ", ",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: ") ",
-                                    _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
+                                _1: /* End_of_format */0
                               }
                             }
-                          },
-                          _1: "(%s, %s) %s"
-                        }), string_of_basic_type(match$1[2][0]), string_of_field_type(match$1[3][0]), "Hashtbl.t");
+                          }
+                        }
+                      }
+                    },
+                    _1: "(%s, %s) %s"
+                  }), string_of_basic_type(match$1[2][0]), string_of_field_type(match$1[3][0]), "Hashtbl.t");
         }
     case /* Rft_variant_field */4 :
         return param._0.v_name;
@@ -1977,48 +1977,48 @@ function function_name_of_user_defined(prefix, param) {
   const module_ = param.udt_module;
   if (module_ !== undefined) {
     return Curry._3(Stdlib__Printf.sprintf({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String */2,
-                      _0: /* No_padding */0,
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String */2,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* Char_literal */12,
+                  _0: /* '.' */46,
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '_' */95,
                       _1: {
-                        TAG: /* Char_literal */12,
-                        _0: /* '.' */46,
-                        _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '_' */95,
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        }
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
                       }
-                    },
-                    _1: "%s.%s_%s"
-                  }), module_, prefix, param.udt_type_name);
+                    }
+                  }
+                }
+              },
+              _1: "%s.%s_%s"
+            }), module_, prefix, param.udt_type_name);
   } else {
     return Curry._2(Stdlib__Printf.sprintf({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String */2,
-                      _0: /* No_padding */0,
-                      _1: {
-                        TAG: /* Char_literal */12,
-                        _0: /* '_' */95,
-                        _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "%s_%s"
-                  }), prefix, param.udt_type_name);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String */2,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* Char_literal */12,
+                  _0: /* '_' */95,
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "%s_%s"
+            }), prefix, param.udt_type_name);
   }
 }
 
@@ -2139,9 +2139,9 @@ function runtime_function(param) {
                   return "Pbrt.Decoder.int32_as_bits32";
               default:
                 throw new Caml_js_exceptions.MelangeError("Failure", {
-                          MEL_EXN_ID: "Failure",
-                          _1: "Invalid encoding/OCaml type combination"
-                        });
+                      MEL_EXN_ID: "Failure",
+                      _1: "Invalid encoding/OCaml type combination"
+                    });
             }
         case /* Pk_bits64 */1 :
             switch (param[2]) {
@@ -2153,9 +2153,9 @@ function runtime_function(param) {
                   return "Pbrt.Decoder.int64_as_bits64";
               default:
                 throw new Caml_js_exceptions.MelangeError("Failure", {
-                          MEL_EXN_ID: "Failure",
-                          _1: "Invalid encoding/OCaml type combination"
-                        });
+                      MEL_EXN_ID: "Failure",
+                      _1: "Invalid encoding/OCaml type combination"
+                    });
             }
         case /* Pk_bytes */2 :
             switch (param[2]) {
@@ -2165,9 +2165,9 @@ function runtime_function(param) {
                   return "Pbrt.Decoder.bytes";
               default:
                 throw new Caml_js_exceptions.MelangeError("Failure", {
-                          MEL_EXN_ID: "Failure",
-                          _1: "Invalid encoding/OCaml type combination"
-                        });
+                      MEL_EXN_ID: "Failure",
+                      _1: "Invalid encoding/OCaml type combination"
+                    });
             }
         
       }
@@ -2181,9 +2181,9 @@ function runtime_function(param) {
             return "Pbrt.Decoder.int64_as_zigzag";
         default:
           throw new Caml_js_exceptions.MelangeError("Failure", {
-                    MEL_EXN_ID: "Failure",
-                    _1: "Invalid encoding/OCaml type combination"
-                  });
+                MEL_EXN_ID: "Failure",
+                _1: "Invalid encoding/OCaml type combination"
+              });
       }
     } else {
       switch (param[2]) {
@@ -2197,9 +2197,9 @@ function runtime_function(param) {
             return "Pbrt.Decoder.bool";
         default:
           throw new Caml_js_exceptions.MelangeError("Failure", {
-                    MEL_EXN_ID: "Failure",
-                    _1: "Invalid encoding/OCaml type combination"
-                  });
+                MEL_EXN_ID: "Failure",
+                _1: "Invalid encoding/OCaml type combination"
+              });
       }
     }
   } else if (match === "Encode") {
@@ -2216,9 +2216,9 @@ function runtime_function(param) {
                   return "Pbrt.Encoder.int32_as_bits32";
               default:
                 throw new Caml_js_exceptions.MelangeError("Failure", {
-                          MEL_EXN_ID: "Failure",
-                          _1: "Invalid encoding/OCaml type combination"
-                        });
+                      MEL_EXN_ID: "Failure",
+                      _1: "Invalid encoding/OCaml type combination"
+                    });
             }
         case /* Pk_bits64 */1 :
             switch (param[2]) {
@@ -2230,9 +2230,9 @@ function runtime_function(param) {
                   return "Pbrt.Encoder.int64_as_bits64";
               default:
                 throw new Caml_js_exceptions.MelangeError("Failure", {
-                          MEL_EXN_ID: "Failure",
-                          _1: "Invalid encoding/OCaml type combination"
-                        });
+                      MEL_EXN_ID: "Failure",
+                      _1: "Invalid encoding/OCaml type combination"
+                    });
             }
         case /* Pk_bytes */2 :
             switch (param[2]) {
@@ -2242,9 +2242,9 @@ function runtime_function(param) {
                   return "Pbrt.Encoder.bytes";
               default:
                 throw new Caml_js_exceptions.MelangeError("Failure", {
-                          MEL_EXN_ID: "Failure",
-                          _1: "Invalid encoding/OCaml type combination"
-                        });
+                      MEL_EXN_ID: "Failure",
+                      _1: "Invalid encoding/OCaml type combination"
+                    });
             }
         
       }
@@ -2258,9 +2258,9 @@ function runtime_function(param) {
             return "Pbrt.Encoder.int64_as_zigzag";
         default:
           throw new Caml_js_exceptions.MelangeError("Failure", {
-                    MEL_EXN_ID: "Failure",
-                    _1: "Invalid encoding/OCaml type combination"
-                  });
+                MEL_EXN_ID: "Failure",
+                _1: "Invalid encoding/OCaml type combination"
+              });
       }
     } else {
       switch (param[2]) {
@@ -2274,25 +2274,25 @@ function runtime_function(param) {
             return "Pbrt.Encoder.bool";
         default:
           throw new Caml_js_exceptions.MelangeError("Failure", {
-                    MEL_EXN_ID: "Failure",
-                    _1: "Invalid encoding/OCaml type combination"
-                  });
+                MEL_EXN_ID: "Failure",
+                _1: "Invalid encoding/OCaml type combination"
+              });
       }
     }
   } else {
     throw new Caml_js_exceptions.MelangeError("Failure", {
-              MEL_EXN_ID: "Failure",
-              _1: "Invalid encoding/OCaml type combination"
-            });
+          MEL_EXN_ID: "Failure",
+          _1: "Invalid encoding/OCaml type combination"
+        });
   }
 }
 
 function decode_basic_type(bt, pk) {
   return runtime_function([
-              "Decode",
-              pk,
-              bt
-            ]);
+        "Decode",
+        pk,
+        bt
+      ]);
 }
 
 function decode_field_f(field_type, pk) {
@@ -2321,18 +2321,18 @@ function gen_decode_record(and_, param, sc) {
             case /* Rft_repeated_field */2 :
                 if (rf_field_type._0[0] === /* Rt_list */0) {
                   return {
-                          hd: rf_label,
-                          tl: acc
-                        };
+                    hd: rf_label,
+                    tl: acc
+                  };
                 } else {
                   return acc;
                 }
             case /* Rft_associative_field */3 :
                 if (rf_field_type._0[0] === /* At_list */0) {
                   return {
-                          hd: rf_label,
-                          tl: acc
-                        };
+                    hd: rf_label,
+                    tl: acc
+                  };
                 } else {
                   return acc;
                 }
@@ -2522,63 +2522,63 @@ function gen_decode_record(and_, param, sc) {
                                 const pk = param$1[2];
                                 const field_type = param$1[0];
                                 return process_field_common(sc, param$1[1], string_of_payload_kind(Caml_option.some(undefined), pk, false), (function (sc) {
-                                              line$1(sc, Curry._2(Stdlib__Printf.sprintf({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "v.",
+                                        line$1(sc, Curry._2(Stdlib__Printf.sprintf({
+                                                      TAG: /* Format */0,
+                                                      _0: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: "v.",
+                                                        _1: {
+                                                          TAG: /* String */2,
+                                                          _0: /* No_padding */0,
+                                                          _1: {
+                                                            TAG: /* String_literal */11,
+                                                            _0: " <- ",
+                                                            _1: {
+                                                              TAG: /* String */2,
+                                                              _0: /* No_padding */0,
                                                               _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: " <- ",
-                                                                  _1: {
-                                                                    TAG: /* String */2,
-                                                                    _0: /* No_padding */0,
-                                                                    _1: {
-                                                                      TAG: /* Char_literal */12,
-                                                                      _0: /* ';' */59,
-                                                                      _1: /* End_of_format */0
-                                                                    }
-                                                                  }
-                                                                }
+                                                                TAG: /* Char_literal */12,
+                                                                _0: /* ';' */59,
+                                                                _1: /* End_of_format */0
                                                               }
-                                                            },
-                                                            _1: "v.%s <- %s;"
-                                                          }), rf_label, decode_field_f(field_type, pk)));
-                                            }));
+                                                            }
+                                                          }
+                                                        }
+                                                      },
+                                                      _1: "v.%s <- %s;"
+                                                    }), rf_label, decode_field_f(field_type, pk)));
+                                      }));
                             case /* Rft_optional */1 :
                                 let param$2 = rf_field_type._0;
                                 const pk$1 = param$2[2];
                                 const field_type$1 = param$2[0];
                                 return process_field_common(sc, param$2[1], string_of_payload_kind(Caml_option.some(undefined), pk$1, false), (function (sc) {
-                                              line$1(sc, Curry._2(Stdlib__Printf.sprintf({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "v.",
+                                        line$1(sc, Curry._2(Stdlib__Printf.sprintf({
+                                                      TAG: /* Format */0,
+                                                      _0: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: "v.",
+                                                        _1: {
+                                                          TAG: /* String */2,
+                                                          _0: /* No_padding */0,
+                                                          _1: {
+                                                            TAG: /* String_literal */11,
+                                                            _0: " <- Some (",
+                                                            _1: {
+                                                              TAG: /* String */2,
+                                                              _0: /* No_padding */0,
                                                               _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: " <- Some (",
-                                                                  _1: {
-                                                                    TAG: /* String */2,
-                                                                    _0: /* No_padding */0,
-                                                                    _1: {
-                                                                      TAG: /* String_literal */11,
-                                                                      _0: ");",
-                                                                      _1: /* End_of_format */0
-                                                                    }
-                                                                  }
-                                                                }
+                                                                TAG: /* String_literal */11,
+                                                                _0: ");",
+                                                                _1: /* End_of_format */0
                                                               }
-                                                            },
-                                                            _1: "v.%s <- Some (%s);"
-                                                          }), rf_label, decode_field_f(field_type$1, pk$1)));
-                                            }));
+                                                            }
+                                                          }
+                                                        }
+                                                      },
+                                                      _1: "v.%s <- Some (%s);"
+                                                    }), rf_label, decode_field_f(field_type$1, pk$1)));
+                                      }));
                             case /* Rft_repeated_field */2 :
                                 let param$3 = rf_field_type._0;
                                 const is_packed = param$3[4];
@@ -2588,35 +2588,248 @@ function gen_decode_record(and_, param, sc) {
                                 if (param$3[0] === /* Rt_list */0) {
                                   if (is_packed) {
                                     return process_field_common(sc, encoding_number, "Bytes", (function (sc) {
+                                            line$1(sc, Curry._2(Stdlib__Printf.sprintf({
+                                                          TAG: /* Format */0,
+                                                          _0: {
+                                                            TAG: /* String_literal */11,
+                                                            _0: "v.",
+                                                            _1: {
+                                                              TAG: /* String */2,
+                                                              _0: /* No_padding */0,
+                                                              _1: {
+                                                                TAG: /* String_literal */11,
+                                                                _0: " <- Pbrt.Decoder.packed_fold (fun l d -> (",
+                                                                _1: {
+                                                                  TAG: /* String */2,
+                                                                  _0: /* No_padding */0,
+                                                                  _1: {
+                                                                    TAG: /* String_literal */11,
+                                                                    _0: ")::l) [] d;",
+                                                                    _1: /* End_of_format */0
+                                                                  }
+                                                                }
+                                                              }
+                                                            }
+                                                          },
+                                                          _1: "v.%s <- Pbrt.Decoder.packed_fold (fun l d -> (%s)::l) [] d;"
+                                                        }), rf_label, decode_field_f(field_type$2, pk$2)));
+                                          }));
+                                  } else {
+                                    return process_field_common(sc, encoding_number, string_of_payload_kind(Caml_option.some(undefined), pk$2, false), (function (sc) {
+                                            line$1(sc, Curry._3(Stdlib__Printf.sprintf({
+                                                          TAG: /* Format */0,
+                                                          _0: {
+                                                            TAG: /* String_literal */11,
+                                                            _0: "v.",
+                                                            _1: {
+                                                              TAG: /* String */2,
+                                                              _0: /* No_padding */0,
+                                                              _1: {
+                                                                TAG: /* String_literal */11,
+                                                                _0: " <- (",
+                                                                _1: {
+                                                                  TAG: /* String */2,
+                                                                  _0: /* No_padding */0,
+                                                                  _1: {
+                                                                    TAG: /* String_literal */11,
+                                                                    _0: ") :: v.",
+                                                                    _1: {
+                                                                      TAG: /* String */2,
+                                                                      _0: /* No_padding */0,
+                                                                      _1: {
+                                                                        TAG: /* Char_literal */12,
+                                                                        _0: /* ';' */59,
+                                                                        _1: /* End_of_format */0
+                                                                      }
+                                                                    }
+                                                                  }
+                                                                }
+                                                              }
+                                                            }
+                                                          },
+                                                          _1: "v.%s <- (%s) :: v.%s;"
+                                                        }), rf_label, decode_field_f(field_type$2, pk$2), rf_label));
+                                          }));
+                                  }
+                                } else if (is_packed) {
+                                  return process_field_common(sc, encoding_number, "Bytes", (function (sc) {
+                                          line$1(sc, "Pbrt.Decoder.packed_fold (fun () d -> ");
+                                          scope(sc, (function (sc) {
                                                   line$1(sc, Curry._2(Stdlib__Printf.sprintf({
                                                                 TAG: /* Format */0,
                                                                 _0: {
                                                                   TAG: /* String_literal */11,
-                                                                  _0: "v.",
+                                                                  _0: "Pbrt.Repeated_field.add (",
                                                                   _1: {
                                                                     TAG: /* String */2,
                                                                     _0: /* No_padding */0,
                                                                     _1: {
                                                                       TAG: /* String_literal */11,
-                                                                      _0: " <- Pbrt.Decoder.packed_fold (fun l d -> (",
+                                                                      _0: ") v.",
                                                                       _1: {
                                                                         TAG: /* String */2,
                                                                         _0: /* No_padding */0,
                                                                         _1: {
-                                                                          TAG: /* String_literal */11,
-                                                                          _0: ")::l) [] d;",
+                                                                          TAG: /* Char_literal */12,
+                                                                          _0: /* ';' */59,
                                                                           _1: /* End_of_format */0
                                                                         }
                                                                       }
                                                                     }
                                                                   }
                                                                 },
-                                                                _1: "v.%s <- Pbrt.Decoder.packed_fold (fun l d -> (%s)::l) [] d;"
-                                                              }), rf_label, decode_field_f(field_type$2, pk$2)));
+                                                                _1: "Pbrt.Repeated_field.add (%s) v.%s;"
+                                                              }), decode_field_f(field_type$2, pk$2), rf_label));
                                                 }));
-                                  } else {
-                                    return process_field_common(sc, encoding_number, string_of_payload_kind(Caml_option.some(undefined), pk$2, false), (function (sc) {
-                                                  line$1(sc, Curry._3(Stdlib__Printf.sprintf({
+                                          line$1(sc, ") () d;");
+                                        }));
+                                } else {
+                                  return process_field_common(sc, encoding_number, string_of_payload_kind(Caml_option.some(undefined), pk$2, false), (function (sc) {
+                                          line$1(sc, Curry._2(Stdlib__Printf.sprintf({
+                                                        TAG: /* Format */0,
+                                                        _0: {
+                                                          TAG: /* String_literal */11,
+                                                          _0: "Pbrt.Repeated_field.add (",
+                                                          _1: {
+                                                            TAG: /* String */2,
+                                                            _0: /* No_padding */0,
+                                                            _1: {
+                                                              TAG: /* String_literal */11,
+                                                              _0: ") v.",
+                                                              _1: {
+                                                                TAG: /* String */2,
+                                                                _0: /* No_padding */0,
+                                                                _1: {
+                                                                  TAG: /* String_literal */11,
+                                                                  _0: "; ",
+                                                                  _1: /* End_of_format */0
+                                                                }
+                                                              }
+                                                            }
+                                                          }
+                                                        },
+                                                        _1: "Pbrt.Repeated_field.add (%s) v.%s; "
+                                                      }), decode_field_f(field_type$2, pk$2), rf_label));
+                                        }));
+                                }
+                            case /* Rft_associative_field */3 :
+                                let param$4 = rf_field_type._0;
+                                const match = param$4[3];
+                                const value_pk = match[1];
+                                const value_type = match[0];
+                                const match$1 = param$4[2];
+                                const at = param$4[0];
+                                const decode_key_f = decode_basic_type(match$1[0], match$1[1]);
+                                return process_field_common(sc, param$4[1], "Bytes", (function (sc) {
+                                        line$1(sc, "let decode_value = (fun d ->");
+                                        scope(sc, (function (sc) {
+                                                line$1(sc, decode_field_f(value_type, value_pk));
+                                              }));
+                                        line$1(sc, ") in");
+                                        const decode_expression = Curry._1(Stdlib__Printf.sprintf({
+                                                  TAG: /* Format */0,
+                                                  _0: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: "(Pbrt.Decoder.map_entry d ~decode_key:",
+                                                    _1: {
+                                                      TAG: /* String */2,
+                                                      _0: /* No_padding */0,
+                                                      _1: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: " ~decode_value)",
+                                                        _1: /* End_of_format */0
+                                                      }
+                                                    }
+                                                  },
+                                                  _1: "(Pbrt.Decoder.map_entry d ~decode_key:%s ~decode_value)"
+                                                }), decode_key_f);
+                                        if (at === /* At_list */0) {
+                                          line$1(sc, Curry._1(Stdlib__Printf.sprintf({
+                                                        TAG: /* Format */0,
+                                                        _0: {
+                                                          TAG: /* String_literal */11,
+                                                          _0: "v.",
+                                                          _1: {
+                                                            TAG: /* String */2,
+                                                            _0: /* No_padding */0,
+                                                            _1: {
+                                                              TAG: /* String_literal */11,
+                                                              _0: " <- (",
+                                                              _1: /* End_of_format */0
+                                                            }
+                                                          }
+                                                        },
+                                                        _1: "v.%s <- ("
+                                                      }), rf_label));
+                                          scope(sc, (function (sc) {
+                                                  line$1(sc, Curry._2(Stdlib__Printf.sprintf({
+                                                                TAG: /* Format */0,
+                                                                _0: {
+                                                                  TAG: /* String */2,
+                                                                  _0: /* No_padding */0,
+                                                                  _1: {
+                                                                    TAG: /* String_literal */11,
+                                                                    _0: "::v.",
+                                                                    _1: {
+                                                                      TAG: /* String */2,
+                                                                      _0: /* No_padding */0,
+                                                                      _1: {
+                                                                        TAG: /* Char_literal */12,
+                                                                        _0: /* ';' */59,
+                                                                        _1: /* End_of_format */0
+                                                                      }
+                                                                    }
+                                                                  }
+                                                                },
+                                                                _1: "%s::v.%s;"
+                                                              }), decode_expression, rf_label));
+                                                }));
+                                          return line$1(sc, ");");
+                                        }
+                                        line$1(sc, Curry._1(Stdlib__Printf.sprintf({
+                                                      TAG: /* Format */0,
+                                                      _0: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: "let a, b = ",
+                                                        _1: {
+                                                          TAG: /* String */2,
+                                                          _0: /* No_padding */0,
+                                                          _1: {
+                                                            TAG: /* String_literal */11,
+                                                            _0: " in",
+                                                            _1: /* End_of_format */0
+                                                          }
+                                                        }
+                                                      },
+                                                      _1: "let a, b = %s in"
+                                                    }), decode_expression));
+                                        line$1(sc, Curry._1(Stdlib__Printf.sprintf({
+                                                      TAG: /* Format */0,
+                                                      _0: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: "Hashtbl.add v.",
+                                                        _1: {
+                                                          TAG: /* String */2,
+                                                          _0: /* No_padding */0,
+                                                          _1: {
+                                                            TAG: /* String_literal */11,
+                                                            _0: " a b;",
+                                                            _1: /* End_of_format */0
+                                                          }
+                                                        }
+                                                      },
+                                                      _1: "Hashtbl.add v.%s a b;"
+                                                    }), rf_label));
+                                      }));
+                            case /* Rft_variant_field */4 :
+                                let param$5 = rf_field_type._0;
+                                return Stdlib__List.iter((function (param) {
+                                        const pk = param.vc_payload_kind;
+                                        const vc_field_type = param.vc_field_type;
+                                        const vc_constructor = param.vc_constructor;
+                                        process_field_common(sc, param.vc_encoding_number, string_of_payload_kind(Caml_option.some(undefined), pk, false), (function (sc) {
+                                                if (!/* tag */(typeof vc_field_type === "number" || typeof vc_field_type === "string")) {
+                                                  return line$1(sc, Curry._3(Stdlib__Printf.sprintf({
                                                                 TAG: /* Format */0,
                                                                 _0: {
                                                                   TAG: /* String_literal */11,
@@ -2626,19 +2839,19 @@ function gen_decode_record(and_, param, sc) {
                                                                     _0: /* No_padding */0,
                                                                     _1: {
                                                                       TAG: /* String_literal */11,
-                                                                      _0: " <- (",
+                                                                      _0: " <- ",
                                                                       _1: {
                                                                         TAG: /* String */2,
                                                                         _0: /* No_padding */0,
                                                                         _1: {
                                                                           TAG: /* String_literal */11,
-                                                                          _0: ") :: v.",
+                                                                          _0: " (",
                                                                           _1: {
                                                                             TAG: /* String */2,
                                                                             _0: /* No_padding */0,
                                                                             _1: {
-                                                                              TAG: /* Char_literal */12,
-                                                                              _0: /* ';' */59,
+                                                                              TAG: /* String_literal */11,
+                                                                              _0: ");",
                                                                               _1: /* End_of_format */0
                                                                             }
                                                                           }
@@ -2647,250 +2860,37 @@ function gen_decode_record(and_, param, sc) {
                                                                     }
                                                                   }
                                                                 },
-                                                                _1: "v.%s <- (%s) :: v.%s;"
-                                                              }), rf_label, decode_field_f(field_type$2, pk$2), rf_label));
-                                                }));
-                                  }
-                                } else if (is_packed) {
-                                  return process_field_common(sc, encoding_number, "Bytes", (function (sc) {
-                                                line$1(sc, "Pbrt.Decoder.packed_fold (fun () d -> ");
-                                                scope(sc, (function (sc) {
-                                                        line$1(sc, Curry._2(Stdlib__Printf.sprintf({
-                                                                      TAG: /* Format */0,
-                                                                      _0: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: "Pbrt.Repeated_field.add (",
-                                                                        _1: {
-                                                                          TAG: /* String */2,
-                                                                          _0: /* No_padding */0,
-                                                                          _1: {
-                                                                            TAG: /* String_literal */11,
-                                                                            _0: ") v.",
-                                                                            _1: {
-                                                                              TAG: /* String */2,
-                                                                              _0: /* No_padding */0,
-                                                                              _1: {
-                                                                                TAG: /* Char_literal */12,
-                                                                                _0: /* ';' */59,
-                                                                                _1: /* End_of_format */0
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      },
-                                                                      _1: "Pbrt.Repeated_field.add (%s) v.%s;"
-                                                                    }), decode_field_f(field_type$2, pk$2), rf_label));
-                                                      }));
-                                                line$1(sc, ") () d;");
-                                              }));
-                                } else {
-                                  return process_field_common(sc, encoding_number, string_of_payload_kind(Caml_option.some(undefined), pk$2, false), (function (sc) {
+                                                                _1: "v.%s <- %s (%s);"
+                                                              }), rf_label, vc_constructor, decode_field_f(vc_field_type._0, pk)));
+                                                }
+                                                line$1(sc, "Pbrt.Decoder.empty_nested d;");
                                                 line$1(sc, Curry._2(Stdlib__Printf.sprintf({
                                                               TAG: /* Format */0,
                                                               _0: {
                                                                 TAG: /* String_literal */11,
-                                                                _0: "Pbrt.Repeated_field.add (",
+                                                                _0: "v.",
                                                                 _1: {
                                                                   TAG: /* String */2,
                                                                   _0: /* No_padding */0,
                                                                   _1: {
                                                                     TAG: /* String_literal */11,
-                                                                    _0: ") v.",
+                                                                    _0: " <- ",
                                                                     _1: {
                                                                       TAG: /* String */2,
                                                                       _0: /* No_padding */0,
                                                                       _1: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: "; ",
+                                                                        TAG: /* Char_literal */12,
+                                                                        _0: /* ';' */59,
                                                                         _1: /* End_of_format */0
                                                                       }
                                                                     }
                                                                   }
                                                                 }
                                                               },
-                                                              _1: "Pbrt.Repeated_field.add (%s) v.%s; "
-                                                            }), decode_field_f(field_type$2, pk$2), rf_label));
+                                                              _1: "v.%s <- %s;"
+                                                            }), rf_label, vc_constructor));
                                               }));
-                                }
-                            case /* Rft_associative_field */3 :
-                                let param$4 = rf_field_type._0;
-                                const match = param$4[3];
-                                const value_pk = match[1];
-                                const value_type = match[0];
-                                const match$1 = param$4[2];
-                                const at = param$4[0];
-                                const decode_key_f = decode_basic_type(match$1[0], match$1[1]);
-                                return process_field_common(sc, param$4[1], "Bytes", (function (sc) {
-                                              line$1(sc, "let decode_value = (fun d ->");
-                                              scope(sc, (function (sc) {
-                                                      line$1(sc, decode_field_f(value_type, value_pk));
-                                                    }));
-                                              line$1(sc, ") in");
-                                              const decode_expression = Curry._1(Stdlib__Printf.sprintf({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "(Pbrt.Decoder.map_entry d ~decode_key:",
-                                                          _1: {
-                                                            TAG: /* String */2,
-                                                            _0: /* No_padding */0,
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: " ~decode_value)",
-                                                              _1: /* End_of_format */0
-                                                            }
-                                                          }
-                                                        },
-                                                        _1: "(Pbrt.Decoder.map_entry d ~decode_key:%s ~decode_value)"
-                                                      }), decode_key_f);
-                                              if (at === /* At_list */0) {
-                                                line$1(sc, Curry._1(Stdlib__Printf.sprintf({
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "v.",
-                                                                _1: {
-                                                                  TAG: /* String */2,
-                                                                  _0: /* No_padding */0,
-                                                                  _1: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: " <- (",
-                                                                    _1: /* End_of_format */0
-                                                                  }
-                                                                }
-                                                              },
-                                                              _1: "v.%s <- ("
-                                                            }), rf_label));
-                                                scope(sc, (function (sc) {
-                                                        line$1(sc, Curry._2(Stdlib__Printf.sprintf({
-                                                                      TAG: /* Format */0,
-                                                                      _0: {
-                                                                        TAG: /* String */2,
-                                                                        _0: /* No_padding */0,
-                                                                        _1: {
-                                                                          TAG: /* String_literal */11,
-                                                                          _0: "::v.",
-                                                                          _1: {
-                                                                            TAG: /* String */2,
-                                                                            _0: /* No_padding */0,
-                                                                            _1: {
-                                                                              TAG: /* Char_literal */12,
-                                                                              _0: /* ';' */59,
-                                                                              _1: /* End_of_format */0
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      },
-                                                                      _1: "%s::v.%s;"
-                                                                    }), decode_expression, rf_label));
-                                                      }));
-                                                return line$1(sc, ");");
-                                              }
-                                              line$1(sc, Curry._1(Stdlib__Printf.sprintf({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "let a, b = ",
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: " in",
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            },
-                                                            _1: "let a, b = %s in"
-                                                          }), decode_expression));
-                                              line$1(sc, Curry._1(Stdlib__Printf.sprintf({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "Hashtbl.add v.",
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: " a b;",
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            },
-                                                            _1: "Hashtbl.add v.%s a b;"
-                                                          }), rf_label));
-                                            }));
-                            case /* Rft_variant_field */4 :
-                                let param$5 = rf_field_type._0;
-                                return Stdlib__List.iter((function (param) {
-                                              const pk = param.vc_payload_kind;
-                                              const vc_field_type = param.vc_field_type;
-                                              const vc_constructor = param.vc_constructor;
-                                              process_field_common(sc, param.vc_encoding_number, string_of_payload_kind(Caml_option.some(undefined), pk, false), (function (sc) {
-                                                      if (!/* tag */(typeof vc_field_type === "number" || typeof vc_field_type === "string")) {
-                                                        return line$1(sc, Curry._3(Stdlib__Printf.sprintf({
-                                                                            TAG: /* Format */0,
-                                                                            _0: {
-                                                                              TAG: /* String_literal */11,
-                                                                              _0: "v.",
-                                                                              _1: {
-                                                                                TAG: /* String */2,
-                                                                                _0: /* No_padding */0,
-                                                                                _1: {
-                                                                                  TAG: /* String_literal */11,
-                                                                                  _0: " <- ",
-                                                                                  _1: {
-                                                                                    TAG: /* String */2,
-                                                                                    _0: /* No_padding */0,
-                                                                                    _1: {
-                                                                                      TAG: /* String_literal */11,
-                                                                                      _0: " (",
-                                                                                      _1: {
-                                                                                        TAG: /* String */2,
-                                                                                        _0: /* No_padding */0,
-                                                                                        _1: {
-                                                                                          TAG: /* String_literal */11,
-                                                                                          _0: ");",
-                                                                                          _1: /* End_of_format */0
-                                                                                        }
-                                                                                      }
-                                                                                    }
-                                                                                  }
-                                                                                }
-                                                                              }
-                                                                            },
-                                                                            _1: "v.%s <- %s (%s);"
-                                                                          }), rf_label, vc_constructor, decode_field_f(vc_field_type._0, pk)));
-                                                      }
-                                                      line$1(sc, "Pbrt.Decoder.empty_nested d;");
-                                                      line$1(sc, Curry._2(Stdlib__Printf.sprintf({
-                                                                    TAG: /* Format */0,
-                                                                    _0: {
-                                                                      TAG: /* String_literal */11,
-                                                                      _0: "v.",
-                                                                      _1: {
-                                                                        TAG: /* String */2,
-                                                                        _0: /* No_padding */0,
-                                                                        _1: {
-                                                                          TAG: /* String_literal */11,
-                                                                          _0: " <- ",
-                                                                          _1: {
-                                                                            TAG: /* String */2,
-                                                                            _0: /* No_padding */0,
-                                                                            _1: {
-                                                                              TAG: /* Char_literal */12,
-                                                                              _0: /* ';' */59,
-                                                                              _1: /* End_of_format */0
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    _1: "v.%s <- %s;"
-                                                                  }), rf_label, vc_constructor));
-                                                    }));
-                                            }), param$5.v_constructors);
+                                      }), param$5.v_constructors);
                             
                           }
                         }), r_fields);
@@ -2979,68 +2979,68 @@ function gen_decode_variant(and_, param, sc) {
                                   const vc_constructor = ctor.vc_constructor;
                                   if (/* tag */typeof vc_field_type === "number" || typeof vc_field_type === "string") {
                                     return line$1(sc, Curry._2(Stdlib__Printf.sprintf({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "| Some (",
+                                                  TAG: /* Format */0,
+                                                  _0: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: "| Some (",
+                                                    _1: {
+                                                      TAG: /* Int */4,
+                                                      _0: /* Int_i */3,
+                                                      _1: /* No_padding */0,
+                                                      _2: /* No_precision */0,
+                                                      _3: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: ", _) -> (Pbrt.Decoder.empty_nested d ; ",
+                                                        _1: {
+                                                          TAG: /* String */2,
+                                                          _0: /* No_padding */0,
                                                           _1: {
-                                                            TAG: /* Int */4,
-                                                            _0: /* Int_i */3,
-                                                            _1: /* No_padding */0,
-                                                            _2: /* No_precision */0,
-                                                            _3: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: ", _) -> (Pbrt.Decoder.empty_nested d ; ",
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* Char_literal */12,
-                                                                  _0: /* ')' */41,
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            }
+                                                            TAG: /* Char_literal */12,
+                                                            _0: /* ')' */41,
+                                                            _1: /* End_of_format */0
                                                           }
-                                                        },
-                                                        _1: "| Some (%i, _) -> (Pbrt.Decoder.empty_nested d ; %s)"
-                                                      }), vc_encoding_number, vc_constructor));
+                                                        }
+                                                      }
+                                                    }
+                                                  },
+                                                  _1: "| Some (%i, _) -> (Pbrt.Decoder.empty_nested d ; %s)"
+                                                }), vc_encoding_number, vc_constructor));
                                   } else {
                                     return line$1(sc, Curry._3(Stdlib__Printf.sprintf({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "| Some (",
+                                                  TAG: /* Format */0,
+                                                  _0: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: "| Some (",
+                                                    _1: {
+                                                      TAG: /* Int */4,
+                                                      _0: /* Int_i */3,
+                                                      _1: /* No_padding */0,
+                                                      _2: /* No_precision */0,
+                                                      _3: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: ", _) -> ",
+                                                        _1: {
+                                                          TAG: /* String */2,
+                                                          _0: /* No_padding */0,
                                                           _1: {
-                                                            TAG: /* Int */4,
-                                                            _0: /* Int_i */3,
-                                                            _1: /* No_padding */0,
-                                                            _2: /* No_precision */0,
-                                                            _3: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: ", _) -> ",
+                                                            TAG: /* String_literal */11,
+                                                            _0: " (",
+                                                            _1: {
+                                                              TAG: /* String */2,
+                                                              _0: /* No_padding */0,
                                                               _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: " (",
-                                                                  _1: {
-                                                                    TAG: /* String */2,
-                                                                    _0: /* No_padding */0,
-                                                                    _1: {
-                                                                      TAG: /* Char_literal */12,
-                                                                      _0: /* ')' */41,
-                                                                      _1: /* End_of_format */0
-                                                                    }
-                                                                  }
-                                                                }
+                                                                TAG: /* Char_literal */12,
+                                                                _0: /* ')' */41,
+                                                                _1: /* End_of_format */0
                                                               }
                                                             }
                                                           }
-                                                        },
-                                                        _1: "| Some (%i, _) -> %s (%s)"
-                                                      }), vc_encoding_number, vc_constructor, decode_field_f(vc_field_type._0, ctor.vc_payload_kind)));
+                                                        }
+                                                      }
+                                                    }
+                                                  },
+                                                  _1: "| Some (%i, _) -> %s (%s)"
+                                                }), vc_encoding_number, vc_constructor, decode_field_f(vc_field_type._0, ctor.vc_payload_kind)));
                                   }
                                 }), v_constructors);
                           line$1(sc, "| Some (n, payload_kind) -> (");
@@ -3281,18 +3281,18 @@ function gen_pp_field(field_type) {
     return function_name_of_user_defined("pp", field_type._0);
   }
   return Curry._1(Stdlib__Printf.sprintf({
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* String_literal */11,
-                    _0: "Pbrt.Pp.pp_",
-                    _1: {
-                      TAG: /* String */2,
-                      _0: /* No_padding */0,
-                      _1: /* End_of_format */0
-                    }
-                  },
-                  _1: "Pbrt.Pp.pp_%s"
-                }), string_of_field_type(field_type));
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* String_literal */11,
+              _0: "Pbrt.Pp.pp_",
+              _1: {
+                TAG: /* String */2,
+                _0: /* No_padding */0,
+                _1: /* End_of_format */0
+              }
+            },
+            _1: "Pbrt.Pp.pp_%s"
+          }), string_of_field_type(field_type));
 }
 
 function gen_pp_record(and_, param, sc) {
@@ -3368,144 +3368,144 @@ function gen_pp_record(and_, param, sc) {
                             case /* Rft_required */0 :
                                 const field_string_of = gen_pp_field(rf_field_type._0[0]);
                                 return line$1(sc, Curry._3(Stdlib__Printf.sprintf({
-                                                    TAG: /* Format */0,
-                                                    _0: {
-                                                      TAG: /* String_literal */11,
-                                                      _0: "Pbrt.Pp.pp_record_field \"",
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: "Pbrt.Pp.pp_record_field \"",
+                                                _1: {
+                                                  TAG: /* String */2,
+                                                  _0: /* No_padding */0,
+                                                  _1: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: "\" ",
+                                                    _1: {
+                                                      TAG: /* String */2,
+                                                      _0: /* No_padding */0,
                                                       _1: {
-                                                        TAG: /* String */2,
-                                                        _0: /* No_padding */0,
+                                                        TAG: /* String_literal */11,
+                                                        _0: " fmt ",
                                                         _1: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "\" ",
+                                                          TAG: /* String */2,
+                                                          _0: /* No_padding */0,
                                                           _1: {
-                                                            TAG: /* String */2,
-                                                            _0: /* No_padding */0,
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: " fmt ",
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* Char_literal */12,
-                                                                  _0: /* ';' */59,
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            }
+                                                            TAG: /* Char_literal */12,
+                                                            _0: /* ';' */59,
+                                                            _1: /* End_of_format */0
                                                           }
                                                         }
                                                       }
-                                                    },
-                                                    _1: "Pbrt.Pp.pp_record_field \"%s\" %s fmt %s;"
-                                                  }), rf_label, field_string_of, var_name));
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              _1: "Pbrt.Pp.pp_record_field \"%s\" %s fmt %s;"
+                                            }), rf_label, field_string_of, var_name));
                             case /* Rft_optional */1 :
                                 const field_string_of$1 = gen_pp_field(rf_field_type._0[0]);
                                 return line$1(sc, Curry._3(Stdlib__Printf.sprintf({
-                                                    TAG: /* Format */0,
-                                                    _0: {
-                                                      TAG: /* String_literal */11,
-                                                      _0: "Pbrt.Pp.pp_record_field \"",
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: "Pbrt.Pp.pp_record_field \"",
+                                                _1: {
+                                                  TAG: /* String */2,
+                                                  _0: /* No_padding */0,
+                                                  _1: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: "\" (Pbrt.Pp.pp_option ",
+                                                    _1: {
+                                                      TAG: /* String */2,
+                                                      _0: /* No_padding */0,
                                                       _1: {
-                                                        TAG: /* String */2,
-                                                        _0: /* No_padding */0,
+                                                        TAG: /* String_literal */11,
+                                                        _0: ") fmt ",
                                                         _1: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "\" (Pbrt.Pp.pp_option ",
+                                                          TAG: /* String */2,
+                                                          _0: /* No_padding */0,
                                                           _1: {
-                                                            TAG: /* String */2,
-                                                            _0: /* No_padding */0,
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: ") fmt ",
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* Char_literal */12,
-                                                                  _0: /* ';' */59,
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            }
+                                                            TAG: /* Char_literal */12,
+                                                            _0: /* ';' */59,
+                                                            _1: /* End_of_format */0
                                                           }
                                                         }
                                                       }
-                                                    },
-                                                    _1: "Pbrt.Pp.pp_record_field \"%s\" (Pbrt.Pp.pp_option %s) fmt %s;"
-                                                  }), rf_label, field_string_of$1, var_name));
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              _1: "Pbrt.Pp.pp_record_field \"%s\" (Pbrt.Pp.pp_option %s) fmt %s;"
+                                            }), rf_label, field_string_of$1, var_name));
                             case /* Rft_repeated_field */2 :
                                 const match = rf_field_type._0;
                                 const field_string_of$2 = gen_pp_field(match[1]);
                                 if (match[0] === /* Rt_list */0) {
                                   return line$1(sc, Curry._3(Stdlib__Printf.sprintf({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "Pbrt.Pp.pp_record_field \"",
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "Pbrt.Pp.pp_record_field \"",
+                                                  _1: {
+                                                    TAG: /* String */2,
+                                                    _0: /* No_padding */0,
+                                                    _1: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: "\" (Pbrt.Pp.pp_list ",
+                                                      _1: {
+                                                        TAG: /* String */2,
+                                                        _0: /* No_padding */0,
                                                         _1: {
-                                                          TAG: /* String */2,
-                                                          _0: /* No_padding */0,
+                                                          TAG: /* String_literal */11,
+                                                          _0: ") fmt ",
                                                           _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "\" (Pbrt.Pp.pp_list ",
+                                                            TAG: /* String */2,
+                                                            _0: /* No_padding */0,
                                                             _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: ") fmt ",
-                                                                _1: {
-                                                                  TAG: /* String */2,
-                                                                  _0: /* No_padding */0,
-                                                                  _1: {
-                                                                    TAG: /* Char_literal */12,
-                                                                    _0: /* ';' */59,
-                                                                    _1: /* End_of_format */0
-                                                                  }
-                                                                }
-                                                              }
+                                                              TAG: /* Char_literal */12,
+                                                              _0: /* ';' */59,
+                                                              _1: /* End_of_format */0
                                                             }
                                                           }
                                                         }
-                                                      },
-                                                      _1: "Pbrt.Pp.pp_record_field \"%s\" (Pbrt.Pp.pp_list %s) fmt %s;"
-                                                    }), rf_label, field_string_of$2, var_name));
+                                                      }
+                                                    }
+                                                  }
+                                                },
+                                                _1: "Pbrt.Pp.pp_record_field \"%s\" (Pbrt.Pp.pp_list %s) fmt %s;"
+                                              }), rf_label, field_string_of$2, var_name));
                                 } else {
                                   return line$1(sc, Curry._3(Stdlib__Printf.sprintf({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "Pbrt.Pp.pp_record_field \"",
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "Pbrt.Pp.pp_record_field \"",
+                                                  _1: {
+                                                    TAG: /* String */2,
+                                                    _0: /* No_padding */0,
+                                                    _1: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: "\" (Pbrt.Pp.pp_list ",
+                                                      _1: {
+                                                        TAG: /* String */2,
+                                                        _0: /* No_padding */0,
                                                         _1: {
-                                                          TAG: /* String */2,
-                                                          _0: /* No_padding */0,
+                                                          TAG: /* String_literal */11,
+                                                          _0: ") fmt (Pbrt.Repeated_field.to_list ",
                                                           _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "\" (Pbrt.Pp.pp_list ",
+                                                            TAG: /* String */2,
+                                                            _0: /* No_padding */0,
                                                             _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: ") fmt (Pbrt.Repeated_field.to_list ",
-                                                                _1: {
-                                                                  TAG: /* String */2,
-                                                                  _0: /* No_padding */0,
-                                                                  _1: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: ");",
-                                                                    _1: /* End_of_format */0
-                                                                  }
-                                                                }
-                                                              }
+                                                              TAG: /* String_literal */11,
+                                                              _0: ");",
+                                                              _1: /* End_of_format */0
                                                             }
                                                           }
                                                         }
-                                                      },
-                                                      _1: "Pbrt.Pp.pp_record_field \"%s\" (Pbrt.Pp.pp_list %s) fmt (Pbrt.Repeated_field.to_list %s);"
-                                                    }), rf_label, field_string_of$2, var_name));
+                                                      }
+                                                    }
+                                                  }
+                                                },
+                                                _1: "Pbrt.Pp.pp_record_field \"%s\" (Pbrt.Pp.pp_list %s) fmt (Pbrt.Repeated_field.to_list %s);"
+                                              }), rf_label, field_string_of$2, var_name));
                                 }
                             case /* Rft_associative_field */3 :
                                 const match$1 = rf_field_type._0;
@@ -3517,44 +3517,41 @@ function gen_pp_record(and_, param, sc) {
                                     });
                                 const pp_value = gen_pp_field(match$1[3][0]);
                                 return line$1(sc, Curry._5(Stdlib__Printf.sprintf({
-                                                    TAG: /* Format */0,
-                                                    _0: {
-                                                      TAG: /* String_literal */11,
-                                                      _0: "Pbrt.Pp.pp_record_field \"",
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: "Pbrt.Pp.pp_record_field \"",
+                                                _1: {
+                                                  TAG: /* String */2,
+                                                  _0: /* No_padding */0,
+                                                  _1: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: "\" (Pbrt.Pp.",
+                                                    _1: {
+                                                      TAG: /* String */2,
+                                                      _0: /* No_padding */0,
                                                       _1: {
-                                                        TAG: /* String */2,
-                                                        _0: /* No_padding */0,
+                                                        TAG: /* Char_literal */12,
+                                                        _0: /* ' ' */32,
                                                         _1: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "\" (Pbrt.Pp.",
+                                                          TAG: /* String */2,
+                                                          _0: /* No_padding */0,
                                                           _1: {
-                                                            TAG: /* String */2,
-                                                            _0: /* No_padding */0,
+                                                            TAG: /* Char_literal */12,
+                                                            _0: /* ' ' */32,
                                                             _1: {
-                                                              TAG: /* Char_literal */12,
-                                                              _0: /* ' ' */32,
+                                                              TAG: /* String */2,
+                                                              _0: /* No_padding */0,
                                                               _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
+                                                                TAG: /* String_literal */11,
+                                                                _0: ") fmt ",
                                                                 _1: {
-                                                                  TAG: /* Char_literal */12,
-                                                                  _0: /* ' ' */32,
+                                                                  TAG: /* String */2,
+                                                                  _0: /* No_padding */0,
                                                                   _1: {
-                                                                    TAG: /* String */2,
-                                                                    _0: /* No_padding */0,
-                                                                    _1: {
-                                                                      TAG: /* String_literal */11,
-                                                                      _0: ") fmt ",
-                                                                      _1: {
-                                                                        TAG: /* String */2,
-                                                                        _0: /* No_padding */0,
-                                                                        _1: {
-                                                                          TAG: /* Char_literal */12,
-                                                                          _0: /* ';' */59,
-                                                                          _1: /* End_of_format */0
-                                                                        }
-                                                                      }
-                                                                    }
+                                                                    TAG: /* Char_literal */12,
+                                                                    _0: /* ';' */59,
+                                                                    _1: /* End_of_format */0
                                                                   }
                                                                 }
                                                               }
@@ -3562,43 +3559,46 @@ function gen_pp_record(and_, param, sc) {
                                                           }
                                                         }
                                                       }
-                                                    },
-                                                    _1: "Pbrt.Pp.pp_record_field \"%s\" (Pbrt.Pp.%s %s %s) fmt %s;"
-                                                  }), rf_label, pp_runtime_function, pp_key, pp_value, var_name));
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              _1: "Pbrt.Pp.pp_record_field \"%s\" (Pbrt.Pp.%s %s %s) fmt %s;"
+                                            }), rf_label, pp_runtime_function, pp_key, pp_value, var_name));
                             case /* Rft_variant_field */4 :
                                 return line$1(sc, Curry._3(Stdlib__Printf.sprintf({
-                                                    TAG: /* Format */0,
-                                                    _0: {
-                                                      TAG: /* String_literal */11,
-                                                      _0: "Pbrt.Pp.pp_record_field \"",
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: "Pbrt.Pp.pp_record_field \"",
+                                                _1: {
+                                                  TAG: /* String */2,
+                                                  _0: /* No_padding */0,
+                                                  _1: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: "\" ",
+                                                    _1: {
+                                                      TAG: /* String */2,
+                                                      _0: /* No_padding */0,
                                                       _1: {
-                                                        TAG: /* String */2,
-                                                        _0: /* No_padding */0,
+                                                        TAG: /* String_literal */11,
+                                                        _0: " fmt ",
                                                         _1: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "\" ",
+                                                          TAG: /* String */2,
+                                                          _0: /* No_padding */0,
                                                           _1: {
-                                                            TAG: /* String */2,
-                                                            _0: /* No_padding */0,
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: " fmt ",
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* Char_literal */12,
-                                                                  _0: /* ';' */59,
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            }
+                                                            TAG: /* Char_literal */12,
+                                                            _0: /* ';' */59,
+                                                            _1: /* End_of_format */0
                                                           }
                                                         }
                                                       }
-                                                    },
-                                                    _1: "Pbrt.Pp.pp_record_field \"%s\" %s fmt %s;"
-                                                  }), rf_label, "pp_" + rf_field_type._0.v_name, var_name));
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              _1: "Pbrt.Pp.pp_record_field \"%s\" %s fmt %s;"
+                                            }), rf_label, "pp_" + rf_field_type._0.v_name, var_name));
                             
                           }
                         }), r_fields);
@@ -3648,30 +3648,30 @@ function gen_pp_variant(and_, param, sc) {
                   const vc_constructor = param.vc_constructor;
                   if (/* tag */typeof vc_field_type === "number" || typeof vc_field_type === "string") {
                     return line$1(sc, Curry._2(Stdlib__Printf.sprintf({
-                                        TAG: /* Format */0,
-                                        _0: {
-                                          TAG: /* String_literal */11,
-                                          _0: "| ",
+                                  TAG: /* Format */0,
+                                  _0: {
+                                    TAG: /* String_literal */11,
+                                    _0: "| ",
+                                    _1: {
+                                      TAG: /* String */2,
+                                      _0: /* No_padding */0,
+                                      _1: {
+                                        TAG: /* String_literal */11,
+                                        _0: "  -> Format.fprintf fmt \"",
+                                        _1: {
+                                          TAG: /* String */2,
+                                          _0: /* No_padding */0,
                                           _1: {
-                                            TAG: /* String */2,
-                                            _0: /* No_padding */0,
-                                            _1: {
-                                              TAG: /* String_literal */11,
-                                              _0: "  -> Format.fprintf fmt \"",
-                                              _1: {
-                                                TAG: /* String */2,
-                                                _0: /* No_padding */0,
-                                                _1: {
-                                                  TAG: /* Char_literal */12,
-                                                  _0: /* '"' */34,
-                                                  _1: /* End_of_format */0
-                                                }
-                                              }
-                                            }
+                                            TAG: /* Char_literal */12,
+                                            _0: /* '"' */34,
+                                            _1: /* End_of_format */0
                                           }
-                                        },
-                                        _1: "| %s  -> Format.fprintf fmt \"%s\""
-                                      }), vc_constructor, vc_constructor));
+                                        }
+                                      }
+                                    }
+                                  },
+                                  _1: "| %s  -> Format.fprintf fmt \"%s\""
+                                }), vc_constructor, vc_constructor));
                   }
                   const field_string_of = gen_pp_field(vc_field_type._0);
                   line$1(sc, Curry._3(Stdlib__Printf.sprintf({
@@ -3905,13 +3905,13 @@ function create(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -3922,9 +3922,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -3937,25 +3937,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -3968,21 +3968,21 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -3994,13 +3994,13 @@ function add(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -4024,8 +4024,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg.compare, x, param.v);
     if (c === 0) {
@@ -4044,13 +4044,13 @@ function map$1(f, param) {
   const d$p = Curry._1(f, param.d);
   const r$p = map$1(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: param.v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: param.v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function fold(f, _m, _accu) {
@@ -4076,14 +4076,14 @@ function min_value(param) {
       return Caml_option.some(Caml_obj.caml_min(Caml_option.valFromOption(x), Caml_option.valFromOption(y)));
     }
     throw new Caml_js_exceptions.MelangeError("Failure", {
-              MEL_EXN_ID: "Failure",
-              _1: "min_value error"
-            });
+          MEL_EXN_ID: "Failure",
+          _1: "min_value error"
+        });
   }
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: "min_value error"
-          });
+        MEL_EXN_ID: "Failure",
+        _1: "min_value error"
+      });
 }
 
 function eq_value(param) {
@@ -4094,35 +4094,35 @@ function eq_value(param) {
       return Caml_obj.caml_equal(Caml_option.valFromOption(x), Caml_option.valFromOption(y));
     }
     throw new Caml_js_exceptions.MelangeError("Failure", {
-              MEL_EXN_ID: "Failure",
-              _1: "eq_value error"
-            });
+          MEL_EXN_ID: "Failure",
+          _1: "eq_value error"
+        });
   }
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: "eq_value error"
-          });
+        MEL_EXN_ID: "Failure",
+        _1: "eq_value error"
+      });
 }
 
 function string_of_option(f, x) {
   if (x !== undefined) {
     return Curry._1(Stdlib__Printf.sprintf({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "Some(",
-                      _1: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
-                          TAG: /* Char_literal */12,
-                          _0: /* ')' */41,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "Some(%s)"
-                  }), Curry._1(f, Caml_option.valFromOption(x)));
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "Some(",
+                _1: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* Char_literal */12,
+                    _0: /* ')' */41,
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "Some(%s)"
+            }), Curry._1(f, Caml_option.valFromOption(x)));
   } else {
     return "None";
   }
@@ -4130,13 +4130,13 @@ function string_of_option(f, x) {
 
 function reset(g) {
   return Curry._2(map$1, (function (core) {
-                return {
-                        core: core,
-                        index: undefined,
-                        lowlink: undefined,
-                        on_stack: false
-                      };
-              }), g);
+          return {
+            core: core,
+            index: undefined,
+            lowlink: undefined,
+            on_stack: false
+          };
+        }), g);
 }
 
 function strong_connect(g, sccs, stack, index, v) {
@@ -4219,10 +4219,10 @@ function strong_connect(g, sccs, stack, index, v) {
                   ]);
             }
             return [
-                    sccs,
-                    stack,
-                    index
-                  ];
+              sccs,
+              stack,
+              index
+            ];
           }
           const match$1 = strong_connect(g, sccs, stack, index + 1 | 0, w);
           v.lowlink = min_value([
@@ -4230,10 +4230,10 @@ function strong_connect(g, sccs, stack, index, v) {
                 w.lowlink
               ]);
           return [
-                  match$1[0],
-                  match$1[1],
-                  match$1[2]
-                ];
+            match$1[0],
+            match$1[1],
+            match$1[2]
+          ];
         }), [
         sccs,
         stack$1,
@@ -4305,10 +4305,10 @@ function strong_connect(g, sccs, stack, index, v) {
           v.index
         ])) {
     return [
-            sccs$1,
-            stack$2,
-            index$1
-          ];
+      sccs$1,
+      stack$2,
+      index$1
+    ];
   }
   const match$1 = Stdlib__List.fold_left((function (param, n) {
           const splitted = param[2];
@@ -4316,33 +4316,33 @@ function strong_connect(g, sccs, stack, index, v) {
           const scc = param[0];
           if (splitted) {
             return [
-                    scc,
-                    {
-                      hd: n,
-                      tl: stack
-                    },
-                    splitted
-                  ];
+              scc,
+              {
+                hd: n,
+                tl: stack
+              },
+              splitted
+            ];
           } else {
             n.on_stack = false;
             if (n.core.id === v.core.id) {
               return [
-                      {
-                        hd: n.core.id,
-                        tl: scc
-                      },
-                      stack,
-                      true
-                    ];
+                {
+                  hd: n.core.id,
+                  tl: scc
+                },
+                stack,
+                true
+              ];
             } else {
               return [
-                      {
-                        hd: n.core.id,
-                        tl: scc
-                      },
-                      stack,
-                      false
-                    ];
+                {
+                  hd: n.core.id,
+                  tl: scc
+                },
+                stack,
+                false
+              ];
             }
           }
         }), [
@@ -4351,36 +4351,36 @@ function strong_connect(g, sccs, stack, index, v) {
         false
       ], stack$2);
   return [
-          {
-            hd: match$1[0],
-            tl: sccs$1
-          },
-          Stdlib__List.rev(match$1[1]),
-          index$1
-        ];
+    {
+      hd: match$1[0],
+      tl: sccs$1
+    },
+    Stdlib__List.rev(match$1[1]),
+    index$1
+  ];
 }
 
 function tarjan(g) {
   const g$1 = reset(g);
   return Curry._3(fold, (function (param, n, param$1) {
-                  const index = param$1[2];
-                  const stack = param$1[1];
-                  const sccs = param$1[0];
-                  const match = n.index;
-                  if (match !== undefined) {
-                    return [
-                            sccs,
-                            stack,
-                            index
-                          ];
-                  } else {
-                    return strong_connect(g$1, sccs, stack, index, n);
-                  }
-                }), g$1, [
-                /* [] */0,
-                /* [] */0,
-                0
-              ])[0];
+            const index = param$1[2];
+            const stack = param$1[1];
+            const sccs = param$1[0];
+            const match = n.index;
+            if (match !== undefined) {
+              return [
+                sccs,
+                stack,
+                index
+              ];
+            } else {
+              return strong_connect(g$1, sccs, stack, index, n);
+            }
+          }), g$1, [
+          /* [] */0,
+          /* [] */0,
+          0
+        ])[0];
 }
 
 function field_name(param) {
@@ -4432,57 +4432,57 @@ function type_id_of_type(param) {
 
 function type_of_id(all_types, id) {
   return Stdlib__List.find((function (t) {
-                return type_id_of_type(t) === id;
-              }), all_types);
+          return type_id_of_type(t) === id;
+        }), all_types);
 }
 
 function string_of_unresolved(param) {
   return Curry._3(Stdlib__Printf.sprintf({
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* String_literal */11,
-                    _0: "unresolved:{scope ",
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* String_literal */11,
+              _0: "unresolved:{scope ",
+              _1: {
+                TAG: /* String */2,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* String_literal */11,
+                  _0: ", type_name: ",
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
                     _1: {
-                      TAG: /* String */2,
-                      _0: /* No_padding */0,
+                      TAG: /* String_literal */11,
+                      _0: ", from_root: ",
                       _1: {
-                        TAG: /* String_literal */11,
-                        _0: ", type_name: ",
+                        TAG: /* Bool */9,
+                        _0: /* No_padding */0,
                         _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: ", from_root: ",
-                            _1: {
-                              TAG: /* Bool */9,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* '}' */125,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
+                          TAG: /* Char_literal */12,
+                          _0: /* '}' */125,
+                          _1: /* End_of_format */0
                         }
                       }
                     }
-                  },
-                  _1: "unresolved:{scope %s, type_name: %s, from_root: %b}"
-                }), string_of_string_list(param.scope), param.type_name, param.from_root);
+                  }
+                }
+              }
+            },
+            _1: "unresolved:{scope %s, type_name: %s, from_root: %b}"
+          }), string_of_string_list(param.scope), param.type_name, param.from_root);
 }
 
 function scope_of_package(s) {
   if (s !== undefined) {
     return {
-            packages: Stdlib__List.rev(rev_split_by_char(/* '.' */46, s)),
-            message_names: /* [] */0
-          };
+      packages: Stdlib__List.rev(rev_split_by_char(/* '.' */46, s)),
+      message_names: /* [] */0
+    };
   } else {
     return {
-            packages: /* [] */0,
-            message_names: /* [] */0
-          };
+      packages: /* [] */0,
+      message_names: /* [] */0
+    };
   }
 }
 
@@ -4490,18 +4490,18 @@ function unresolved_of_string(s) {
   const match = rev_split_by_char(/* '.' */46, s);
   if (match) {
     return {
-            scope: Stdlib__List.rev(match.tl),
-            type_name: match.hd,
-            from_root: Caml_string.get(s, 0) === /* '.' */46
-          };
+      scope: Stdlib__List.rev(match.tl),
+      type_name: match.hd,
+      from_root: Caml_string.get(s, 0) === /* '.' */46
+    };
   }
   throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-            MEL_EXN_ID: Compilation_error,
-            _1: {
-              TAG: /* Programatic_error */4,
-              _0: /* Invalid_string_split */0
-            }
-          });
+        MEL_EXN_ID: Compilation_error,
+        _1: {
+          TAG: /* Programatic_error */4,
+          _0: /* Invalid_string_split */0
+        }
+      });
 }
 
 function field_type_of_string(s) {
@@ -4538,9 +4538,9 @@ function field_type_of_string(s) {
         return /* Field_type_uint64 */5;
     default:
       return {
-              TAG: /* Field_type_type */0,
-              _0: unresolved_of_string(s)
-            };
+        TAG: /* Field_type_type */0,
+        _0: unresolved_of_string(s)
+      };
   }
 }
 
@@ -4611,9 +4611,9 @@ function compile_default_p2(all_types, field) {
         switch (field_default$1.TAG) {
           case /* Constant_int */2 :
               return {
-                      TAG: /* Constant_float */3,
-                      _0: field_default$1._0
-                    };
+                TAG: /* Constant_float */3,
+                _0: field_default$1._0
+              };
           case /* Constant_float */3 :
               return field_default$1;
           default:
@@ -4653,28 +4653,28 @@ function compile_field_p1(field_parsed) {
   const field_type = field_type_of_string(field_parsed.field_type);
   const field_default = get_default(field_parsed.field_name, field_options, field_type);
   return {
-          field_parsed: field_parsed,
-          field_type: field_type,
-          field_default: field_default,
-          field_options: field_options
-        };
+    field_parsed: field_parsed,
+    field_type: field_type,
+    field_default: field_default,
+    field_options: field_options
+  };
 }
 
 function compile_map_p1(param) {
   return {
-          map_name: param.map_name,
-          map_number: param.map_number,
-          map_key_type: field_type_of_string(param.map_key_type),
-          map_value_type: field_type_of_string(param.map_value_type),
-          map_options: param.map_options
-        };
+    map_name: param.map_name,
+    map_number: param.map_number,
+    map_key_type: field_type_of_string(param.map_key_type),
+    map_value_type: field_type_of_string(param.map_value_type),
+    map_options: param.map_options
+  };
 }
 
 function compile_oneof_p1(param) {
   return {
-          oneof_name: param.oneof_name,
-          oneof_fields: Stdlib__List.map(compile_field_p1, param.oneof_fields)
-        };
+    oneof_name: param.oneof_name,
+    oneof_fields: Stdlib__List.map(compile_field_p1, param.oneof_fields)
+  };
 }
 
 function not_found(f) {
@@ -4703,35 +4703,35 @@ function list_assoc2(x, _param) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   };
 }
 
 function type_of_spec(file_name, file_options, id, scope, spec) {
   return {
-          scope: scope,
-          id: id,
-          file_name: file_name,
-          file_options: file_options,
-          spec: spec
-        };
+    scope: scope,
+    id: id,
+    file_name: file_name,
+    file_options: file_options,
+    spec: spec
+  };
 }
 
 function compile_enum_p1(file_name, file_options, scope, param) {
   const enum_values = Stdlib__List.map((function (enum_value) {
           return {
-                  enum_value_name: enum_value.enum_value_name,
-                  enum_value_int: enum_value.enum_value_int
-                };
+            enum_value_name: enum_value.enum_value_name,
+            enum_value_int: enum_value.enum_value_int
+          };
         }), param.enum_values);
   return type_of_spec(file_name, file_options, param.enum_id, scope, {
-              TAG: /* Enum */0,
-              _0: {
-                enum_name: param.enum_name,
-                enum_values: enum_values
-              }
-            });
+        TAG: /* Enum */0,
+        _0: {
+          enum_name: param.enum_name,
+          enum_values: enum_values
+        }
+      });
 }
 
 function compile_message_p1(file_name, file_options, message_scope, param) {
@@ -4756,61 +4756,61 @@ function compile_message_p1(file_name, file_options, message_scope, param) {
                   _0: compile_field_p1(f._0)
                 };
                 return [
-                        {
-                          hd: field,
-                          tl: message_body
-                        },
-                        extensions,
-                        all_types
-                      ];
+                  {
+                    hd: field,
+                    tl: message_body
+                  },
+                  extensions,
+                  all_types
+                ];
             case /* Message_map_field */1 :
                 const field$1 = {
                   TAG: /* Message_map_field */2,
                   _0: compile_map_p1(f._0)
                 };
                 return [
-                        {
-                          hd: field$1,
-                          tl: message_body
-                        },
-                        extensions,
-                        all_types
-                      ];
+                  {
+                    hd: field$1,
+                    tl: message_body
+                  },
+                  extensions,
+                  all_types
+                ];
             case /* Message_oneof_field */2 :
                 const field$2 = {
                   TAG: /* Message_oneof_field */1,
                   _0: compile_oneof_p1(f._0)
                 };
                 return [
-                        {
-                          hd: field$2,
-                          tl: message_body
-                        },
-                        extensions,
-                        all_types
-                      ];
+                  {
+                    hd: field$2,
+                    tl: message_body
+                  },
+                  extensions,
+                  all_types
+                ];
             case /* Message_sub */3 :
                 const all_sub_types = compile_message_p1(file_name, file_options, sub_scope, f._0);
                 return [
-                        message_body,
-                        extensions,
-                        Stdlib.$at(all_types, all_sub_types)
-                      ];
+                  message_body,
+                  extensions,
+                  Stdlib.$at(all_types, all_sub_types)
+                ];
             case /* Message_enum */4 :
                 return [
-                        message_body,
-                        extensions,
-                        Stdlib.$at(all_types, {
-                              hd: compile_enum_p1(file_name, file_options, sub_scope, f._0),
-                              tl: /* [] */0
-                            })
-                      ];
+                  message_body,
+                  extensions,
+                  Stdlib.$at(all_types, {
+                        hd: compile_enum_p1(file_name, file_options, sub_scope, f._0),
+                        tl: /* [] */0
+                      })
+                ];
             case /* Message_extension */5 :
                 return [
-                        message_body,
-                        Stdlib.$at(extensions, f._0),
-                        all_types
-                      ];
+                  message_body,
+                  Stdlib.$at(extensions, f._0),
+                  all_types
+                ];
             
           }
         }), [
@@ -4828,25 +4828,25 @@ function compile_message_p1(file_name, file_options, message_scope, param) {
             list_assoc2(name, number_index);
           })) {
       return {
-              hd: [
-                number,
-                name
-              ],
-              tl: number_index
-            };
+        hd: [
+          number,
+          name
+        ],
+        tl: number_index
+      };
     } else {
       let previous_field_name = "";
       throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-                MEL_EXN_ID: Compilation_error,
-                _1: {
-                  TAG: /* Duplicated_field_number */1,
-                  _0: {
-                    field_name: name,
-                    previous_field_name: previous_field_name,
-                    message_name: message_name
-                  }
-                }
-              });
+            MEL_EXN_ID: Compilation_error,
+            _1: {
+              TAG: /* Duplicated_field_number */1,
+              _0: {
+                field_name: name,
+                previous_field_name: previous_field_name,
+                message_name: message_name
+              }
+            }
+          });
     }
   };
   Stdlib__List.fold_left((function (number_index, f) {
@@ -4861,16 +4861,16 @@ function compile_message_p1(file_name, file_options, message_scope, param) {
           }
         }), /* [] */0, message_body);
   return Stdlib.$at(match[2], {
-              hd: type_of_spec(file_name, file_options, param.id, message_scope, {
-                    TAG: /* Message */1,
-                    _0: {
-                      extensions: match[1],
-                      message_name: message_name,
-                      message_body: message_body
-                    }
-                  }),
-              tl: /* [] */0
-            });
+        hd: type_of_spec(file_name, file_options, param.id, message_scope, {
+              TAG: /* Message */1,
+              _0: {
+                extensions: match[1],
+                message_name: message_name,
+                message_body: message_body
+              }
+            }),
+        tl: /* [] */0
+      });
 }
 
 function compile_proto_p1(file_name, param) {
@@ -4878,13 +4878,13 @@ function compile_proto_p1(file_name, param) {
   const scope = scope_of_package(param.package);
   const pbtt_msgs = Stdlib__List.fold_right((function (e, pbtt_msgs) {
           return {
-                  hd: compile_enum_p1(file_name, file_options, scope, e),
-                  tl: pbtt_msgs
-                };
+            hd: compile_enum_p1(file_name, file_options, scope, e),
+            tl: pbtt_msgs
+          };
         }), param.enums, /* [] */0);
   return Stdlib__List.fold_left((function (pbtt_msgs, pbpt_msg) {
-                return Stdlib.$at(pbtt_msgs, compile_message_p1(file_name, file_options, scope, pbpt_msg));
-              }), pbtt_msgs, param.messages);
+          return Stdlib.$at(pbtt_msgs, compile_message_p1(file_name, file_options, scope, pbpt_msg));
+        }), pbtt_msgs, param.messages);
 }
 
 function type_scope_of_type(param) {
@@ -4911,10 +4911,10 @@ function type_name_of_type(param) {
 
 function find_all_types_in_field_scope(all_types, scope) {
   return Stdlib__List.filter((function (t) {
-                const match = type_scope_of_type(t);
-                const dec_scope = Stdlib.$at(match.packages, match.message_names);
-                return Caml_obj.caml_equal(dec_scope, scope);
-              }), all_types);
+          const match = type_scope_of_type(t);
+          const dec_scope = Stdlib.$at(match.packages, match.message_names);
+          return Caml_obj.caml_equal(dec_scope, scope);
+        }), all_types);
 }
 
 function compile_message_p2(types, param, message) {
@@ -4926,9 +4926,9 @@ function compile_message_p2(types, param, message) {
   const search_scopes = function (field_scope, from_root) {
     if (from_root) {
       return {
-              hd: field_scope,
-              tl: /* [] */0
-            };
+        hd: field_scope,
+        tl: /* [] */0
+      };
     }
     const loop = function (_scopes, _l) {
       while(true) {
@@ -4936,9 +4936,9 @@ function compile_message_p2(types, param, message) {
         const scopes = _scopes;
         if (!l) {
           return {
-                  hd: field_scope,
-                  tl: scopes
-                };
+            hd: field_scope,
+            tl: scopes
+          };
         }
         _l = pop_last(l);
         _scopes = {
@@ -5005,12 +5005,12 @@ function compile_message_p2(types, param, message) {
         }
       } else {
         throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-                  MEL_EXN_ID: Compilation_error,
-                  _1: {
-                    TAG: /* Programatic_error */4,
-                    _0: /* Unexpected_field_type */1
-                  }
-                });
+              MEL_EXN_ID: Compilation_error,
+              _1: {
+                TAG: /* Programatic_error */4,
+                _0: /* Unexpected_field_type */1
+              }
+            });
       }
     }
     const unresolved = field_type._0;
@@ -5085,21 +5085,21 @@ function compile_message_p2(types, param, message) {
           }), search_scopes$1);
     if (id !== undefined) {
       return {
-              TAG: /* Field_type_type */0,
-              _0: id
-            };
+        TAG: /* Field_type_type */0,
+        _0: id
+      };
     } else {
       throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-                MEL_EXN_ID: Compilation_error,
-                _1: {
-                  TAG: /* Unresolved_type */0,
-                  _0: {
-                    field_name: field_name,
-                    type_: type_name,
-                    message_name: message_name
-                  }
-                }
-              });
+            MEL_EXN_ID: Compilation_error,
+            _1: {
+              TAG: /* Unresolved_type */0,
+              _0: {
+                field_name: field_name,
+                type_: type_name,
+                message_name: message_name
+              }
+            }
+          });
     }
   };
   const message_body = Stdlib__List.fold_left((function (message_body, field) {
@@ -5129,12 +5129,12 @@ function compile_message_p2(types, param, message) {
                   field_options: field_field_options$1
                 };
                 return {
-                        hd: {
-                          TAG: /* Message_field */0,
-                          _0: field$3
-                        },
-                        tl: message_body
-                      };
+                  hd: {
+                    TAG: /* Message_field */0,
+                    _0: field$3
+                  },
+                  tl: message_body
+                };
             case /* Message_oneof_field */1 :
                 const oneof = field._0;
                 const oneof_fields = Stdlib__List.fold_left((function (oneof_fields, field) {
@@ -5142,26 +5142,26 @@ function compile_message_p2(types, param, message) {
                         const field_type$2 = field_type(field);
                         const field_type$3 = compile_field_p2(field_name$2, field_type$2);
                         return {
-                                hd: {
-                                  field_parsed: field.field_parsed,
-                                  field_type: field_type$3,
-                                  field_default: field.field_default,
-                                  field_options: field.field_options
-                                },
-                                tl: oneof_fields
-                              };
+                          hd: {
+                            field_parsed: field.field_parsed,
+                            field_type: field_type$3,
+                            field_default: field.field_default,
+                            field_options: field.field_options
+                          },
+                          tl: oneof_fields
+                        };
                       }), /* [] */0, oneof.oneof_fields);
                 const oneof_fields$1 = Stdlib__List.rev(oneof_fields);
                 return {
-                        hd: {
-                          TAG: /* Message_oneof_field */1,
-                          _0: {
-                            oneof_name: oneof.oneof_name,
-                            oneof_fields: oneof_fields$1
-                          }
-                        },
-                        tl: message_body
-                      };
+                  hd: {
+                    TAG: /* Message_oneof_field */1,
+                    _0: {
+                      oneof_name: oneof.oneof_name,
+                      oneof_fields: oneof_fields$1
+                    }
+                  },
+                  tl: message_body
+                };
             case /* Message_map_field */2 :
                 const map = field._0;
                 const map_name = map.map_name;
@@ -5178,18 +5178,18 @@ function compile_message_p2(types, param, message) {
                   }
                 };
                 return {
-                        hd: resolved_map,
-                        tl: message_body
-                      };
+                  hd: resolved_map,
+                  tl: message_body
+                };
             
           }
         }), /* [] */0, message.message_body);
   const message_body$1 = Stdlib__List.rev(message_body);
   return {
-          extensions: message.extensions,
-          message_name: message.message_name,
-          message_body: message_body$1
-        };
+    extensions: message.extensions,
+    message_name: message.message_name,
+    message_body: message_body$1
+  };
 }
 
 function node_of_proto_type(param) {
@@ -5197,9 +5197,9 @@ function node_of_proto_type(param) {
   const id = param.id;
   if (match.TAG === /* Enum */0) {
     return {
-            id: id,
-            sub: /* [] */0
-          };
+      id: id,
+      sub: /* [] */0
+    };
   }
   const sub = Stdlib__List.flatten(Stdlib__List.map((function (param) {
               switch (param.TAG) {
@@ -5209,39 +5209,39 @@ function node_of_proto_type(param) {
                       return /* [] */0;
                     } else {
                       return {
-                              hd: field_type._0,
-                              tl: /* [] */0
-                            };
+                        hd: field_type._0,
+                        tl: /* [] */0
+                      };
                     }
                 case /* Message_oneof_field */1 :
                     return Stdlib__List.flatten(Stdlib__List.map((function (param) {
-                                      const field_type = param.field_type;
-                                      if (/* tag */typeof field_type === "number" || typeof field_type === "string") {
-                                        return /* [] */0;
-                                      } else {
-                                        return {
-                                                hd: field_type._0,
-                                                tl: /* [] */0
-                                              };
-                                      }
-                                    }), param._0.oneof_fields));
+                                const field_type = param.field_type;
+                                if (/* tag */typeof field_type === "number" || typeof field_type === "string") {
+                                  return /* [] */0;
+                                } else {
+                                  return {
+                                    hd: field_type._0,
+                                    tl: /* [] */0
+                                  };
+                                }
+                              }), param._0.oneof_fields));
                 case /* Message_map_field */2 :
                     const map_value_type = param._0.map_value_type;
                     if (/* tag */typeof map_value_type === "number" || typeof map_value_type === "string") {
                       return /* [] */0;
                     } else {
                       return {
-                              hd: map_value_type._0,
-                              tl: /* [] */0
-                            };
+                        hd: map_value_type._0,
+                        tl: /* [] */0
+                      };
                     }
                 
               }
             }), match._0.message_body));
   return {
-          id: id,
-          sub: sub
-        };
+    id: id,
+    sub: sub
+  };
 }
 
 function group(proto) {
@@ -5251,12 +5251,12 @@ function group(proto) {
         }), empty_graph, g);
   const sccs = tarjan(g$1);
   return Stdlib__List.map((function (l) {
-                return Stdlib__List.map((function (id) {
-                              return Stdlib__List.find((function (param) {
-                                            return id === param.id;
-                                          }), proto);
-                            }), l);
-              }), sccs);
+          return Stdlib__List.map((function (id) {
+                  return Stdlib__List.find((function (param) {
+                          return id === param.id;
+                        }), proto);
+                }), l);
+        }), sccs);
 }
 
 function type_decl_of_and(param) {
@@ -5382,18 +5382,18 @@ function gen_type_variant(and_, variant, sc) {
                   const vc_constructor = param.vc_constructor;
                   if (/* tag */typeof vc_field_type === "number" || typeof vc_field_type === "string") {
                     return line$1(sc, Curry._1(Stdlib__Printf.sprintf({
-                                        TAG: /* Format */0,
-                                        _0: {
-                                          TAG: /* String_literal */11,
-                                          _0: "| ",
-                                          _1: {
-                                            TAG: /* String */2,
-                                            _0: /* No_padding */0,
-                                            _1: /* End_of_format */0
-                                          }
-                                        },
-                                        _1: "| %s"
-                                      }), vc_constructor));
+                                  TAG: /* Format */0,
+                                  _0: {
+                                    TAG: /* String_literal */11,
+                                    _0: "| ",
+                                    _1: {
+                                      TAG: /* String */2,
+                                      _0: /* No_padding */0,
+                                      _1: /* End_of_format */0
+                                    }
+                                  },
+                                  _1: "| %s"
+                                }), vc_constructor));
                   }
                   const type_string = string_of_field_type(vc_field_type._0);
                   line$1(sc, Curry._2(Stdlib__Printf.sprintf({
@@ -5544,10 +5544,10 @@ function gen_encode_field_key(sc, number, pk, is_packed) {
 
 function encode_basic_type(bt, pk) {
   return runtime_function([
-              "Encode",
-              pk,
-              bt
-            ]);
+        "Encode",
+        pk,
+        bt
+      ]);
 }
 
 function gen_encode_field_type(with_key, sc, var_name, encoding_number, pk, is_packed, field_type) {
@@ -5565,78 +5565,78 @@ function gen_encode_field_type(with_key, sc, var_name, encoding_number, pk, is_p
     encode_key(sc);
     const rt = encode_basic_type(field_type._0, pk);
     return line$1(sc, Curry._2(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ' ' */32,
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: " encoder;",
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
-                        },
-                        _1: "%s %s encoder;"
-                      }), rt, var_name));
-  }
-  const ud = field_type._0;
-  encode_key(sc);
-  const f_name = function_name_of_user_defined("encode", ud);
-  if (ud.udt_nested) {
-    return line$1(sc, Curry._2(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Pbrt.Encoder.nested (",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* Char_literal */12,
-                              _0: /* ' ' */32,
-                              _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: ") encoder;",
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          }
-                        },
-                        _1: "Pbrt.Encoder.nested (%s %s) encoder;"
-                      }), f_name, var_name));
-  } else {
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " encoder;",
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    }
+                  },
+                  _1: "%s %s encoder;"
+                }), rt, var_name));
+  }
+  const ud = field_type._0;
+  encode_key(sc);
+  const f_name = function_name_of_user_defined("encode", ud);
+  if (ud.udt_nested) {
     return line$1(sc, Curry._2(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Pbrt.Encoder.nested (",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* Char_literal */12,
+                        _0: /* ' ' */32,
+                        _1: {
                           TAG: /* String */2,
                           _0: /* No_padding */0,
                           _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ' ' */32,
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: " encoder;",
-                                _1: /* End_of_format */0
-                              }
-                            }
+                            TAG: /* String_literal */11,
+                            _0: ") encoder;",
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "%s %s encoder;"
-                      }), f_name, var_name));
+                        }
+                      }
+                    }
+                  },
+                  _1: "Pbrt.Encoder.nested (%s %s) encoder;"
+                }), f_name, var_name));
+  } else {
+    return line$1(sc, Curry._2(Stdlib__Printf.sprintf({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " encoder;",
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    }
+                  },
+                  _1: "%s %s encoder;"
+                }), f_name, var_name));
   }
 }
 
@@ -5790,22 +5790,22 @@ function gen_encode_record(and_, param, sc) {
                                     gen_encode_field_type(Caml_option.some(undefined), sc, "x", encoding_number$1, pk$1, is_packed, field_type$1);
                                   }));
                             return line$1(sc, Curry._1(Stdlib__Printf.sprintf({
-                                                TAG: /* Format */0,
-                                                _0: {
-                                                  TAG: /* String_literal */11,
-                                                  _0: ") v.",
-                                                  _1: {
-                                                    TAG: /* String */2,
-                                                    _0: /* No_padding */0,
-                                                    _1: {
-                                                      TAG: /* Char_literal */12,
-                                                      _0: /* ';' */59,
-                                                      _1: /* End_of_format */0
-                                                    }
-                                                  }
-                                                },
-                                                _1: ") v.%s;"
-                                              }), rf_label));
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: ") v.",
+                                            _1: {
+                                              TAG: /* String */2,
+                                              _0: /* No_padding */0,
+                                              _1: {
+                                                TAG: /* Char_literal */12,
+                                                _0: /* ';' */59,
+                                                _1: /* End_of_format */0
+                                              }
+                                            }
+                                          },
+                                          _1: ") v.%s;"
+                                        }), rf_label));
                           }
                         } else if (is_packed) {
                           gen_encode_field_key(sc, encoding_number$1, pk$1, is_packed);
@@ -5840,22 +5840,22 @@ function gen_encode_record(and_, param, sc) {
                                   gen_encode_field_type(Caml_option.some(undefined), sc, "x", encoding_number$1, pk$1, is_packed, field_type$1);
                                 }));
                           return line$1(sc, Curry._1(Stdlib__Printf.sprintf({
-                                              TAG: /* Format */0,
-                                              _0: {
-                                                TAG: /* String_literal */11,
-                                                _0: ") v.",
-                                                _1: {
-                                                  TAG: /* String */2,
-                                                  _0: /* No_padding */0,
-                                                  _1: {
-                                                    TAG: /* Char_literal */12,
-                                                    _0: /* ';' */59,
-                                                    _1: /* End_of_format */0
-                                                  }
-                                                }
-                                              },
-                                              _1: ") v.%s;"
-                                            }), rf_label));
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: ") v.",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* Char_literal */12,
+                                              _0: /* ';' */59,
+                                              _1: /* End_of_format */0
+                                            }
+                                          }
+                                        },
+                                        _1: ") v.%s;"
+                                      }), rf_label));
                         }
                     case /* Rft_associative_field */3 :
                         const match$3 = rf_field_type._0;
@@ -5922,22 +5922,22 @@ function gen_encode_record(and_, param, sc) {
                                 line$1(sc, "Pbrt.Encoder.map_entry ~encode_key ~encode_value map_entry encoder");
                               }));
                         return line$1(sc, Curry._1(Stdlib__Printf.sprintf({
-                                            TAG: /* Format */0,
-                                            _0: {
-                                              TAG: /* String_literal */11,
-                                              _0: ") v.",
-                                              _1: {
-                                                TAG: /* String */2,
-                                                _0: /* No_padding */0,
-                                                _1: {
-                                                  TAG: /* Char_literal */12,
-                                                  _0: /* ';' */59,
-                                                  _1: /* End_of_format */0
-                                                }
-                                              }
-                                            },
-                                            _1: ") v.%s;"
-                                          }), rf_label));
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* String_literal */11,
+                                        _0: ") v.",
+                                        _1: {
+                                          TAG: /* String */2,
+                                          _0: /* No_padding */0,
+                                          _1: {
+                                            TAG: /* Char_literal */12,
+                                            _0: /* ';' */59,
+                                            _1: /* End_of_format */0
+                                          }
+                                        }
+                                      },
+                                      _1: ") v.%s;"
+                                    }), rf_label));
                     case /* Rft_variant_field */4 :
                         const v_constructors = rf_field_type._0.v_constructors;
                         line$1(sc, "(");
@@ -6317,22 +6317,22 @@ function default_value_of_field_type(field_name, field_type, field_default) {
           if (field_default !== undefined) {
             if (field_default.TAG === /* Constant_string */0) {
               return Curry._1(Stdlib__Printf.sprintf({
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* Char_literal */12,
-                                _0: /* '"' */34,
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* Char_literal */12,
-                                    _0: /* '"' */34,
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              },
-                              _1: "\"%s\""
-                            }), field_default._0);
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* Char_literal */12,
+                          _0: /* '"' */34,
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
+                            _1: {
+                              TAG: /* Char_literal */12,
+                              _0: /* '"' */34,
+                              _1: /* End_of_format */0
+                            }
+                          }
+                        },
+                        _1: "\"%s\""
+                      }), field_default._0);
             } else {
               return invalid_default_value(field_name, "invalid default type", undefined);
             }
@@ -6363,20 +6363,20 @@ function default_value_of_field_type(field_name, field_type, field_default) {
           if (field_default !== undefined) {
             if (field_default.TAG === /* Constant_int */2) {
               return Curry._1(Stdlib__Printf.sprintf({
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* Int */4,
-                                _0: /* Int_i */3,
-                                _1: /* No_padding */0,
-                                _2: /* No_precision */0,
-                                _3: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* 'l' */108,
-                                  _1: /* End_of_format */0
-                                }
-                              },
-                              _1: "%il"
-                            }), field_default._0);
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* Int */4,
+                          _0: /* Int_i */3,
+                          _1: /* No_padding */0,
+                          _2: /* No_precision */0,
+                          _3: {
+                            TAG: /* Char_literal */12,
+                            _0: /* 'l' */108,
+                            _1: /* End_of_format */0
+                          }
+                        },
+                        _1: "%il"
+                      }), field_default._0);
             } else {
               return invalid_default_value(field_name, "invalid default type", undefined);
             }
@@ -6387,20 +6387,20 @@ function default_value_of_field_type(field_name, field_type, field_default) {
           if (field_default !== undefined) {
             if (field_default.TAG === /* Constant_int */2) {
               return Curry._1(Stdlib__Printf.sprintf({
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* Int */4,
-                                _0: /* Int_i */3,
-                                _1: /* No_padding */0,
-                                _2: /* No_precision */0,
-                                _3: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* 'L' */76,
-                                  _1: /* End_of_format */0
-                                }
-                              },
-                              _1: "%iL"
-                            }), field_default._0);
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* Int */4,
+                          _0: /* Int_i */3,
+                          _1: /* No_padding */0,
+                          _2: /* No_precision */0,
+                          _3: {
+                            TAG: /* Char_literal */12,
+                            _0: /* 'L' */76,
+                            _1: /* End_of_format */0
+                          }
+                        },
+                        _1: "%iL"
+                      }), field_default._0);
             } else {
               return invalid_default_value(field_name, "invalid default type", undefined);
             }
@@ -6411,22 +6411,22 @@ function default_value_of_field_type(field_name, field_type, field_default) {
           if (field_default !== undefined) {
             if (field_default.TAG === /* Constant_string */0) {
               return Curry._1(Stdlib__Printf.sprintf({
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "Bytes.of_string \"",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* Char_literal */12,
-                                    _0: /* '"' */34,
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              },
-                              _1: "Bytes.of_string \"%s\""
-                            }), field_default._0);
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: "Bytes.of_string \"",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
+                            _1: {
+                              TAG: /* Char_literal */12,
+                              _0: /* '"' */34,
+                              _1: /* End_of_format */0
+                            }
+                          }
+                        },
+                        _1: "Bytes.of_string \"%s\""
+                      }), field_default._0);
             } else {
               return invalid_default_value(field_name, "invalid default type", undefined);
             }
@@ -6539,22 +6539,22 @@ function record_field_default_info(record_field) {
                     }), vc_constructor, dfvft(vc_field_type._0, undefined));
         } else {
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "codegen_default.ml",
-                      74,
-                      15
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "codegen_default.ml",
+                  74,
+                  15
+                ]
+              });
         }
         break;
     
   }
   return [
-          rf_label,
-          default_value,
-          type_string
-        ];
+    rf_label,
+    default_value,
+    type_string
+  ];
 }
 
 function gen_default_record(mutable_, and_, param, sc) {
@@ -6720,102 +6720,102 @@ function gen_default_record(mutable_, and_, param, sc) {
           }));
   }
   line$1(sc, "}");
-}
-
-function gen_default_variant(and_, param, sc) {
-  const v_constructors = param.v_constructors;
-  const v_name = param.v_name;
-  if (v_constructors) {
-    const match = v_constructors.hd;
-    const vc_field_type = match.vc_field_type;
-    const vc_constructor = match.vc_constructor;
-    const decl = let_decl_of_and(and_);
-    if (/* tag */typeof vc_field_type === "number" || typeof vc_field_type === "string") {
-      return line$1(sc, Curry._4(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: " default_",
-                              _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: " (): ",
-                                  _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: {
-                                      TAG: /* String_literal */11,
-                                      _0: " = ",
-                                      _1: {
-                                        TAG: /* String */2,
-                                        _0: /* No_padding */0,
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          },
-                          _1: "%s default_%s (): %s = %s"
-                        }), decl, v_name, v_name, vc_constructor));
-    }
-    const default_value = default_value_of_field_type(v_name, vc_field_type._0, undefined);
-    return line$1(sc, Curry._5(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
+}
+
+function gen_default_variant(and_, param, sc) {
+  const v_constructors = param.v_constructors;
+  const v_name = param.v_name;
+  if (v_constructors) {
+    const match = v_constructors.hd;
+    const vc_field_type = match.vc_field_type;
+    const vc_constructor = match.vc_constructor;
+    const decl = let_decl_of_and(and_);
+    if (/* tag */typeof vc_field_type === "number" || typeof vc_field_type === "string") {
+      return line$1(sc, Curry._4(Stdlib__Printf.sprintf({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " default_",
+                        _1: {
                           TAG: /* String */2,
                           _0: /* No_padding */0,
                           _1: {
                             TAG: /* String_literal */11,
-                            _0: " default_",
+                            _0: " (): ",
                             _1: {
                               TAG: /* String */2,
                               _0: /* No_padding */0,
                               _1: {
                                 TAG: /* String_literal */11,
-                                _0: " () : ",
+                                _0: " = ",
                                 _1: {
                                   TAG: /* String */2,
                                   _0: /* No_padding */0,
+                                  _1: /* End_of_format */0
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    _1: "%s default_%s (): %s = %s"
+                  }), decl, v_name, v_name, vc_constructor));
+    }
+    const default_value = default_value_of_field_type(v_name, vc_field_type._0, undefined);
+    return line$1(sc, Curry._5(Stdlib__Printf.sprintf({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: " default_",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " () : ",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
+                            _1: {
+                              TAG: /* String_literal */11,
+                              _0: " = ",
+                              _1: {
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
+                                _1: {
+                                  TAG: /* String_literal */11,
+                                  _0: " (",
                                   _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " = ",
+                                    TAG: /* String */2,
+                                    _0: /* No_padding */0,
                                     _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: {
-                                        TAG: /* String_literal */11,
-                                        _0: " (",
-                                        _1: {
-                                          TAG: /* String */2,
-                                          _0: /* No_padding */0,
-                                          _1: {
-                                            TAG: /* Char_literal */12,
-                                            _0: /* ')' */41,
-                                            _1: /* End_of_format */0
-                                          }
-                                        }
-                                      }
+                                      TAG: /* Char_literal */12,
+                                      _0: /* ')' */41,
+                                      _1: /* End_of_format */0
                                     }
                                   }
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "%s default_%s () : %s = %s (%s)"
-                      }), decl, v_name, v_name, vc_constructor, default_value));
+                        }
+                      }
+                    }
+                  },
+                  _1: "%s default_%s () : %s = %s (%s)"
+                }), decl, v_name, v_name, vc_constructor, default_value));
   }
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: "programmatic TODO error"
-          });
+        MEL_EXN_ID: "Failure",
+        _1: "programmatic TODO error"
+      });
 }
 
 function gen_default_const_variant(and_, param, sc) {
@@ -6826,9 +6826,9 @@ function gen_default_const_variant(and_, param, sc) {
     first_constructor_name = cv_constructors.hd[0];
   } else {
     throw new Caml_js_exceptions.MelangeError("Failure", {
-              MEL_EXN_ID: "Failure",
-              _1: "programmatic TODO error"
-            });
+          MEL_EXN_ID: "Failure",
+          _1: "programmatic TODO error"
+        });
   }
   line$1(sc, Curry._4(Stdlib__Printf.sprintf({
                 TAG: /* Format */0,
@@ -7069,9 +7069,9 @@ function rev_split_by_naming_convention(s) {
       return l;
     } else {
       return {
-              hd: Stdlib__String.sub(s, start_i, end_i - start_i | 0),
-              tl: l
-            };
+        hd: Stdlib__String.sub(s, start_i, end_i - start_i | 0),
+        tl: l
+      };
     }
   };
   const match = string_fold_lefti((function (param, i, c) {
@@ -7080,23 +7080,23 @@ function rev_split_by_naming_convention(s) {
           if (c !== 95) {
             if (param[2] || !is_uppercase(c)) {
               return [
-                      l,
-                      start_i,
-                      is_uppercase(c)
-                    ];
+                l,
+                start_i,
+                is_uppercase(c)
+              ];
             } else {
               return [
-                      add_sub_string(start_i, i, l),
-                      i,
-                      true
-                    ];
+                add_sub_string(start_i, i, l),
+                i,
+                true
+              ];
             }
           } else {
             return [
-                    add_sub_string(start_i, i, l),
-                    i + 1 | 0,
-                    false
-                  ];
+              add_sub_string(start_i, i, l),
+              i + 1 | 0,
+              false
+            ];
           }
         }), [
         /* [] */0,
@@ -7192,12 +7192,12 @@ function module_of_file_name(file_name) {
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Stdlib.Not_found) {
       throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-                MEL_EXN_ID: Compilation_error,
-                _1: {
-                  TAG: /* Invalid_file_name */6,
-                  _0: file_name$1
-                }
-              });
+            MEL_EXN_ID: Compilation_error,
+            _1: {
+              TAG: /* Invalid_file_name */6,
+              _0: file_name$1
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -7221,9 +7221,9 @@ function type_name(message_scope, name) {
     }
   }
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: "Programmatic error"
-          });
+        MEL_EXN_ID: "Failure",
+        _1: "Programmatic error"
+      });
 }
 
 function encoding_info_of_field_type(all_types, field_type) {
@@ -7232,9 +7232,9 @@ function encoding_info_of_field_type(all_types, field_type) {
       case /* Field_type_sint32 */6 :
       case /* Field_type_sint64 */7 :
           return {
-                  TAG: /* Pk_varint */0,
-                  _0: true
-                };
+            TAG: /* Pk_varint */0,
+            _0: true
+          };
       case /* Field_type_float */1 :
       case /* Field_type_fixed32 */8 :
       case /* Field_type_sfixed32 */10 :
@@ -7248,17 +7248,17 @@ function encoding_info_of_field_type(all_types, field_type) {
           return /* Pk_bytes */2;
       default:
         return {
-                TAG: /* Pk_varint */0,
-                _0: false
-              };
+          TAG: /* Pk_varint */0,
+          _0: false
+        };
     }
   } else {
     const match = type_of_id(all_types, field_type._0);
     if (match.spec.TAG === /* Enum */0) {
       return {
-              TAG: /* Pk_varint */0,
-              _0: false
-            };
+        TAG: /* Pk_varint */0,
+        _0: false
+      };
     } else {
       return /* Pk_bytes */2;
     }
@@ -7274,23 +7274,23 @@ function encoding_of_field(all_types, field) {
     } else {
       const field_name$1 = field_name(field);
       throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-                MEL_EXN_ID: Compilation_error,
-                _1: {
-                  TAG: /* Invalid_packed_option */8,
-                  _0: field_name$1
-                }
-              });
+            MEL_EXN_ID: Compilation_error,
+            _1: {
+              TAG: /* Invalid_packed_option */8,
+              _0: field_name$1
+            }
+          });
     }
   } else {
     packed = false;
   }
   const pk = encoding_info_of_field_type(all_types, field_type(field));
   return [
-          pk,
-          field_number(field),
-          packed,
-          field_default(field)
-        ];
+    pk,
+    field_number(field),
+    packed,
+    field_default(field)
+  ];
 }
 
 function compile_field_type(field_name, all_types, file_options, field_options, file_name, field_type) {
@@ -7298,20 +7298,20 @@ function compile_field_type(field_name, all_types, file_options, field_options,
   const ocaml_type = match !== undefined && match.TAG === /* Constant_litteral */4 && match._0 === "int_t" ? "Int_t" : "None";
   const match$1 = file_option(file_options, "int32_type");
   const int32_type = match$1 !== undefined && match$1.TAG === /* Constant_litteral */4 && match$1._0 === "int_t" ? ({
-        TAG: /* Ft_basic_type */0,
-        _0: /* Bt_int */2
-      }) : ({
-        TAG: /* Ft_basic_type */0,
-        _0: /* Bt_int32 */3
-      });
+      TAG: /* Ft_basic_type */0,
+      _0: /* Bt_int */2
+    }) : ({
+      TAG: /* Ft_basic_type */0,
+      _0: /* Bt_int32 */3
+    });
   const match$2 = file_option(file_options, "int64_type");
   const int64_type = match$2 !== undefined && match$2.TAG === /* Constant_litteral */4 && match$2._0 === "int_t" ? ({
-        TAG: /* Ft_basic_type */0,
-        _0: /* Bt_int */2
-      }) : ({
-        TAG: /* Ft_basic_type */0,
-        _0: /* Bt_int64 */4
-      });
+      TAG: /* Ft_basic_type */0,
+      _0: /* Bt_int */2
+    }) : ({
+      TAG: /* Ft_basic_type */0,
+      _0: /* Bt_int64 */4
+    });
   if (!/* tag */(typeof field_type === "number" || typeof field_type === "string")) {
     let i = field_type._0;
     const module_ = module_of_file_name(file_name);
@@ -7323,12 +7323,12 @@ function compile_field_type(field_name, all_types, file_options, field_options,
       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
       if (exn.MEL_EXN_ID === Stdlib.Not_found) {
         throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-                  MEL_EXN_ID: Compilation_error,
-                  _1: {
-                    TAG: /* Programatic_error */4,
-                    _0: /* No_type_found_for_id */2
-                  }
-                });
+              MEL_EXN_ID: Compilation_error,
+              _1: {
+                TAG: /* Programatic_error */4,
+                _0: /* No_type_found_for_id */2
+              }
+            });
       }
       throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
     }
@@ -7342,40 +7342,40 @@ function compile_field_type(field_name, all_types, file_options, field_options,
     const udt_type_name = type_name(match$3.message_names, type_name_of_type(t));
     if (field_type_module === module_) {
       return {
-              TAG: /* Ft_user_defined_type */1,
-              _0: {
-                udt_module: undefined,
-                udt_type_name: udt_type_name,
-                udt_nested: udt_nested
-              }
-            };
+        TAG: /* Ft_user_defined_type */1,
+        _0: {
+          udt_module: undefined,
+          udt_type_name: udt_type_name,
+          udt_nested: udt_nested
+        }
+      };
     } else {
       return {
-              TAG: /* Ft_user_defined_type */1,
-              _0: {
-                udt_module: field_type_module,
-                udt_type_name: udt_type_name,
-                udt_nested: udt_nested
-              }
-            };
+        TAG: /* Ft_user_defined_type */1,
+        _0: {
+          udt_module: field_type_module,
+          udt_type_name: udt_type_name,
+          udt_nested: udt_nested
+        }
+      };
     }
   }
   switch (field_type) {
     case /* Field_type_double */0 :
     case /* Field_type_float */1 :
         return {
-                TAG: /* Ft_basic_type */0,
-                _0: /* Bt_float */1
-              };
+          TAG: /* Ft_basic_type */0,
+          _0: /* Bt_float */1
+        };
     case /* Field_type_int32 */2 :
     case /* Field_type_uint32 */4 :
     case /* Field_type_sint32 */6 :
     case /* Field_type_fixed32 */8 :
         if (ocaml_type === "Int_t") {
           return {
-                  TAG: /* Ft_basic_type */0,
-                  _0: /* Bt_int */2
-                };
+            TAG: /* Ft_basic_type */0,
+            _0: /* Bt_int */2
+          };
         } else {
           return int32_type;
         }
@@ -7385,9 +7385,9 @@ function compile_field_type(field_name, all_types, file_options, field_options,
     case /* Field_type_fixed64 */9 :
         if (ocaml_type === "Int_t") {
           return {
-                  TAG: /* Ft_basic_type */0,
-                  _0: /* Bt_int */2
-                };
+            TAG: /* Ft_basic_type */0,
+            _0: /* Bt_int */2
+          };
         } else {
           return int64_type;
         }
@@ -7397,19 +7397,19 @@ function compile_field_type(field_name, all_types, file_options, field_options,
         return unsupported_field_type(field_name, "sfixed64", "OCaml", undefined);
     case /* Field_type_bool */12 :
         return {
-                TAG: /* Ft_basic_type */0,
-                _0: /* Bt_bool */6
-              };
+          TAG: /* Ft_basic_type */0,
+          _0: /* Bt_bool */6
+        };
     case /* Field_type_string */13 :
         return {
-                TAG: /* Ft_basic_type */0,
-                _0: /* Bt_string */0
-              };
+          TAG: /* Ft_basic_type */0,
+          _0: /* Bt_string */0
+        };
     case /* Field_type_bytes */14 :
         return {
-                TAG: /* Ft_basic_type */0,
-                _0: /* Bt_bytes */5
-              };
+          TAG: /* Ft_basic_type */0,
+          _0: /* Bt_bytes */5
+        };
     
   }
 }
@@ -7423,12 +7423,12 @@ function is_mutable(field_name, field_options) {
     return match._0;
   }
   throw new Caml_js_exceptions.MelangeError(Compilation_error, {
-            MEL_EXN_ID: Compilation_error,
-            _1: {
-              TAG: /* Invalid_mutable_option */11,
-              _0: field_name
-            }
-          });
+        MEL_EXN_ID: Compilation_error,
+        _1: {
+          TAG: /* Invalid_mutable_option */11,
+          _0: field_name
+        }
+      });
 }
 
 function ocaml_container(field_options) {
@@ -7447,41 +7447,41 @@ function variant_of_oneof(include_oneof_name, outer_message_names, all_types, fi
           const vc_constructor = constructor_name(field_name(field));
           let tmp;
           tmp = /* tag */typeof field_type$1 === "number" || typeof field_type$1 === "string" ? /* Vct_nullary */0 : ({
-                TAG: /* Vct_non_nullary_constructor */0,
-                _0: field_type$1
-              });
+              TAG: /* Vct_non_nullary_constructor */0,
+              _0: field_type$1
+            });
           return {
-                  vc_constructor: vc_constructor,
-                  vc_field_type: tmp,
-                  vc_encoding_number: match[1],
-                  vc_payload_kind: match[0]
-                };
+            vc_constructor: vc_constructor,
+            vc_field_type: tmp,
+            vc_encoding_number: match[1],
+            vc_payload_kind: match[0]
+          };
         }), oneof_field.oneof_fields);
   const v_name = include_oneof_name !== undefined ? type_name(outer_message_names, oneof_field.oneof_name) : type_name(outer_message_names, "");
   return {
-          v_name: v_name,
-          v_constructors: v_constructors
-        };
+    v_name: v_name,
+    v_constructors: v_constructors
+  };
 }
 
 function compile_enum(file_name, scope, param) {
   const module_ = module_of_file_name(file_name);
   const cv_constructors = Stdlib__List.map((function (param) {
           return [
-                  constructor_name(param.enum_value_name),
-                  param.enum_value_int
-                ];
+            constructor_name(param.enum_value_name),
+            param.enum_value_int
+          ];
         }), param.enum_values);
   return {
-          module_: module_,
-          spec: {
-            TAG: /* Const_variant */2,
-            _0: {
-              cv_name: type_name(scope.message_names, param.enum_name),
-              cv_constructors: cv_constructors
-            }
-          }
-        };
+    module_: module_,
+    spec: {
+      TAG: /* Const_variant */2,
+      _0: {
+        cv_name: type_name(scope.message_names, param.enum_name),
+        cv_constructors: cv_constructors
+      }
+    }
+  };
 }
 
 const all_code_gen_1 = {
@@ -7522,301 +7522,301 @@ function compile(proto_definition) {
           const scope = param.scope;
           if (m.TAG === /* Enum */0) {
             return {
-                    scope: scope,
-                    id: id,
-                    file_name: file_name,
-                    file_options: file_options,
-                    spec: m
-                  };
+              scope: scope,
+              id: id,
+              file_name: file_name,
+              file_options: file_options,
+              spec: m
+            };
           } else {
             return {
-                    scope: scope,
-                    id: id,
-                    file_name: file_name,
-                    file_options: file_options,
-                    spec: {
-                      TAG: /* Message */1,
-                      _0: compile_message_p2(all_pbtt_msgs, scope, m._0)
-                    }
-                  };
+              scope: scope,
+              id: id,
+              file_name: file_name,
+              file_options: file_options,
+              spec: {
+                TAG: /* Message */1,
+                _0: compile_message_p2(all_pbtt_msgs, scope, m._0)
+              }
+            };
           }
         }), all_pbtt_msgs);
   const grouped_pbtt_msgs = Stdlib__List.rev(group(all_pbtt_msgs$1));
   const grouped_ocaml_types = Stdlib__List.map((function (pbtt_msgs) {
           return Stdlib__List.map((function (pbtt_msg) {
-                        const m = pbtt_msg.spec;
-                        const file_name = pbtt_msg.file_name;
-                        const scope = pbtt_msg.scope;
-                        if (m.TAG === /* Enum */0) {
-                          return {
-                                  hd: compile_enum(file_name, scope, m._0),
+                  const m = pbtt_msg.spec;
+                  const file_name = pbtt_msg.file_name;
+                  const scope = pbtt_msg.scope;
+                  if (m.TAG === /* Enum */0) {
+                    return {
+                      hd: compile_enum(file_name, scope, m._0),
+                      tl: /* [] */0
+                    };
+                  } else {
+                    let file_options = pbtt_msg.file_options;
+                    let message = m._0;
+                    const module_ = module_of_file_name(file_name);
+                    const message_names = scope.message_names;
+                    const message_body = message.message_body;
+                    const message_name = message.message_name;
+                    if (!message_body) {
+                      return /* [] */0;
+                    }
+                    const f = message_body.hd;
+                    switch (f.TAG) {
+                      case /* Message_oneof_field */1 :
+                          if (!message_body.tl) {
+                            const outer_message_names = Stdlib.$at(message_names, {
+                                  hd: message_name,
                                   tl: /* [] */0
-                                };
-                        } else {
-                          let file_options = pbtt_msg.file_options;
-                          let message = m._0;
-                          const module_ = module_of_file_name(file_name);
-                          const message_names = scope.message_names;
-                          const message_body = message.message_body;
-                          const message_name = message.message_name;
-                          if (!message_body) {
-                            return /* [] */0;
+                                });
+                            const variant = variant_of_oneof(undefined, outer_message_names, all_pbtt_msgs$1, file_options, file_name, f._0);
+                            return {
+                              hd: {
+                                module_: module_,
+                                spec: {
+                                  TAG: /* Variant */1,
+                                  _0: variant
+                                }
+                              },
+                              tl: /* [] */0
+                            };
                           }
-                          const f = message_body.hd;
-                          switch (f.TAG) {
-                            case /* Message_oneof_field */1 :
-                                if (!message_body.tl) {
+                          break;
+                      case /* Message_field */0 :
+                      case /* Message_map_field */2 :
+                          break;
+                      
+                    }
+                    const match = Stdlib__List.fold_left((function (param, field) {
+                            const fields = param[1];
+                            const variants = param[0];
+                            switch (field.TAG) {
+                              case /* Message_field */0 :
+                                  const field$1 = field._0;
+                                  const match = encoding_of_field(all_pbtt_msgs$1, field$1);
+                                  const encoding_number = match[1];
+                                  const pk = match[0];
+                                  const field_name$1 = field_name(field$1);
+                                  const field_options$1 = field_options(field$1);
+                                  const field_type$1 = compile_field_type(field_name$1, all_pbtt_msgs$1, file_options, field_options$1, file_name, field_type(field$1));
+                                  const field_default$1 = field_default(field$1);
+                                  const mutable_ = is_mutable(field_name$1, field_options$1);
+                                  const match$1 = field_label(field$1);
+                                  let record_field_type;
+                                  if (match$1 === "Optional") {
+                                    record_field_type = {
+                                      TAG: /* Rft_optional */1,
+                                      _0: [
+                                        field_type$1,
+                                        encoding_number,
+                                        pk,
+                                        field_default$1
+                                      ]
+                                    };
+                                  } else if (match$1 === "Required") {
+                                    record_field_type = {
+                                      TAG: /* Rft_required */0,
+                                      _0: [
+                                        field_type$1,
+                                        encoding_number,
+                                        pk,
+                                        field_default$1
+                                      ]
+                                    };
+                                  } else {
+                                    const match$2 = ocaml_container(field_options$1);
+                                    let repeated_type;
+                                    if (match$2 !== undefined) {
+                                      if (match$2 === "repeated_field") {
+                                        repeated_type = /* Rt_repeated_field */1;
+                                      } else {
+                                        throw new Caml_js_exceptions.MelangeError("Failure", {
+                                              MEL_EXN_ID: "Failure",
+                                              _1: "Invalid ocaml_container attribute value"
+                                            });
+                                      }
+                                    } else {
+                                      repeated_type = /* Rt_list */0;
+                                    }
+                                    record_field_type = {
+                                      TAG: /* Rft_repeated_field */2,
+                                      _0: [
+                                        repeated_type,
+                                        field_type$1,
+                                        encoding_number,
+                                        pk,
+                                        match[2]
+                                      ]
+                                    };
+                                  }
+                                  const record_field_rf_label = label_name_of_field_name(field_name$1);
+                                  const record_field = {
+                                    rf_label: record_field_rf_label,
+                                    rf_field_type: record_field_type,
+                                    rf_mutable: mutable_
+                                  };
+                                  return [
+                                    variants,
+                                    {
+                                      hd: record_field,
+                                      tl: fields
+                                    }
+                                  ];
+                              case /* Message_oneof_field */1 :
+                                  const field$2 = field._0;
                                   const outer_message_names = Stdlib.$at(message_names, {
                                         hd: message_name,
                                         tl: /* [] */0
                                       });
-                                  const variant = variant_of_oneof(undefined, outer_message_names, all_pbtt_msgs$1, file_options, file_name, f._0);
-                                  return {
-                                          hd: {
-                                            module_: module_,
-                                            spec: {
-                                              TAG: /* Variant */1,
-                                              _0: variant
-                                            }
-                                          },
-                                          tl: /* [] */0
-                                        };
-                                }
-                                break;
-                            case /* Message_field */0 :
-                            case /* Message_map_field */2 :
-                                break;
-                            
-                          }
-                          const match = Stdlib__List.fold_left((function (param, field) {
-                                  const fields = param[1];
-                                  const variants = param[0];
-                                  switch (field.TAG) {
-                                    case /* Message_field */0 :
-                                        const field$1 = field._0;
-                                        const match = encoding_of_field(all_pbtt_msgs$1, field$1);
-                                        const encoding_number = match[1];
-                                        const pk = match[0];
-                                        const field_name$1 = field_name(field$1);
-                                        const field_options$1 = field_options(field$1);
-                                        const field_type$1 = compile_field_type(field_name$1, all_pbtt_msgs$1, file_options, field_options$1, file_name, field_type(field$1));
-                                        const field_default$1 = field_default(field$1);
-                                        const mutable_ = is_mutable(field_name$1, field_options$1);
-                                        const match$1 = field_label(field$1);
-                                        let record_field_type;
-                                        if (match$1 === "Optional") {
-                                          record_field_type = {
-                                            TAG: /* Rft_optional */1,
-                                            _0: [
-                                              field_type$1,
-                                              encoding_number,
-                                              pk,
-                                              field_default$1
-                                            ]
-                                          };
-                                        } else if (match$1 === "Required") {
-                                          record_field_type = {
-                                            TAG: /* Rft_required */0,
-                                            _0: [
-                                              field_type$1,
-                                              encoding_number,
-                                              pk,
-                                              field_default$1
-                                            ]
-                                          };
-                                        } else {
-                                          const match$2 = ocaml_container(field_options$1);
-                                          let repeated_type;
-                                          if (match$2 !== undefined) {
-                                            if (match$2 === "repeated_field") {
-                                              repeated_type = /* Rt_repeated_field */1;
-                                            } else {
-                                              throw new Caml_js_exceptions.MelangeError("Failure", {
-                                                        MEL_EXN_ID: "Failure",
-                                                        _1: "Invalid ocaml_container attribute value"
-                                                      });
-                                            }
-                                          } else {
-                                            repeated_type = /* Rt_list */0;
-                                          }
-                                          record_field_type = {
-                                            TAG: /* Rft_repeated_field */2,
-                                            _0: [
-                                              repeated_type,
-                                              field_type$1,
-                                              encoding_number,
-                                              pk,
-                                              match[2]
-                                            ]
-                                          };
-                                        }
-                                        const record_field_rf_label = label_name_of_field_name(field_name$1);
-                                        const record_field = {
-                                          rf_label: record_field_rf_label,
-                                          rf_field_type: record_field_type,
-                                          rf_mutable: mutable_
-                                        };
-                                        return [
-                                                variants,
-                                                {
-                                                  hd: record_field,
-                                                  tl: fields
-                                                }
-                                              ];
-                                    case /* Message_oneof_field */1 :
-                                        const field$2 = field._0;
-                                        const outer_message_names = Stdlib.$at(message_names, {
-                                              hd: message_name,
-                                              tl: /* [] */0
-                                            });
-                                        const variant = variant_of_oneof(Caml_option.some(undefined), outer_message_names, all_pbtt_msgs$1, file_options, file_name, field$2);
-                                        const record_field_rf_label$1 = label_name_of_field_name(field$2.oneof_name);
-                                        const record_field_rf_field_type = {
-                                          TAG: /* Rft_variant_field */4,
-                                          _0: variant
-                                        };
-                                        const record_field$1 = {
-                                          rf_label: record_field_rf_label$1,
-                                          rf_field_type: record_field_rf_field_type,
-                                          rf_mutable: false
-                                        };
-                                        const variants_0 = {
-                                          module_: module_,
-                                          spec: {
-                                            TAG: /* Variant */1,
-                                            _0: variant
-                                          }
-                                        };
-                                        const variants$1 = {
-                                          hd: variants_0,
-                                          tl: variants
-                                        };
-                                        const fields$1 = {
-                                          hd: record_field$1,
-                                          tl: fields
-                                        };
-                                        return [
-                                                variants$1,
-                                                fields$1
-                                              ];
-                                    case /* Message_map_field */2 :
-                                        const mf = field._0;
-                                        const map_options = mf.map_options;
-                                        const map_value_type = mf.map_value_type;
-                                        const map_key_type = mf.map_key_type;
-                                        const map_name = mf.map_name;
-                                        const key_type = compile_field_type(Curry._1(Stdlib__Printf.sprintf({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "key of ",
-                                                        _1: {
-                                                          TAG: /* String */2,
-                                                          _0: /* No_padding */0,
-                                                          _1: /* End_of_format */0
-                                                        }
-                                                      },
-                                                      _1: "key of %s"
-                                                    }), map_name), all_pbtt_msgs$1, file_options, map_options, file_name, map_key_type);
-                                        const key_pk = encoding_info_of_field_type(all_pbtt_msgs$1, map_key_type);
-                                        let key_type$1;
-                                        if (/* tag */typeof key_type === "number" || typeof key_type === "string") {
-                                          throw new Caml_js_exceptions.MelangeError("Failure", {
-                                                    MEL_EXN_ID: "Failure",
-                                                    _1: "Only Basic Types are supported for map keys"
-                                                  });
-                                        }
-                                        if (key_type.TAG === /* Ft_basic_type */0) {
-                                          key_type$1 = key_type._0;
-                                        } else {
-                                          throw new Caml_js_exceptions.MelangeError("Failure", {
-                                                    MEL_EXN_ID: "Failure",
-                                                    _1: "Only Basic Types are supported for map keys"
-                                                  });
-                                        }
-                                        const value_type = compile_field_type(Curry._1(Stdlib__Printf.sprintf({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "value of ",
-                                                        _1: {
-                                                          TAG: /* String */2,
-                                                          _0: /* No_padding */0,
-                                                          _1: /* End_of_format */0
-                                                        }
-                                                      },
-                                                      _1: "value of %s"
-                                                    }), map_name), all_pbtt_msgs$1, file_options, map_options, file_name, map_value_type);
-                                        const value_pk = encoding_info_of_field_type(all_pbtt_msgs$1, map_value_type);
-                                        const match$3 = ocaml_container(map_options);
-                                        let associative_type;
-                                        if (match$3 !== undefined) {
-                                          if (match$3 === "hashtbl") {
-                                            associative_type = /* At_hashtable */1;
-                                          } else {
-                                            throw new Caml_js_exceptions.MelangeError("Failure", {
-                                                      MEL_EXN_ID: "Failure",
-                                                      _1: "Invalid ocaml_container attribute value for map"
-                                                    });
-                                          }
-                                        } else {
-                                          associative_type = /* At_list */0;
-                                        }
-                                        const record_field_type$1 = {
-                                          TAG: /* Rft_associative_field */3,
-                                          _0: [
-                                            associative_type,
-                                            mf.map_number,
-                                            [
-                                              key_type$1,
-                                              key_pk
-                                            ],
-                                            [
-                                              value_type,
-                                              value_pk
-                                            ]
-                                          ]
-                                        };
-                                        const record_field_rf_label$2 = label_name_of_field_name(map_name);
-                                        const record_field_rf_mutable = is_mutable(map_name, map_options);
-                                        const record_field$2 = {
-                                          rf_label: record_field_rf_label$2,
-                                          rf_field_type: record_field_type$1,
-                                          rf_mutable: record_field_rf_mutable
-                                        };
-                                        return [
-                                                variants,
-                                                {
-                                                  hd: record_field$2,
-                                                  tl: fields
-                                                }
-                                              ];
-                                    
+                                  const variant = variant_of_oneof(Caml_option.some(undefined), outer_message_names, all_pbtt_msgs$1, file_options, file_name, field$2);
+                                  const record_field_rf_label$1 = label_name_of_field_name(field$2.oneof_name);
+                                  const record_field_rf_field_type = {
+                                    TAG: /* Rft_variant_field */4,
+                                    _0: variant
+                                  };
+                                  const record_field$1 = {
+                                    rf_label: record_field_rf_label$1,
+                                    rf_field_type: record_field_rf_field_type,
+                                    rf_mutable: false
+                                  };
+                                  const variants_0 = {
+                                    module_: module_,
+                                    spec: {
+                                      TAG: /* Variant */1,
+                                      _0: variant
+                                    }
+                                  };
+                                  const variants$1 = {
+                                    hd: variants_0,
+                                    tl: variants
+                                  };
+                                  const fields$1 = {
+                                    hd: record_field$1,
+                                    tl: fields
+                                  };
+                                  return [
+                                    variants$1,
+                                    fields$1
+                                  ];
+                              case /* Message_map_field */2 :
+                                  const mf = field._0;
+                                  const map_options = mf.map_options;
+                                  const map_value_type = mf.map_value_type;
+                                  const map_key_type = mf.map_key_type;
+                                  const map_name = mf.map_name;
+                                  const key_type = compile_field_type(Curry._1(Stdlib__Printf.sprintf({
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "key of ",
+                                                  _1: {
+                                                    TAG: /* String */2,
+                                                    _0: /* No_padding */0,
+                                                    _1: /* End_of_format */0
+                                                  }
+                                                },
+                                                _1: "key of %s"
+                                              }), map_name), all_pbtt_msgs$1, file_options, map_options, file_name, map_key_type);
+                                  const key_pk = encoding_info_of_field_type(all_pbtt_msgs$1, map_key_type);
+                                  let key_type$1;
+                                  if (/* tag */typeof key_type === "number" || typeof key_type === "string") {
+                                    throw new Caml_js_exceptions.MelangeError("Failure", {
+                                          MEL_EXN_ID: "Failure",
+                                          _1: "Only Basic Types are supported for map keys"
+                                        });
                                   }
-                                }), [
-                                /* [] */0,
-                                /* [] */0
-                              ], message_body);
-                          const record_r_name = type_name(message_names, message_name);
-                          const record_r_fields = Stdlib__List.rev(match[1]);
-                          const record = {
-                            r_name: record_r_name,
-                            r_fields: record_r_fields
-                          };
-                          const type__spec = {
-                            TAG: /* Record */0,
-                            _0: record
-                          };
-                          const type_ = {
-                            module_: module_,
-                            spec: type__spec
-                          };
-                          return Stdlib__List.rev({
-                                      hd: type_,
-                                      tl: match[0]
-                                    });
-                        }
-                      }), pbtt_msgs);
+                                  if (key_type.TAG === /* Ft_basic_type */0) {
+                                    key_type$1 = key_type._0;
+                                  } else {
+                                    throw new Caml_js_exceptions.MelangeError("Failure", {
+                                          MEL_EXN_ID: "Failure",
+                                          _1: "Only Basic Types are supported for map keys"
+                                        });
+                                  }
+                                  const value_type = compile_field_type(Curry._1(Stdlib__Printf.sprintf({
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "value of ",
+                                                  _1: {
+                                                    TAG: /* String */2,
+                                                    _0: /* No_padding */0,
+                                                    _1: /* End_of_format */0
+                                                  }
+                                                },
+                                                _1: "value of %s"
+                                              }), map_name), all_pbtt_msgs$1, file_options, map_options, file_name, map_value_type);
+                                  const value_pk = encoding_info_of_field_type(all_pbtt_msgs$1, map_value_type);
+                                  const match$3 = ocaml_container(map_options);
+                                  let associative_type;
+                                  if (match$3 !== undefined) {
+                                    if (match$3 === "hashtbl") {
+                                      associative_type = /* At_hashtable */1;
+                                    } else {
+                                      throw new Caml_js_exceptions.MelangeError("Failure", {
+                                            MEL_EXN_ID: "Failure",
+                                            _1: "Invalid ocaml_container attribute value for map"
+                                          });
+                                    }
+                                  } else {
+                                    associative_type = /* At_list */0;
+                                  }
+                                  const record_field_type$1 = {
+                                    TAG: /* Rft_associative_field */3,
+                                    _0: [
+                                      associative_type,
+                                      mf.map_number,
+                                      [
+                                        key_type$1,
+                                        key_pk
+                                      ],
+                                      [
+                                        value_type,
+                                        value_pk
+                                      ]
+                                    ]
+                                  };
+                                  const record_field_rf_label$2 = label_name_of_field_name(map_name);
+                                  const record_field_rf_mutable = is_mutable(map_name, map_options);
+                                  const record_field$2 = {
+                                    rf_label: record_field_rf_label$2,
+                                    rf_field_type: record_field_type$1,
+                                    rf_mutable: record_field_rf_mutable
+                                  };
+                                  return [
+                                    variants,
+                                    {
+                                      hd: record_field$2,
+                                      tl: fields
+                                    }
+                                  ];
+                              
+                            }
+                          }), [
+                          /* [] */0,
+                          /* [] */0
+                        ], message_body);
+                    const record_r_name = type_name(message_names, message_name);
+                    const record_r_fields = Stdlib__List.rev(match[1]);
+                    const record = {
+                      r_name: record_r_name,
+                      r_fields: record_r_fields
+                    };
+                    const type__spec = {
+                      TAG: /* Record */0,
+                      _0: record
+                    };
+                    const type_ = {
+                      module_: module_,
+                      spec: type__spec
+                    };
+                    return Stdlib__List.rev({
+                          hd: type_,
+                          tl: match[0]
+                        });
+                  }
+                }), pbtt_msgs);
         }), grouped_pbtt_msgs);
   const all_ocaml_types = Stdlib__List.flatten(grouped_ocaml_types);
   let proto_file_name = "tmp.proto";
@@ -7865,9 +7865,9 @@ function compile(proto_definition) {
   line$1(sc, "");
   gen(all_ocaml_types, sc, Stdlib__List.map((function (m) {
               return [
-                      m.gen_struct,
-                      undefined
-                    ];
+                m.gen_struct,
+                undefined
+              ];
             }), all_code_gen));
   const struct_string = print(sc);
   const sc$1 = {
@@ -7892,15 +7892,15 @@ function compile(proto_definition) {
               }), Curry._1(Stdlib__Filename.basename, proto_file_name)));
   gen(all_ocaml_types, sc$1, Stdlib__List.map((function (m) {
               return [
-                      m.gen_sig,
-                      m.ocamldoc_title
-                    ];
+                m.gen_sig,
+                m.ocamldoc_title
+              ];
             }), all_code_gen));
   const sig_string = print(sc$1);
   return [
-          sig_string,
-          struct_string
-        ];
+    sig_string,
+    struct_string
+  ];
 }
 
 const match = compile("message T {required int32 j = 1; }");
@@ -7920,10 +7920,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/ocaml_re_test.js b/jscomp/test/dist/jscomp/test/ocaml_re_test.js
index 4f0fc739a..a6c3f9f1a 100644
--- a/jscomp/test/dist/jscomp/test/ocaml_re_test.js
+++ b/jscomp/test/dist/jscomp/test/ocaml_re_test.js
@@ -35,10 +35,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -65,21 +65,21 @@ function union(_l, _l$p) {
     const 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 = {
@@ -129,20 +129,20 @@ function inter(_l, _l$p) {
     if (!Caml_obj.caml_lessthan(c2$p, c1)) {
       if (Caml_obj.caml_lessthan(c2, c2$p)) {
         return {
-                hd: [
-                  Caml_obj.caml_max(c1, c1$p),
-                  c2
-                ],
-                tl: inter(r, l$p)
-              };
+          hd: [
+            Caml_obj.caml_max(c1, c1$p),
+            c2
+          ],
+          tl: inter(r, l$p)
+        };
       } else {
         return {
-                hd: [
-                  Caml_obj.caml_max(c1, c1$p),
-                  c2$p
-                ],
-                tl: inter(l, r$p)
-              };
+          hd: [
+            Caml_obj.caml_max(c1, c1$p),
+            c2$p
+          ],
+          tl: inter(l, r$p)
+        };
       }
     }
     _l$p = r$p;
@@ -170,32 +170,32 @@ function diff(_l, _l$p) {
     const 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 ;
     }
     const 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;
@@ -205,31 +205,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.caml_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
+    };
   }
 }
 
@@ -239,12 +239,12 @@ function offset(o, l) {
   }
   const 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) {
@@ -310,13 +310,13 @@ function create(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -327,9 +327,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -342,25 +342,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -373,21 +373,21 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -399,13 +399,13 @@ function add(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -429,8 +429,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg.compare, x, param.v);
     if (c === 0) {
@@ -521,12 +521,12 @@ function create$1(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r.h;
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$1(l, v, r) {
@@ -537,9 +537,9 @@ function bal$1(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const lr = l.r;
     const lv = l.v;
@@ -551,24 +551,24 @@ function bal$1(l, v, r) {
       return create$1(create$1(ll, lv, lr.l), lr.v, create$1(lr.r, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   const rr = r.r;
   const rv = r.v;
@@ -580,20 +580,20 @@ function bal$1(l, v, r) {
     return create$1(create$1(l, v, rl.l), rl.v, create$1(rl.r, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Set.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Set.bal"
+      });
 }
 
 function add$1(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = t.r;
   const v = t.v;
@@ -654,20 +654,20 @@ function marks_set_idx(idx, marks) {
     return marks;
   } else {
     return {
-            hd: [
-              match[0],
-              idx
-            ],
-            tl: marks_set_idx(idx, marks.tl)
-          };
+      hd: [
+        match[0],
+        idx
+      ],
+      tl: marks_set_idx(idx, marks.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, _param) {
@@ -693,22 +693,22 @@ const 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 */1,
-                _0: /* [] */0
-              });
+          TAG: /* Alt */1,
+          _0: /* [] */0
+        });
   } else {
     return mk_expr(ids, {
-                TAG: /* Cst */0,
-                _0: s
-              });
+          TAG: /* Cst */0,
+          _0: s
+        });
   }
 }
 
@@ -716,17 +716,17 @@ function alt(ids, l) {
   if (l) {
     if (l.tl) {
       return mk_expr(ids, {
-                  TAG: /* Alt */1,
-                  _0: l
-                });
+            TAG: /* Alt */1,
+            _0: l
+          });
     } else {
       return l.hd;
     }
   } else {
     return mk_expr(ids, {
-                TAG: /* Alt */1,
-                _0: /* [] */0
-              });
+          TAG: /* Alt */1,
+          _0: /* [] */0
+        });
   }
 }
 
@@ -757,11 +757,11 @@ function seq$1(ids, kind, x, y) {
     
   }
   return mk_expr(ids, {
-              TAG: /* Seq */2,
-              _0: kind,
-              _1: x,
-              _2: y
-            });
+        TAG: /* Seq */2,
+        _0: kind,
+        _1: x,
+        _2: y
+      });
 }
 
 function is_eps(expr) {
@@ -775,19 +775,19 @@ function is_eps(expr) {
 
 function rep(ids, kind, sem, x) {
   return mk_expr(ids, {
-              TAG: /* Rep */3,
-              _0: kind,
-              _1: sem,
-              _2: x
-            });
+        TAG: /* Rep */3,
+        _0: kind,
+        _1: sem,
+        _2: x
+      });
 }
 
 function erase(ids, m, m$p) {
   return mk_expr(ids, {
-              TAG: /* Erase */5,
-              _0: m,
-              _1: m$p
-            });
+        TAG: /* Erase */5,
+        _0: m,
+        _1: m$p
+      });
 }
 
 function rename(ids, x) {
@@ -798,25 +798,25 @@ function rename(ids, x) {
   switch (l.TAG) {
     case /* Alt */1 :
         return mk_expr(ids, {
-                    TAG: /* Alt */1,
-                    _0: Stdlib__List.map((function (param) {
-                            return rename(ids, param);
-                          }), l._0)
-                  });
+              TAG: /* Alt */1,
+              _0: Stdlib__List.map((function (param) {
+                      return rename(ids, param);
+                    }), l._0)
+            });
     case /* Seq */2 :
         return mk_expr(ids, {
-                    TAG: /* Seq */2,
-                    _0: l._0,
-                    _1: rename(ids, l._1),
-                    _2: rename(ids, l._2)
-                  });
+              TAG: /* Seq */2,
+              _0: l._0,
+              _1: rename(ids, l._1),
+              _2: rename(ids, l._2)
+            });
     case /* Rep */3 :
         return mk_expr(ids, {
-                    TAG: /* Rep */3,
-                    _0: l._0,
-                    _1: l._1,
-                    _2: rename(ids, l._2)
-                  });
+              TAG: /* Rep */3,
+              _0: l._0,
+              _1: l._1,
+              _2: rename(ids, l._2)
+            });
     default:
       return mk_expr(ids, x.def);
   }
@@ -936,13 +936,13 @@ function tseq(kind, x, y, rem) {
         let tmp = match._1.def;
         if (/* tag */(typeof tmp === "number" || typeof tmp === "string") && !x.tl) {
           return {
-                  hd: {
-                    TAG: /* TExp */1,
-                    _0: match._0,
-                    _1: y
-                  },
-                  tl: rem
-                };
+            hd: {
+              TAG: /* TExp */1,
+              _0: match._0,
+              _1: y
+            },
+            tl: rem
+          };
         }
         break;
     case /* TSeq */0 :
@@ -951,14 +951,14 @@ function tseq(kind, x, y, rem) {
     
   }
   return {
-          hd: {
-            TAG: /* TSeq */0,
-            _0: x,
-            _1: y,
-            _2: kind
-          },
-          tl: rem
-        };
+    hd: {
+      TAG: /* TSeq */0,
+      _0: x,
+      _1: y,
+      _2: kind
+    },
+    tl: rem
+  };
 }
 
 const dummy = {
@@ -975,23 +975,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 */1,
-                _0: empty,
-                _1: e
-              },
-              tl: /* [] */0
-            });
+        hd: {
+          TAG: /* TExp */1,
+          _0: empty,
+          _1: e
+        },
+        tl: /* [] */0
+      });
 }
 
 function equal$1(x, y) {
@@ -1018,22 +1018,22 @@ function reset_table(a) {
 function mark_used_indices(tbl) {
   return function (param) {
     return Stdlib__List.iter((function (param) {
-                  switch (param.TAG) {
-                    case /* TSeq */0 :
-                        return mark_used_indices(tbl)(param._0);
-                    case /* TExp */1 :
-                    case /* TMatch */2 :
-                        break;
+            switch (param.TAG) {
+              case /* TSeq */0 :
+                  return mark_used_indices(tbl)(param._0);
+              case /* TExp */1 :
+              case /* TMatch */2 :
+                  break;
+              
+            }
+            Stdlib__List.iter((function (param) {
+                    const i = param[1];
+                    if (i >= 0) {
+                      return Caml_array.set(tbl, i, true);
+                    }
                     
-                  }
-                  Stdlib__List.iter((function (param) {
-                          const i = param[1];
-                          if (i >= 0) {
-                            return Caml_array.set(tbl, i, true);
-                          }
-                          
-                        }), param._0.marks);
-                }), param);
+                  }), param._0.marks);
+          }), param);
   };
 }
 
@@ -1062,15 +1062,15 @@ function free_index(tbl_ref, l) {
 
 function remove_matches(param) {
   return Stdlib__List.filter((function (param) {
-                switch (param.TAG) {
-                  case /* TSeq */0 :
-                  case /* TExp */1 :
-                      return true;
-                  case /* TMatch */2 :
-                      return false;
-                  
-                }
-              }), param);
+          switch (param.TAG) {
+            case /* TSeq */0 :
+            case /* TExp */1 :
+                return true;
+            case /* TMatch */2 :
+                return false;
+            
+          }
+        }), param);
 }
 
 function split_at_match_rec(_l$p, _param) {
@@ -1090,20 +1090,20 @@ function split_at_match_rec(_l$p, _param) {
             continue ;
         case /* TMatch */2 :
             return [
-                    Stdlib__List.rev(l$p),
-                    remove_matches(param.tl)
-                  ];
+              Stdlib__List.rev(l$p),
+              remove_matches(param.tl)
+            ];
         
       }
     } else {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "re_automata.ml",
-                  429,
-                  21
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "re_automata.ml",
+              429,
+              21
+            ]
+          });
     }
   };
 }
@@ -1113,9 +1113,9 @@ function remove_duplicates(prev, _l, y) {
     const l = _l;
     if (!l) {
       return [
-              /* [] */0,
-              prev
-            ];
+        /* [] */0,
+        prev
+      ];
     }
     const x = l.hd;
     switch (x.TAG) {
@@ -1124,9 +1124,9 @@ function remove_duplicates(prev, _l, y) {
           const match = remove_duplicates(prev, x._0, x$1);
           const 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 */1 :
           let tmp = x._1.def;
           if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
@@ -1140,12 +1140,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]
+            ];
           }
           const r$1 = l.tl;
           const x$2 = x._1;
@@ -1158,20 +1158,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 */2 :
           return [
-                  {
-                    hd: x,
-                    tl: /* [] */0
-                  },
-                  prev
-                ];
+            {
+              hd: x,
+              tl: /* [] */0
+            },
+            prev
+          ];
       
     }
   };
@@ -1185,71 +1185,71 @@ function set_idx(idx, param) {
   switch (marks.TAG) {
     case /* TSeq */0 :
         return {
-                hd: {
-                  TAG: /* TSeq */0,
-                  _0: set_idx(idx, marks._0),
-                  _1: marks._1,
-                  _2: marks._2
-                },
-                tl: set_idx(idx, param.tl)
-              };
+          hd: {
+            TAG: /* TSeq */0,
+            _0: set_idx(idx, marks._0),
+            _1: marks._1,
+            _2: marks._2
+          },
+          tl: set_idx(idx, param.tl)
+        };
     case /* TExp */1 :
         return {
-                hd: {
-                  TAG: /* TExp */1,
-                  _0: marks_set_idx$1(marks._0, idx),
-                  _1: marks._1
-                },
-                tl: set_idx(idx, param.tl)
-              };
+          hd: {
+            TAG: /* TExp */1,
+            _0: marks_set_idx$1(marks._0, idx),
+            _1: marks._1
+          },
+          tl: set_idx(idx, param.tl)
+        };
     case /* TMatch */2 :
         return {
-                hd: {
-                  TAG: /* TMatch */2,
-                  _0: marks_set_idx$1(marks._0, idx)
-                },
-                tl: set_idx(idx, param.tl)
-              };
+          hd: {
+            TAG: /* TMatch */2,
+            _0: marks_set_idx$1(marks._0, idx)
+          },
+          tl: set_idx(idx, param.tl)
+        };
     
   }
 }
 
 function filter_marks(b, e, marks) {
   return {
-          marks: Stdlib__List.filter((function (param) {
-                  const i = param[0];
-                  if (i < b) {
-                    return true;
-                  } else {
-                    return i > e;
-                  }
-                }), marks.marks),
-          pmarks: marks.pmarks
-        };
+    marks: Stdlib__List.filter((function (param) {
+            const 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) {
   const s = x.def;
   if (/* tag */typeof s === "number" || typeof s === "string") {
     return {
-            hd: {
-              TAG: /* TMatch */2,
-              _0: marks
-            },
-            tl: rem
-          };
+      hd: {
+        TAG: /* TMatch */2,
+        _0: marks
+      },
+      tl: rem
+    };
   }
   switch (s.TAG) {
     case /* Cst */0 :
         if (mem(c, s._0)) {
           return {
-                  hd: {
-                    TAG: /* TExp */1,
-                    _0: marks,
-                    _1: eps_expr
-                  },
-                  tl: rem
-                };
+            hd: {
+              TAG: /* TExp */1,
+              _0: marks,
+              _1: eps_expr
+            },
+            tl: rem
+          };
         } else {
           return rem;
         }
@@ -1281,20 +1281,20 @@ function delta_1(marks, c, next_cat, prev_cat, x, rem) {
         const y$p$p = match[0];
         if (s._0 === "Non_greedy") {
           return {
-                  hd: {
-                    TAG: /* TMatch */2,
-                    _0: marks
-                  },
-                  tl: tseq(kind, y$p$p, x, rem)
-                };
-        } else {
-          return tseq(kind, y$p$p, x, {
-                      hd: {
-                        TAG: /* TMatch */2,
-                        _0: match[1]
-                      },
-                      tl: rem
-                    });
+            hd: {
+              TAG: /* TMatch */2,
+              _0: marks
+            },
+            tl: tseq(kind, y$p$p, x, rem)
+          };
+        } else {
+          return tseq(kind, y$p$p, x, {
+                hd: {
+                  TAG: /* TMatch */2,
+                  _0: match[1]
+                },
+                tl: rem
+              });
         }
     case /* Mark */4 :
         const i = s._0;
@@ -1311,41 +1311,41 @@ function delta_1(marks, c, next_cat, prev_cat, x, rem) {
           pmarks: marks_pmarks
         };
         return {
-                hd: {
-                  TAG: /* TMatch */2,
-                  _0: marks$1
-                },
-                tl: rem
-              };
+          hd: {
+            TAG: /* TMatch */2,
+            _0: marks$1
+          },
+          tl: rem
+        };
     case /* Erase */5 :
         return {
-                hd: {
-                  TAG: /* TMatch */2,
-                  _0: filter_marks(s._0, s._1, marks)
-                },
-                tl: rem
-              };
+          hd: {
+            TAG: /* TMatch */2,
+            _0: filter_marks(s._0, s._1, marks)
+          },
+          tl: rem
+        };
     case /* Before */6 :
         if (intersect(next_cat, s._0)) {
           return {
-                  hd: {
-                    TAG: /* TMatch */2,
-                    _0: marks
-                  },
-                  tl: rem
-                };
+            hd: {
+              TAG: /* TMatch */2,
+              _0: marks
+            },
+            tl: rem
+          };
         } else {
           return rem;
         }
     case /* After */7 :
         if (intersect(prev_cat, s._0)) {
           return {
-                  hd: {
-                    TAG: /* TMatch */2,
-                    _0: marks
-                  },
-                  tl: rem
-                };
+            hd: {
+              TAG: /* TMatch */2,
+              _0: marks
+            },
+            tl: rem
+          };
         } else {
           return rem;
         }
@@ -1357,12 +1357,12 @@ function delta_1(marks, c, next_cat, prev_cat, x, rem) {
           pmarks: marks_pmarks$1
         };
         return {
-                hd: {
-                  TAG: /* TMatch */2,
-                  _0: marks$2
-                },
-                tl: rem
-              };
+          hd: {
+            TAG: /* TMatch */2,
+            _0: marks$2
+          },
+          tl: rem
+        };
     
   }
 }
@@ -1411,9 +1411,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 */2 :
           return {
-                  hd: x,
-                  tl: rem$1
-                };
+            hd: x,
+            tl: rem$1
+          };
       
     }
   } else {
@@ -1527,12 +1527,12 @@ function mk_state(ncol, desc) {
   let break_state;
   break_state = /* tag */(typeof match === "number" || typeof match === "string") && match !== /* Failed */0 ? 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) {
@@ -1859,12 +1859,12 @@ function colorize(c, regexp) {
           case /* Beg_of_line */0 :
           case /* End_of_line */1 :
               return split({
-                          hd: [
-                            /* '\n' */10,
-                            /* '\n' */10
-                          ],
-                          tl: /* [] */0
-                        }, c);
+                    hd: [
+                      /* '\n' */10,
+                      /* '\n' */10
+                    ],
+                    tl: /* [] */0
+                  }, c);
           case /* Beg_of_word */2 :
           case /* End_of_word */3 :
           case /* Not_bound */4 :
@@ -1899,13 +1899,13 @@ function colorize(c, regexp) {
               continue ;
           default:
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "re.ml",
-                        502,
-                        35
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "re.ml",
+                    502,
+                    35
+                  ]
+                });
         }
       }
     };
@@ -1928,10 +1928,10 @@ function flatten_cmap(cm) {
     Caml_bytes.set(col_repr, v, Stdlib__Char.chr(i));
   }
   return [
-          c,
-          Stdlib__Bytes.sub(col_repr, 0, v + 1 | 0),
-          v + 1 | 0
-        ];
+    c,
+    Stdlib__Bytes.sub(col_repr, 0, v + 1 | 0),
+    v + 1 | 0
+  ];
 }
 
 function equal$2(_x1, _x2) {
@@ -2178,9 +2178,9 @@ function sequence(l) {
     return l.hd;
   } else {
     return {
-            TAG: /* Sequence */1,
-            _0: l
-          };
+      TAG: /* Sequence */1,
+      _0: l
+    };
   }
 }
 
@@ -2209,27 +2209,27 @@ function merge_sequences(_param) {
                   if (match$2) {
                     if (equal$2(x, match$2.hd)) {
                       return {
+                        hd: {
+                          TAG: /* Sequence */1,
+                          _0: {
+                            hd: x,
+                            tl: {
                               hd: {
-                                TAG: /* Sequence */1,
+                                TAG: /* Alternative */2,
                                 _0: {
-                                  hd: x,
+                                  hd: sequence(y),
                                   tl: {
-                                    hd: {
-                                      TAG: /* Alternative */2,
-                                      _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 {
@@ -2241,15 +2241,15 @@ function merge_sequences(_param) {
               }
               if (exit === 2) {
                 return {
-                        hd: {
-                          TAG: /* Sequence */1,
-                          _0: {
-                            hd: x,
-                            tl: y
-                          }
-                        },
-                        tl: r$p
-                      };
+                  hd: {
+                    TAG: /* Sequence */1,
+                    _0: {
+                      hd: x,
+                      tl: y
+                    }
+                  },
+                  tl: r$p
+                };
               }
               
             }
@@ -2262,9 +2262,9 @@ function merge_sequences(_param) {
       }
     }
     return {
-            hd: l$p,
-            tl: merge_sequences(param.tl)
-          };
+      hd: l$p,
+      tl: merge_sequences(param.tl)
+    };
   };
 }
 
@@ -2286,141 +2286,141 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _s)
         case /* Beg_of_line */0 :
             const c$1 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.newline);
             return [
-                    mk_expr(ids, {
-                          TAG: /* After */7,
-                          _0: c$1
-                        }),
-                    kind
-                  ];
+              mk_expr(ids, {
+                    TAG: /* After */7,
+                    _0: c$1
+                  }),
+              kind
+            ];
         case /* End_of_line */1 :
             const c$2 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.newline);
             return [
-                    mk_expr(ids, {
-                          TAG: /* Before */6,
-                          _0: c$2
-                        }),
-                    kind
-                  ];
+              mk_expr(ids, {
+                    TAG: /* Before */6,
+                    _0: c$2
+                  }),
+              kind
+            ];
         case /* Beg_of_word */2 :
             const c$3 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.not_letter);
             const 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 */7,
-                              _0: c$3
-                            }), mk_expr(ids, {
-                              TAG: /* Before */6,
-                              _0: c$4
-                            })),
-                    kind
-                  ];
+              seq$1(ids, "First", mk_expr(ids, {
+                        TAG: /* After */7,
+                        _0: c$3
+                      }), mk_expr(ids, {
+                        TAG: /* Before */6,
+                        _0: c$4
+                      })),
+              kind
+            ];
         case /* End_of_word */3 :
             const c$5 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.letter);
             const 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 */7,
+                        _0: c$5
+                      }), mk_expr(ids, {
+                        TAG: /* Before */6,
+                        _0: c$6
+                      })),
+              kind
+            ];
+        case /* Not_bound */4 :
+            return [
+              alt(ids, {
+                    hd: seq$1(ids, "First", mk_expr(ids, {
                               TAG: /* After */7,
-                              _0: c$5
+                              _0: Re_automata_Category.letter
                             }), mk_expr(ids, {
                               TAG: /* Before */6,
-                              _0: c$6
+                              _0: Re_automata_Category.letter
                             })),
-                    kind
-                  ];
-        case /* Not_bound */4 :
-            return [
-                    alt(ids, {
-                          hd: seq$1(ids, "First", mk_expr(ids, {
-                                    TAG: /* After */7,
-                                    _0: Re_automata_Category.letter
-                                  }), mk_expr(ids, {
-                                    TAG: /* Before */6,
-                                    _0: Re_automata_Category.letter
-                                  })),
-                          tl: {
-                            hd: seq$1(ids, "First", mk_expr(ids, {
-                                      TAG: /* After */7,
-                                      _0: Re_automata_Category.letter
-                                    }), mk_expr(ids, {
-                                      TAG: /* Before */6,
-                                      _0: Re_automata_Category.letter
-                                    })),
-                            tl: /* [] */0
-                          }
-                        }),
-                    kind
-                  ];
+                    tl: {
+                      hd: seq$1(ids, "First", mk_expr(ids, {
+                                TAG: /* After */7,
+                                _0: Re_automata_Category.letter
+                              }), mk_expr(ids, {
+                                TAG: /* Before */6,
+                                _0: Re_automata_Category.letter
+                              })),
+                      tl: /* [] */0
+                    }
+                  }),
+              kind
+            ];
         case /* Beg_of_str */5 :
             return [
-                    mk_expr(ids, {
-                          TAG: /* After */7,
-                          _0: Re_automata_Category.inexistant
-                        }),
-                    kind
-                  ];
+              mk_expr(ids, {
+                    TAG: /* After */7,
+                    _0: Re_automata_Category.inexistant
+                  }),
+              kind
+            ];
         case /* End_of_str */6 :
             return [
-                    mk_expr(ids, {
-                          TAG: /* Before */6,
-                          _0: Re_automata_Category.inexistant
-                        }),
-                    kind
-                  ];
+              mk_expr(ids, {
+                    TAG: /* Before */6,
+                    _0: Re_automata_Category.inexistant
+                  }),
+              kind
+            ];
         case /* Last_end_of_line */7 :
             const c$7 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.lastnewline);
             return [
-                    mk_expr(ids, {
-                          TAG: /* Before */6,
-                          _0: c$7
-                        }),
-                    kind
-                  ];
+              mk_expr(ids, {
+                    TAG: /* Before */6,
+                    _0: c$7
+                  }),
+              kind
+            ];
         case /* Start */8 :
             return [
-                    mk_expr(ids, {
-                          TAG: /* After */7,
-                          _0: Re_automata_Category.search_boundary
-                        }),
-                    kind
-                  ];
+              mk_expr(ids, {
+                    TAG: /* After */7,
+                    _0: Re_automata_Category.search_boundary
+                  }),
+              kind
+            ];
         case /* Stop */9 :
             return [
-                    mk_expr(ids, {
-                          TAG: /* Before */6,
-                          _0: Re_automata_Category.search_boundary
-                        }),
-                    kind
-                  ];
+              mk_expr(ids, {
+                    TAG: /* Before */6,
+                    _0: Re_automata_Category.search_boundary
+                  }),
+              kind
+            ];
         
       }
     } else {
       switch (s.TAG) {
         case /* Set */0 :
             return [
-                    cst(ids, trans_set(cache, c, s._0)),
-                    kind
-                  ];
+              cst(ids, trans_set(cache, c, s._0)),
+              kind
+            ];
         case /* Sequence */1 :
             return [
-                    trans_seq(ids, kind, ign_group, ign_case, greedy, pos, cache, c, s._0),
-                    kind
-                  ];
+              trans_seq(ids, kind, ign_group, ign_case, greedy, pos, cache, c, s._0),
+              kind
+            ];
         case /* Alternative */2 :
             const merged_sequences = merge_sequences(s._0);
             if (merged_sequences && !merged_sequences.tl) {
               const 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, Stdlib__List.map((function (r$p) {
-                                const match = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r$p);
-                                return enforce_kind(ids, kind, match[1], match[0]);
-                              }), merged_sequences)),
-                    kind
-                  ];
+              alt(ids, Stdlib__List.map((function (r$p) {
+                          const match = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r$p);
+                          return enforce_kind(ids, kind, match[1], match[0]);
+                        }), merged_sequences)),
+              kind
+            ];
         case /* Repeat */3 :
             const j = s._2;
             const i = s._1;
@@ -2431,38 +2431,38 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _s)
             if (j !== undefined) {
               const f = greedy === "Non_greedy" ? (function (rem) {
                     return alt(ids, {
-                                hd: mk_expr(ids, /* Eps */0),
-                                tl: {
-                                  hd: seq$1(ids, kind$p, rename(ids, cr), rem),
-                                  tl: /* [] */0
-                                }
-                              });
+                          hd: mk_expr(ids, /* Eps */0),
+                          tl: {
+                            hd: seq$1(ids, kind$p, rename(ids, cr), rem),
+                            tl: /* [] */0
+                          }
+                        });
                   }) : (function (rem) {
                     return alt(ids, {
-                                hd: seq$1(ids, kind$p, rename(ids, cr), rem),
-                                tl: {
-                                  hd: mk_expr(ids, /* Eps */0),
-                                  tl: /* [] */0
-                                }
-                              });
+                          hd: seq$1(ids, kind$p, rename(ids, cr), rem),
+                          tl: {
+                            hd: mk_expr(ids, /* Eps */0),
+                            tl: /* [] */0
+                          }
+                        });
                   });
               rem = iter(j - i | 0, f, mk_expr(ids, /* Eps */0));
             } else {
               rem = rep(ids, greedy, kind$p, cr);
             }
             return [
-                    iter(i, (function (rem) {
-                            return seq$1(ids, kind$p, rename(ids, cr), rem);
-                          }), rem),
-                    kind
-                  ];
+              iter(i, (function (rem) {
+                      return seq$1(ids, kind$p, rename(ids, cr), rem);
+                    }), rem),
+              kind
+            ];
         case /* Sem */4 :
             const kind$p$1 = s._0;
             const match$2 = translate(ids, kind$p$1, ign_group, ign_case, greedy, pos, cache, c, s._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 */5 :
             _s = s._1;
             _greedy = s._0;
@@ -2477,15 +2477,15 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _s)
             pos.contents = pos.contents + 2 | 0;
             const 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 */4,
-                              _0: p
-                            }), seq$1(ids, "First", match$3[0], mk_expr(ids, {
-                                  TAG: /* Mark */4,
-                                  _0: p + 1 | 0
-                                }))),
-                    match$3[1]
-                  ];
+              seq$1(ids, "First", mk_expr(ids, {
+                        TAG: /* Mark */4,
+                        _0: p
+                      }), seq$1(ids, "First", match$3[0], mk_expr(ids, {
+                            TAG: /* Mark */4,
+                            _0: p + 1 | 0
+                          }))),
+              match$3[1]
+            ];
         case /* No_group */7 :
             _s = s._0;
             _ign_group = true;
@@ -2498,33 +2498,33 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _s)
             const 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 */14 :
             const match$5 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, s._1);
             return [
-                    seq$1(ids, "First", mk_expr(ids, {
-                              TAG: /* Pmark */8,
-                              _0: s._0
-                            }), match$5[0]),
-                    match$5[1]
-                  ];
+              seq$1(ids, "First", mk_expr(ids, {
+                        TAG: /* Pmark */8,
+                        _0: s._0
+                      }), match$5[0]),
+              match$5[1]
+            ];
         default:
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "re.ml",
-                      714,
-                      4
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "re.ml",
+                  714,
+                  4
+                ]
+              });
       }
     }
   };
@@ -2558,25 +2558,25 @@ function case_insens(s) {
 function as_set(s) {
   if (/* tag */typeof s === "number" || typeof s === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "re.ml",
-                747,
-                13
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "re.ml",
+            747,
+            13
+          ]
+        });
   }
   if (s.TAG === /* Set */0) {
     return s._0;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "re.ml",
-              747,
-              13
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "re.ml",
+          747,
+          13
+        ]
+      });
 }
 
 function handle_case(_ign_case, _s) {
@@ -2590,16 +2590,16 @@ function handle_case(_ign_case, _s) {
       case /* Set */0 :
           const s$1 = s._0;
           return {
-                  TAG: /* Set */0,
-                  _0: ign_case ? case_insens(s$1) : s$1
-                };
+            TAG: /* Set */0,
+            _0: ign_case ? case_insens(s$1) : s$1
+          };
       case /* Sequence */1 :
           return {
-                  TAG: /* Sequence */1,
-                  _0: Stdlib__List.map((function (param) {
-                          return handle_case(ign_case, param);
-                        }), s._0)
-                };
+            TAG: /* Sequence */1,
+            _0: Stdlib__List.map((function (param) {
+                    return handle_case(ign_case, param);
+                  }), s._0)
+          };
       case /* Alternative */2 :
           const l$p = Stdlib__List.map((function (param) {
                   return handle_case(ign_case, param);
@@ -2609,34 +2609,34 @@ function handle_case(_ign_case, _s) {
                   _0: l$p
                 })) {
             return {
-                    TAG: /* Set */0,
-                    _0: Stdlib__List.fold_left((function (s, r) {
-                            return union(s, as_set(r));
-                          }), /* [] */0, l$p)
-                  };
+              TAG: /* Set */0,
+              _0: Stdlib__List.fold_left((function (s, r) {
+                      return union(s, as_set(r));
+                    }), /* [] */0, l$p)
+            };
           } else {
             return {
-                    TAG: /* Alternative */2,
-                    _0: l$p
-                  };
+              TAG: /* Alternative */2,
+              _0: l$p
+            };
           }
       case /* Repeat */3 :
           return {
-                  TAG: /* Repeat */3,
-                  _0: handle_case(ign_case, s._0),
-                  _1: s._1,
-                  _2: s._2
-                };
+            TAG: /* Repeat */3,
+            _0: handle_case(ign_case, s._0),
+            _1: s._1,
+            _2: s._2
+          };
       case /* Sem */4 :
           const r$p = handle_case(ign_case, s._1);
           if (is_charset(r$p)) {
             return r$p;
           } else {
             return {
-                    TAG: /* Sem */4,
-                    _0: s._0,
-                    _1: r$p
-                  };
+              TAG: /* Sem */4,
+              _0: s._0,
+              _1: r$p
+            };
           }
       case /* Sem_greedy */5 :
           const r$p$1 = handle_case(ign_case, s._1);
@@ -2644,25 +2644,25 @@ function handle_case(_ign_case, _s) {
             return r$p$1;
           } else {
             return {
-                    TAG: /* Sem_greedy */5,
-                    _0: s._0,
-                    _1: r$p$1
-                  };
+              TAG: /* Sem_greedy */5,
+              _0: s._0,
+              _1: r$p$1
+            };
           }
       case /* Group */6 :
           return {
-                  TAG: /* Group */6,
-                  _0: handle_case(ign_case, s._0)
-                };
+            TAG: /* Group */6,
+            _0: handle_case(ign_case, s._0)
+          };
       case /* No_group */7 :
           const r$p$2 = handle_case(ign_case, s._0);
           if (is_charset(r$p$2)) {
             return r$p$2;
           } else {
             return {
-                    TAG: /* No_group */7,
-                    _0: r$p$2
-                  };
+              TAG: /* No_group */7,
+              _0: r$p$2
+            };
           }
       case /* Nest */8 :
           const r$p$3 = handle_case(ign_case, s._0);
@@ -2670,9 +2670,9 @@ function handle_case(_ign_case, _s) {
             return r$p$3;
           } else {
             return {
-                    TAG: /* Nest */8,
-                    _0: r$p$3
-                  };
+              TAG: /* Nest */8,
+              _0: r$p$3
+            };
           }
       case /* Case */9 :
           _s = s._0;
@@ -2687,32 +2687,32 @@ function handle_case(_ign_case, _s) {
                   return handle_case(ign_case, r);
                 }), s._0);
           return {
-                  TAG: /* Set */0,
-                  _0: Stdlib__List.fold_left((function (s, r) {
-                          return inter(s, as_set(r));
-                        }), cany, l$p$1)
-                };
+            TAG: /* Set */0,
+            _0: Stdlib__List.fold_left((function (s, r) {
+                    return inter(s, as_set(r));
+                  }), cany, l$p$1)
+          };
       case /* Complement */12 :
           const l$p$2 = Stdlib__List.map((function (r) {
                   return handle_case(ign_case, r);
                 }), s._0);
           return {
-                  TAG: /* Set */0,
-                  _0: diff(cany, Stdlib__List.fold_left((function (s, r) {
-                              return union(s, as_set(r));
-                            }), /* [] */0, l$p$2))
-                };
+            TAG: /* Set */0,
+            _0: diff(cany, Stdlib__List.fold_left((function (s, r) {
+                        return union(s, as_set(r));
+                      }), /* [] */0, l$p$2))
+          };
       case /* Difference */13 :
           return {
-                  TAG: /* Set */0,
-                  _0: inter(as_set(handle_case(ign_case, s._0)), diff(cany, as_set(handle_case(ign_case, s._1))))
-                };
+            TAG: /* Set */0,
+            _0: inter(as_set(handle_case(ign_case, s._0)), diff(cany, as_set(handle_case(ign_case, s._1))))
+          };
       case /* Pmark */14 :
           return {
-                  TAG: /* Pmark */14,
-                  _0: s._0,
-                  _1: handle_case(ign_case, s._1)
-                };
+            TAG: /* Pmark */14,
+            _0: s._0,
+            _1: handle_case(ign_case, s._1)
+          };
       
     }
   };
@@ -2765,9 +2765,9 @@ function alt$1(l) {
     return l.hd;
   } else {
     return {
-            TAG: /* Alternative */2,
-            _0: l
-          };
+      TAG: /* Alternative */2,
+      _0: l
+    };
   }
 }
 
@@ -2776,9 +2776,9 @@ function seq$2(l) {
     return l.hd;
   } else {
     return {
-            TAG: /* Sequence */1,
-            _0: l
-          };
+      TAG: /* Sequence */1,
+      _0: l
+    };
   }
 }
 
@@ -2790,22 +2790,22 @@ const epsilon = {
 function repn(r, i, j) {
   if (i < 0) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Re.repn"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Re.repn"
+        });
   }
   if (j !== undefined && j < i) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Re.repn"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Re.repn"
+        });
   }
   return {
-          TAG: /* Repeat */3,
-          _0: r,
-          _1: i,
-          _2: j
-        };
+    TAG: /* Repeat */3,
+    _0: r,
+    _1: i,
+    _2: j
+  };
 }
 
 function set(str) {
@@ -2814,9 +2814,9 @@ function set(str) {
     s = union(single(Caml_string.get(str, i)), s);
   }
   return {
-          TAG: /* Set */0,
-          _0: s
-        };
+    TAG: /* Set */0,
+    _0: s
+  };
 }
 
 function compl(l) {
@@ -2828,9 +2828,9 @@ function compl(l) {
     return r;
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Re.compl"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Re.compl"
+      });
 }
 
 const any = {
@@ -3125,9 +3125,9 @@ const xdigit = alt$1({
 
 function compile(r) {
   let regexp = anchored(r) ? ({
-        TAG: /* Group */6,
-        _0: r
-      }) : seq$2({
+      TAG: /* Group */6,
+      _0: r
+    }) : seq$2({
           hd: {
             TAG: /* Sem */4,
             _0: "Shortest",
@@ -3162,18 +3162,18 @@ function compile(r) {
   let col_repr = match[1];
   let 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) {
@@ -3181,9 +3181,9 @@ function exec_internal(name, posOpt, lenOpt, groups, re, s) {
   const len = lenOpt !== undefined ? lenOpt : -1;
   if (pos < 0 || len < -1 || (pos + len | 0) > s.length) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: name
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: name
+        });
   }
   let partial = false;
   const slen = s.length;
@@ -3235,36 +3235,36 @@ function exec_internal(name, posOpt, lenOpt, groups, re, s) {
     }
   } else {
     return {
-            TAG: /* Match */0,
-            _0: {
-              s: s,
-              marks: res._0,
-              pmarks: res._1,
-              gpos: info.positions,
-              gcount: re.group_count
-            }
-          };
+      TAG: /* Match */0,
+      _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 new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   }
   const m1 = Caml_array.get(t.marks, (i << 1));
   if (m1 === -1) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   }
   const p1 = Caml_array.get(t.gpos, m1) - 1 | 0;
   const 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) {
@@ -3308,9 +3308,9 @@ function posix_class_of_string(class_) {
     default:
       const s = "Invalid pcre class: " + class_;
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: s
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: s
+          });
   }
 }
 
@@ -3340,15 +3340,15 @@ 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 new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                      MEL_EXN_ID: Stdlib.Exit
-                    });
+                  MEL_EXN_ID: Stdlib.Exit
+                });
           }
           
         }
         catch (exn){
           throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                    MEL_EXN_ID: Stdlib.Exit
-                  });
+                MEL_EXN_ID: Stdlib.Exit
+              });
         }
       }
       i.contents = i.contents + len | 0;
@@ -3372,16 +3372,16 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
     const gr$1 = ungreedy ? !gr : gr;
     if (gr$1) {
       return {
-              TAG: /* Sem_greedy */5,
-              _0: "Non_greedy",
-              _1: r
-            };
+        TAG: /* Sem_greedy */5,
+        _0: "Non_greedy",
+        _1: r
+      };
     } else {
       return {
-              TAG: /* Sem_greedy */5,
-              _0: "Greedy",
-              _1: r
-            };
+        TAG: /* Sem_greedy */5,
+        _0: "Greedy",
+        _1: r
+      };
     }
   };
   const atom = function (param) {
@@ -3398,8 +3398,8 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
           const r = regexp$p(branch$p(/* [] */0));
           if (!accept(/* ')' */41)) {
             throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                      MEL_EXN_ID: Parse_error
-                    });
+                  MEL_EXN_ID: Parse_error
+                });
           }
           return r;
         }
@@ -3415,19 +3415,19 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
           };
         }
         throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                  MEL_EXN_ID: Parse_error
-                });
+              MEL_EXN_ID: Parse_error
+            });
       }
       const r$1 = regexp$p(branch$p(/* [] */0));
       if (!accept(/* ')' */41)) {
         throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                  MEL_EXN_ID: Parse_error
-                });
+              MEL_EXN_ID: Parse_error
+            });
       }
       return {
-              TAG: /* Group */6,
-              _0: r$1
-            };
+        TAG: /* Group */6,
+        _0: r$1
+      };
     }
     if (accept(/* '^' */94)) {
       if (multiline) {
@@ -3455,8 +3455,8 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
     if (accept(/* '\\' */92)) {
       if (i.contents === l) {
         throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                  MEL_EXN_ID: Parse_error
-                });
+              MEL_EXN_ID: Parse_error
+            });
       }
       const c = get(undefined);
       switch (c) {
@@ -3471,41 +3471,41 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
         case 56 :
         case 57 :
             throw new Caml_js_exceptions.MelangeError(Not_supported, {
-                      MEL_EXN_ID: Not_supported
-                    });
+                  MEL_EXN_ID: Not_supported
+                });
         case 65 :
             return /* Beg_of_str */5;
         case 66 :
             return /* Not_bound */4;
         case 68 :
             return compl({
-                        hd: digit,
-                        tl: /* [] */0
-                      });
+                  hd: digit,
+                  tl: /* [] */0
+                });
         case 71 :
             return /* Start */8;
         case 83 :
             return compl({
-                        hd: space,
-                        tl: /* [] */0
-                      });
+                  hd: space,
+                  tl: /* [] */0
+                });
         case 87 :
             return compl({
-                        hd: alnum,
-                        tl: {
-                          hd: {
-                            TAG: /* Set */0,
-                            _0: {
-                              hd: [
-                                /* '_' */95,
-                                /* '_' */95
-                              ],
-                              tl: /* [] */0
-                            }
-                          },
-                          tl: /* [] */0
-                        }
-                      });
+                  hd: alnum,
+                  tl: {
+                    hd: {
+                      TAG: /* Set */0,
+                      _0: {
+                        hd: [
+                          /* '_' */95,
+                          /* '_' */95
+                        ],
+                        tl: /* [] */0
+                      }
+                    },
+                    tl: /* [] */0
+                  }
+                });
         case 90 :
             return /* Last_end_of_line */7;
         case 58 :
@@ -3522,38 +3522,38 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
         case 95 :
         case 96 :
             return {
-                    TAG: /* Set */0,
-                    _0: single(c)
-                  };
+              TAG: /* Set */0,
+              _0: single(c)
+            };
         case 98 :
             return alt$1({
-                        hd: /* Beg_of_word */2,
-                        tl: {
-                          hd: /* End_of_word */3,
-                          tl: /* [] */0
-                        }
-                      });
+                  hd: /* Beg_of_word */2,
+                  tl: {
+                    hd: /* End_of_word */3,
+                    tl: /* [] */0
+                  }
+                });
         case 100 :
             return digit;
         case 115 :
             return space;
         case 119 :
             return alt$1({
-                        hd: alnum,
-                        tl: {
-                          hd: {
-                            TAG: /* Set */0,
-                            _0: {
-                              hd: [
-                                /* '_' */95,
-                                /* '_' */95
-                              ],
-                              tl: /* [] */0
-                            }
-                          },
-                          tl: /* [] */0
-                        }
-                      });
+                  hd: alnum,
+                  tl: {
+                    hd: {
+                      TAG: /* Set */0,
+                      _0: {
+                        hd: [
+                          /* '_' */95,
+                          /* '_' */95
+                        ],
+                        tl: /* [] */0
+                      }
+                    },
+                    tl: /* [] */0
+                  }
+                });
         case 67 :
         case 69 :
         case 70 :
@@ -3595,59 +3595,59 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
         case 120 :
         case 121 :
             throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                      MEL_EXN_ID: Parse_error
-                    });
+                  MEL_EXN_ID: Parse_error
+                });
         case 122 :
             return /* End_of_str */6;
         default:
           return {
-                  TAG: /* Set */0,
-                  _0: single(c)
-                };
+            TAG: /* Set */0,
+            _0: single(c)
+          };
       }
     } else {
       if (i.contents === l) {
         throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                  MEL_EXN_ID: Parse_error
-                });
+              MEL_EXN_ID: Parse_error
+            });
       }
       const c$1 = get(undefined);
       if (c$1 >= 64) {
         if (c$1 !== 92) {
           if (c$1 !== 123) {
             return {
-                    TAG: /* Set */0,
-                    _0: single(c$1)
-                  };
+              TAG: /* Set */0,
+              _0: single(c$1)
+            };
           }
           throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                    MEL_EXN_ID: Parse_error
-                  });
+                MEL_EXN_ID: Parse_error
+              });
         }
         throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                  MEL_EXN_ID: Parse_error
-                });
+              MEL_EXN_ID: Parse_error
+            });
       }
       if (c$1 >= 44) {
         if (c$1 >= 63) {
           throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                    MEL_EXN_ID: Parse_error
-                  });
+                MEL_EXN_ID: Parse_error
+              });
         }
         return {
-                TAG: /* Set */0,
-                _0: single(c$1)
-              };
+          TAG: /* Set */0,
+          _0: single(c$1)
+        };
       }
       if (c$1 >= 42) {
         throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                  MEL_EXN_ID: Parse_error
-                });
+              MEL_EXN_ID: Parse_error
+            });
       }
       return {
-              TAG: /* Set */0,
-              _0: single(c$1)
-            };
+        TAG: /* Set */0,
+        _0: single(c$1)
+      };
     }
   };
   const integer = function (param) {
@@ -3673,8 +3673,8 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
         const i$p = Math.imul(10, i$1) + (d$1 - /* '0' */48 | 0) | 0;
         if (i$p < i$1) {
           throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                    MEL_EXN_ID: Parse_error
-                  });
+                MEL_EXN_ID: Parse_error
+              });
         }
         _i = i$p;
         continue ;
@@ -3722,49 +3722,49 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
         if (accept(/* '-' */45)) {
           if (accept(/* ']' */93)) {
             return {
-                    hd: {
-                      TAG: /* Set */0,
-                      _0: single(c)
-                    },
-                    tl: {
-                      hd: {
-                        TAG: /* Set */0,
-                        _0: {
-                          hd: [
-                            /* '-' */45,
-                            /* '-' */45
-                          ],
-                          tl: /* [] */0
-                        }
-                      },
-                      tl: s
-                    }
-                  };
+              hd: {
+                TAG: /* Set */0,
+                _0: single(c)
+              },
+              tl: {
+                hd: {
+                  TAG: /* Set */0,
+                  _0: {
+                    hd: [
+                      /* '-' */45,
+                      /* '-' */45
+                    ],
+                    tl: /* [] */0
+                  }
+                },
+                tl: s
+              }
+            };
           }
           const match$1 = $$char(undefined);
           if (match$1.NAME !== "Char") {
             return {
-                    hd: {
-                      TAG: /* Set */0,
-                      _0: single(c)
-                    },
-                    tl: {
-                      hd: {
-                        TAG: /* Set */0,
-                        _0: {
-                          hd: [
-                            /* '-' */45,
-                            /* '-' */45
-                          ],
-                          tl: /* [] */0
-                        }
-                      },
-                      tl: {
-                        hd: match$1.VAL,
-                        tl: s
-                      }
-                    }
-                  };
+              hd: {
+                TAG: /* Set */0,
+                _0: single(c)
+              },
+              tl: {
+                hd: {
+                  TAG: /* Set */0,
+                  _0: {
+                    hd: [
+                      /* '-' */45,
+                      /* '-' */45
+                    ],
+                    tl: /* [] */0
+                  }
+                },
+                tl: {
+                  hd: match$1.VAL,
+                  tl: s
+                }
+              }
+            };
           }
           _s = {
             hd: {
@@ -3810,13 +3810,13 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
       const j = accept(/* ',' */44) ? integer(undefined) : i$1;
       if (!accept(/* '}' */125)) {
         throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                  MEL_EXN_ID: Parse_error
-                });
+              MEL_EXN_ID: Parse_error
+            });
       }
       if (j !== undefined && j < i$1) {
         throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                  MEL_EXN_ID: Parse_error
-                });
+              MEL_EXN_ID: Parse_error
+            });
       }
       return greedy_mod(repn(r, i$1, j));
     }
@@ -3826,15 +3826,15 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
   const $$char = function (param) {
     if (i.contents === l) {
       throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                MEL_EXN_ID: Parse_error
-              });
+            MEL_EXN_ID: Parse_error
+          });
     }
     const c = get(undefined);
     if (c === /* '[' */91) {
       if (accept(/* '=' */61)) {
         throw new Caml_js_exceptions.MelangeError(Not_supported, {
-                  MEL_EXN_ID: Not_supported
-                });
+              MEL_EXN_ID: Not_supported
+            });
       }
       if (accept(/* ':' */58)) {
         const compl$1 = accept(/* '^' */94);
@@ -3885,15 +3885,15 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
           const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
           if (exn.MEL_EXN_ID === Stdlib.Not_found) {
             throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                      MEL_EXN_ID: Parse_error
-                    });
+                  MEL_EXN_ID: Parse_error
+                });
           }
           throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
         }
         if (!accept_s(":]")) {
           throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                    MEL_EXN_ID: Parse_error
-                  });
+                MEL_EXN_ID: Parse_error
+              });
         }
         const posix_class = posix_class_of_string(cls);
         const re = compl$1 ? compl({
@@ -3901,88 +3901,88 @@ 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 new Caml_js_exceptions.MelangeError(Parse_error, {
-                  MEL_EXN_ID: Parse_error
-                });
+              MEL_EXN_ID: Parse_error
+            });
       }
       const c$1 = get(undefined);
       if (!accept(/* '.' */46)) {
         throw new Caml_js_exceptions.MelangeError(Not_supported, {
-                  MEL_EXN_ID: Not_supported
-                });
+              MEL_EXN_ID: Not_supported
+            });
       }
       if (!accept(/* ']' */93)) {
         throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                  MEL_EXN_ID: Parse_error
-                });
+              MEL_EXN_ID: Parse_error
+            });
       }
       return {
-              NAME: "Char",
-              VAL: c$1
-            };
+        NAME: "Char",
+        VAL: c$1
+      };
     }
     if (c !== /* '\\' */92) {
       return {
-              NAME: "Char",
-              VAL: c
-            };
+        NAME: "Char",
+        VAL: c
+      };
     }
     const c$2 = get(undefined);
     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,
-                              _0: {
-                                hd: [
-                                  /* '_' */95,
-                                  /* '_' */95
-                                ],
-                                tl: /* [] */0
-                              }
-                            },
-                            tl: /* [] */0
-                          }
-                        })
-                  };
+              NAME: "Set",
+              VAL: compl({
+                    hd: alnum,
+                    tl: {
+                      hd: {
+                        TAG: /* Set */0,
+                        _0: {
+                          hd: [
+                            /* '_' */95,
+                            /* '_' */95
+                          ],
+                          tl: /* [] */0
+                        }
+                      },
+                      tl: /* [] */0
+                    }
+                  })
+            };
         case 58 :
         case 59 :
         case 60 :
@@ -3997,59 +3997,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,
-                              _0: {
-                                hd: [
-                                  /* '_' */95,
-                                  /* '_' */95
-                                ],
-                                tl: /* [] */0
-                              }
-                            },
-                            tl: /* [] */0
-                          }
-                        })
-                  };
+              NAME: "Set",
+              VAL: alt$1({
+                    hd: alnum,
+                    tl: {
+                      hd: {
+                        TAG: /* Set */0,
+                        _0: {
+                          hd: [
+                            /* '_' */95,
+                            /* '_' */95
+                          ],
+                          tl: /* [] */0
+                        }
+                      },
+                      tl: /* [] */0
+                    }
+                  })
+            };
         case 65 :
         case 66 :
         case 67 :
@@ -4093,27 +4093,27 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
         case 121 :
         case 122 :
             throw new Caml_js_exceptions.MelangeError(Parse_error, {
-                      MEL_EXN_ID: Parse_error
-                    });
+                  MEL_EXN_ID: Parse_error
+                });
         
       }
     } else {
       if (c$2 >= 48) {
         throw new Caml_js_exceptions.MelangeError(Not_supported, {
-                  MEL_EXN_ID: Not_supported
-                });
+              MEL_EXN_ID: Not_supported
+            });
       }
       return {
-              NAME: "Char",
-              VAL: c$2
-            };
+        NAME: "Char",
+        VAL: c$2
+      };
     }
   };
   const res = regexp$p(branch$p(/* [] */0));
   if (i.contents !== l) {
     throw new Caml_js_exceptions.MelangeError(Parse_error, {
-              MEL_EXN_ID: Parse_error
-            });
+          MEL_EXN_ID: Parse_error
+        });
   }
   return res;
 }
@@ -4141,9 +4141,9 @@ function re(flagsOpt, pat) {
         }) : r;
   if (Stdlib__List.memq("Caseless", opts$1)) {
     return {
-            TAG: /* No_case */10,
-            _0: r$1
-          };
+      TAG: /* No_case */10,
+      _0: r$1
+    };
   } else {
     return r$1;
   }
@@ -4157,12 +4157,12 @@ function exec(rex, pos, s) {
   }
   if (substr === /* Failed */0) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   }
   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-            MEL_EXN_ID: Stdlib.Not_found
-          });
+        MEL_EXN_ID: Stdlib.Not_found
+      });
 }
 
 const s = Caml_bytes.bytes_to_string(Stdlib__Bytes.make(1048575, /* 'a' */97)) + "b";
diff --git a/jscomp/test/dist/jscomp/test/ocaml_typedtree_test.js b/jscomp/test/dist/jscomp/test/ocaml_typedtree_test.js
index 78776c583..d05809315 100644
--- a/jscomp/test/dist/jscomp/test/ocaml_typedtree_test.js
+++ b/jscomp/test/dist/jscomp/test/ocaml_typedtree_test.js
@@ -166,8 +166,8 @@ function fatal_error(msg) {
   Stdlib.prerr_string(">> Fatal error: ");
   console.error(msg);
   throw new Caml_js_exceptions.MelangeError(Fatal_error, {
-            MEL_EXN_ID: Fatal_error
-          });
+        MEL_EXN_ID: Fatal_error
+      });
 }
 
 function try_finally(work, cleanup) {
@@ -186,9 +186,9 @@ function try_finally(work, cleanup) {
 function map_end(f, l1, l2) {
   if (l1) {
     return {
-            hd: Curry._1(f, l1.hd),
-            tl: map_end(f, l1.tl, l2)
-          };
+      hd: Curry._1(f, l1.hd),
+      tl: map_end(f, l1.tl, l2)
+    };
   } else {
     return l2;
   }
@@ -222,9 +222,9 @@ function replicate_list(elem, n) {
     return /* [] */0;
   } else {
     return {
-            hd: elem,
-            tl: replicate_list(elem, n - 1 | 0)
-          };
+      hd: elem,
+      tl: replicate_list(elem, n - 1 | 0)
+    };
   }
 }
 
@@ -233,27 +233,27 @@ function split_last(param) {
     const x = param.hd;
     if (!param.tl) {
       return [
-              /* [] */0,
-              x
-            ];
+        /* [] */0,
+        x
+      ];
     }
     const match = split_last(param.tl);
     return [
-            {
-              hd: x,
-              tl: match[0]
-            },
-            match[1]
-          ];
+      {
+        hd: x,
+        tl: match[0]
+      },
+      match[1]
+    ];
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              817,
-              10
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          817,
+          10
+        ]
+      });
 }
 
 function may(f, x) {
@@ -289,8 +289,8 @@ function find_in_path_uncap(path, name) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   };
 }
 
@@ -457,48 +457,48 @@ function style_of_tag(s) {
     switch (s._1) {
       case "dim" :
           return {
-                  hd: /* Dim */2,
-                  tl: /* [] */0
-                };
+            hd: /* Dim */2,
+            tl: /* [] */0
+          };
       case "error" :
           return cur_styles.contents.error;
       case "filename" :
           return {
-                  hd: {
-                    TAG: /* FG */0,
-                    _0: /* Cyan */6
-                  },
-                  tl: /* [] */0
-                };
+            hd: {
+              TAG: /* FG */0,
+              _0: /* Cyan */6
+            },
+            tl: /* [] */0
+          };
       case "info" :
           return {
-                  hd: /* Bold */0,
-                  tl: {
-                    hd: {
-                      TAG: /* FG */0,
-                      _0: /* Yellow */3
-                    },
-                    tl: /* [] */0
-                  }
-                };
+            hd: /* Bold */0,
+            tl: {
+              hd: {
+                TAG: /* FG */0,
+                _0: /* Yellow */3
+              },
+              tl: /* [] */0
+            }
+          };
       case "loc" :
           return cur_styles.contents.loc;
       case "warning" :
           return cur_styles.contents.warning;
       default:
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     }
   } else {
     throw new Caml_js_exceptions.MelangeError("Match_failure", {
-              MEL_EXN_ID: "Match_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                1191,
-                19
-              ]
-            });
+          MEL_EXN_ID: "Match_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            1191,
+            19
+          ]
+        });
   }
 }
 
@@ -532,9 +532,9 @@ function set_color_tag_handling(ppf) {
       style_of_tag(param);
       if (color_enabled.contents) {
         return ansi_of_style_l({
-                    hd: /* Reset */1,
-                    tl: /* [] */0
-                  });
+              hd: /* Reset */1,
+              tl: /* [] */0
+            });
       } else {
         return "";
       }
@@ -735,9 +735,9 @@ function loop(i) {
     return /* [] */0;
   } else {
     return {
-            hd: i,
-            tl: loop(i - 1 | 0)
-          };
+      hd: i,
+      tl: loop(i - 1 | 0)
+    };
   }
 }
 
@@ -749,91 +749,91 @@ function letter(param) {
         return letter_all;
     case 99 :
         return {
-                hd: 1,
-                tl: {
-                  hd: 2,
-                  tl: /* [] */0
-                }
-              };
+          hd: 1,
+          tl: {
+            hd: 2,
+            tl: /* [] */0
+          }
+        };
     case 100 :
         return {
-                hd: 3,
-                tl: /* [] */0
-              };
+          hd: 3,
+          tl: /* [] */0
+        };
     case 101 :
         return {
-                hd: 4,
-                tl: /* [] */0
-              };
+          hd: 4,
+          tl: /* [] */0
+        };
     case 102 :
         return {
-                hd: 5,
-                tl: /* [] */0
-              };
+          hd: 5,
+          tl: /* [] */0
+        };
     case 107 :
         return {
-                hd: 32,
+          hd: 32,
+          tl: {
+            hd: 33,
+            tl: {
+              hd: 34,
+              tl: {
+                hd: 35,
                 tl: {
-                  hd: 33,
+                  hd: 36,
                   tl: {
-                    hd: 34,
+                    hd: 37,
                     tl: {
-                      hd: 35,
+                      hd: 38,
                       tl: {
-                        hd: 36,
-                        tl: {
-                          hd: 37,
-                          tl: {
-                            hd: 38,
-                            tl: {
-                              hd: 39,
-                              tl: /* [] */0
-                            }
-                          }
-                        }
+                        hd: 39,
+                        tl: /* [] */0
                       }
                     }
                   }
                 }
-              };
+              }
+            }
+          }
+        };
     case 108 :
         return {
-                hd: 6,
-                tl: /* [] */0
-              };
+          hd: 6,
+          tl: /* [] */0
+        };
     case 109 :
         return {
-                hd: 7,
-                tl: /* [] */0
-              };
+          hd: 7,
+          tl: /* [] */0
+        };
     case 112 :
         return {
-                hd: 8,
-                tl: /* [] */0
-              };
+          hd: 8,
+          tl: /* [] */0
+        };
     case 114 :
         return {
-                hd: 9,
-                tl: /* [] */0
-              };
+          hd: 9,
+          tl: /* [] */0
+        };
     case 115 :
         return {
-                hd: 10,
-                tl: /* [] */0
-              };
+          hd: 10,
+          tl: /* [] */0
+        };
     case 117 :
         return {
-                hd: 11,
-                tl: {
-                  hd: 12,
-                  tl: /* [] */0
-                }
-              };
+          hd: 11,
+          tl: {
+            hd: 12,
+            tl: /* [] */0
+          }
+        };
     case 118 :
         return {
-                hd: 13,
-                tl: /* [] */0
-              };
+          hd: 13,
+          tl: /* [] */0
+        };
     case 98 :
     case 103 :
     case 104 :
@@ -847,35 +847,32 @@ function letter(param) {
         return /* [] */0;
     case 120 :
         return {
-                hd: 14,
+          hd: 14,
+          tl: {
+            hd: 15,
+            tl: {
+              hd: 16,
+              tl: {
+                hd: 17,
                 tl: {
-                  hd: 15,
+                  hd: 18,
                   tl: {
-                    hd: 16,
+                    hd: 19,
                     tl: {
-                      hd: 17,
+                      hd: 20,
                       tl: {
-                        hd: 18,
+                        hd: 21,
                         tl: {
-                          hd: 19,
+                          hd: 22,
                           tl: {
-                            hd: 20,
+                            hd: 23,
                             tl: {
-                              hd: 21,
+                              hd: 24,
                               tl: {
-                                hd: 22,
+                                hd: 25,
                                 tl: {
-                                  hd: 23,
-                                  tl: {
-                                    hd: 24,
-                                    tl: {
-                                      hd: 25,
-                                      tl: {
-                                        hd: 30,
-                                        tl: /* [] */0
-                                      }
-                                    }
-                                  }
+                                  hd: 30,
+                                  tl: /* [] */0
                                 }
                               }
                             }
@@ -885,26 +882,29 @@ function letter(param) {
                     }
                   }
                 }
-              };
+              }
+            }
+          }
+        };
     case 121 :
         return {
-                hd: 26,
-                tl: /* [] */0
-              };
+          hd: 26,
+          tl: /* [] */0
+        };
     case 122 :
         return {
-                hd: 27,
-                tl: /* [] */0
-              };
+          hd: 27,
+          tl: /* [] */0
+        };
     default:
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  1587,
-                  9
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              1587,
+              9
+            ]
+          });
   }
 }
 
@@ -936,16 +936,16 @@ function parse_opt(error, active, flags, s) {
       const n = _n;
       if (i >= s.length) {
         return [
-                i,
-                n
-              ];
+          i,
+          n
+        ];
       }
       const match = Caml_string.get(s, i);
       if (match > 57 || match < 48) {
         return [
-                i,
-                n
-              ];
+          i,
+          n
+        ];
       }
       _i = i + 1 | 0;
       _n = (Math.imul(10, n) + Caml_string.get(s, i) | 0) - /* '0' */48 | 0;
@@ -958,24 +958,24 @@ function parse_opt(error, active, flags, s) {
     const i$1 = match[0];
     if (!((i$1 + 2 | 0) < s.length && Caml_string.get(s, i$1) === /* '.' */46 && Caml_string.get(s, i$1 + 1 | 0) === /* '.' */46)) {
       return [
-              i$1,
-              n1,
-              n1
-            ];
+        i$1,
+        n1,
+        n1
+      ];
     }
     const match$1 = get_num(0, i$1 + 2 | 0);
     const n2 = match$1[1];
     if (n2 < n1) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                MEL_EXN_ID: Stdlib__Arg.Bad,
-                _1: "Ill-formed list of warnings"
-              });
+            MEL_EXN_ID: Stdlib__Arg.Bad,
+            _1: "Ill-formed list of warnings"
+          });
     }
     return [
-            match$1[0],
-            n1,
-            n2
-          ];
+      match$1[0],
+      n1,
+      n2
+    ];
   };
   const loop = function (_i) {
     while(true) {
@@ -988,9 +988,9 @@ function parse_opt(error, active, flags, s) {
         if (c >= 97) {
           if (c >= 123) {
             throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                      MEL_EXN_ID: Stdlib__Arg.Bad,
-                      _1: "Ill-formed list of warnings"
-                    });
+                  MEL_EXN_ID: Stdlib__Arg.Bad,
+                  _1: "Ill-formed list of warnings"
+                });
           }
           Stdlib__List.iter(clear, letter(Caml_string.get(s, i)));
           _i = i + 1 | 0;
@@ -998,9 +998,9 @@ function parse_opt(error, active, flags, s) {
         }
         if (c >= 91) {
           throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                    MEL_EXN_ID: Stdlib__Arg.Bad,
-                    _1: "Ill-formed list of warnings"
-                  });
+                MEL_EXN_ID: Stdlib__Arg.Bad,
+                _1: "Ill-formed list of warnings"
+              });
         }
         Stdlib__List.iter(set, letter(Stdlib__Char.lowercase_ascii(Caml_string.get(s, i))));
         _i = i + 1 | 0;
@@ -1011,9 +1011,9 @@ function parse_opt(error, active, flags, s) {
           return loop_letter_num(set_all, i + 1 | 0);
         }
         throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                  MEL_EXN_ID: Stdlib__Arg.Bad,
-                  _1: "Ill-formed list of warnings"
-                });
+              MEL_EXN_ID: Stdlib__Arg.Bad,
+              _1: "Ill-formed list of warnings"
+            });
       }
       if (c >= 43) {
         switch (c) {
@@ -1021,54 +1021,54 @@ function parse_opt(error, active, flags, s) {
               return loop_letter_num(set, i + 1 | 0);
           case 44 :
               throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                        MEL_EXN_ID: Stdlib__Arg.Bad,
-                        _1: "Ill-formed list of warnings"
-                      });
+                    MEL_EXN_ID: Stdlib__Arg.Bad,
+                    _1: "Ill-formed list of warnings"
+                  });
           case 45 :
               return loop_letter_num(clear, i + 1 | 0);
           
         }
       } else {
         throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                  MEL_EXN_ID: Stdlib__Arg.Bad,
-                  _1: "Ill-formed list of warnings"
-                });
+              MEL_EXN_ID: Stdlib__Arg.Bad,
+              _1: "Ill-formed list of warnings"
+            });
       }
     };
   };
   const loop_letter_num = function (myset, i) {
     if (i >= s.length) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                MEL_EXN_ID: Stdlib__Arg.Bad,
-                _1: "Ill-formed list of warnings"
-              });
+            MEL_EXN_ID: Stdlib__Arg.Bad,
+            _1: "Ill-formed list of warnings"
+          });
     }
     const match = Caml_string.get(s, i);
     if (match >= 65) {
       if (match >= 97) {
         if (match >= 123) {
           throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                    MEL_EXN_ID: Stdlib__Arg.Bad,
-                    _1: "Ill-formed list of warnings"
-                  });
+                MEL_EXN_ID: Stdlib__Arg.Bad,
+                _1: "Ill-formed list of warnings"
+              });
         }
         Stdlib__List.iter(myset, letter(Caml_string.get(s, i)));
         return loop(i + 1 | 0);
       }
       if (match >= 91) {
         throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                  MEL_EXN_ID: Stdlib__Arg.Bad,
-                  _1: "Ill-formed list of warnings"
-                });
+              MEL_EXN_ID: Stdlib__Arg.Bad,
+              _1: "Ill-formed list of warnings"
+            });
       }
       Stdlib__List.iter(myset, letter(Stdlib__Char.lowercase_ascii(Caml_string.get(s, i))));
       return loop(i + 1 | 0);
     }
     if (match > 57 || match < 48) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                MEL_EXN_ID: Stdlib__Arg.Bad,
-                _1: "Ill-formed list of warnings"
-              });
+            MEL_EXN_ID: Stdlib__Arg.Bad,
+            _1: "Ill-formed list of warnings"
+          });
     }
     const match$1 = get_range(i);
     for (let n = match$1[1] ,n_finish = Caml.caml_int_min(match$1[2], 104); n <= n_finish; ++n) {
@@ -1149,27 +1149,27 @@ function message(s) {
             const lab = match.hd;
             if (match.tl) {
               return Stdlib__String.concat(" ", {
-                          hd: "the following methods are overridden by the class",
-                          tl: {
-                            hd: lab,
-                            tl: {
-                              hd: ":\n ",
-                              tl: match.tl
-                            }
-                          }
-                        });
+                    hd: "the following methods are overridden by the class",
+                    tl: {
+                      hd: lab,
+                      tl: {
+                        hd: ":\n ",
+                        tl: match.tl
+                      }
+                    }
+                  });
             } else {
               return "the method " + (lab + " is overridden.");
             }
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      1694,
-                      26
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  1694,
+                  26
+                ]
+              });
       case /* Partial_match */3 :
           const s$2 = s._0;
           if (s$2 === "") {
@@ -1185,27 +1185,27 @@ function message(s) {
             const lab$1 = match$1.hd;
             if (match$1.tl) {
               return Stdlib__String.concat(" ", {
-                          hd: "the following instance variables are overridden by the class",
-                          tl: {
-                            hd: lab$1,
-                            tl: {
-                              hd: ":\n ",
-                              tl: match$1.tl
-                            }
-                          }
-                        }) + "\nThe behaviour changed in ocaml 3.10 (previous behaviour was hiding.)";
+                    hd: "the following instance variables are overridden by the class",
+                    tl: {
+                      hd: lab$1,
+                      tl: {
+                        hd: ":\n ",
+                        tl: match$1.tl
+                      }
+                    }
+                  }) + "\nThe behaviour changed in ocaml 3.10 (previous behaviour was hiding.)";
             } else {
               return "the instance variable " + (lab$1 + " is overridden.\nThe behaviour changed in ocaml 3.10 (previous behaviour was hiding.)");
             }
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      1714,
-                      37
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  1714,
+                  37
+                ]
+              });
       case /* Implicit_public_methods */6 :
           return "the following private methods were made public implicitly:\n " + (Stdlib__String.concat(" ", s._0) + ".");
       case /* Undeclared_virtual_method */7 :
@@ -1223,76 +1223,76 @@ function message(s) {
           return "unused variable " + (s._0 + ".");
       case /* Duplicate_definitions */14 :
           return Curry._4(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "the ",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "the ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                              TAG: /* String_literal */11,
+                              _0: " is defined in both types ",
                               _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
                                 _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
+                                  TAG: /* String_literal */11,
+                                  _0: " and ",
                                   _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " is defined in both types ",
+                                    TAG: /* String */2,
+                                    _0: /* No_padding */0,
                                     _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: {
-                                        TAG: /* String_literal */11,
-                                        _0: " and ",
-                                        _1: {
-                                          TAG: /* String */2,
-                                          _0: /* No_padding */0,
-                                          _1: {
-                                            TAG: /* Char_literal */12,
-                                            _0: /* '.' */46,
-                                            _1: /* End_of_format */0
-                                          }
-                                        }
-                                      }
+                                      TAG: /* Char_literal */12,
+                                      _0: /* '.' */46,
+                                      _1: /* End_of_format */0
                                     }
                                   }
                                 }
                               }
                             }
-                          },
-                          _1: "the %s %s is defined in both types %s and %s."
-                        }), s._0, s._1, s._2, s._3);
+                          }
+                        }
+                      }
+                    },
+                    _1: "the %s %s is defined in both types %s and %s."
+                  }), s._0, s._1, s._2, s._3);
       case /* Multiple_definition */15 :
           return Curry._3(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "files ",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "files ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " and ",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                              TAG: /* String_literal */11,
+                              _0: " both define a module named ",
                               _1: {
-                                TAG: /* String_literal */11,
-                                _0: " and ",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " both define a module named ",
-                                    _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
+                                _1: /* End_of_format */0
                               }
                             }
-                          },
-                          _1: "files %s and %s both define a module named %s"
-                        }), s._1, s._2, s._0);
+                          }
+                        }
+                      }
+                    },
+                    _1: "files %s and %s both define a module named %s"
+                  }), s._1, s._2, s._0);
       case /* Unused_value_declaration */16 :
           return "unused value " + (s._0 + ".");
       case /* Unused_open */17 :
@@ -1331,13 +1331,13 @@ function message(s) {
             return "this record of type " + (ty + (" contains fields that are \nnot visible in the current scope: " + (Stdlib__String.concat(" ", slist) + ".\nThey will not be selected if the type becomes unknown.")));
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      1776,
-                      39
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  1776,
+                  39
+                ]
+              });
           break;
       case /* Ambiguous_name */24 :
           const slist$1 = s._0;
@@ -1348,13 +1348,13 @@ function message(s) {
             return "these field labels belong to several types: " + (Stdlib__String.concat(" ", s._1) + "\nThe first one was selected. Please disambiguate if this is wrong.");
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      1785,
-                      36
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  1785,
+                  36
+                ]
+              });
           break;
       case /* Disambiguated_name */25 :
           return "this use of " + (s._0 + " required disambiguation.");
@@ -1362,123 +1362,123 @@ function message(s) {
           return "the label " + (s._0 + " is not optional.");
       case /* Open_shadow_identifier */27 :
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "this open statement shadows the ",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "this open statement shadows the ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " identifier ",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: " identifier ",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " (which is later used)",
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* String_literal */11,
+                              _0: " (which is later used)",
+                              _1: /* End_of_format */0
                             }
-                          },
-                          _1: "this open statement shadows the %s identifier %s (which is later used)"
-                        }), s._0, s._1);
+                          }
+                        }
+                      }
+                    },
+                    _1: "this open statement shadows the %s identifier %s (which is later used)"
+                  }), s._0, s._1);
       case /* Open_shadow_label_constructor */28 :
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "this open statement shadows the ",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "this open statement shadows the ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " (which is later used)",
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* String_literal */11,
+                              _0: " (which is later used)",
+                              _1: /* End_of_format */0
                             }
-                          },
-                          _1: "this open statement shadows the %s %s (which is later used)"
-                        }), s._0, s._1);
+                          }
+                        }
+                      }
+                    },
+                    _1: "this open statement shadows the %s %s (which is later used)"
+                  }), s._0, s._1);
       case /* Bad_env_variable */29 :
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "illegal environment variable ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: " : ",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          },
-                          _1: "illegal environment variable %s : %s"
-                        }), s._0, s._1);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "illegal environment variable ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " : ",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "illegal environment variable %s : %s"
+                  }), s._0, s._1);
       case /* Attribute_payload */30 :
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "illegal payload for attribute '",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: "'.\n",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          },
-                          _1: "illegal payload for attribute '%s'.\n%s"
-                        }), s._0, s._1);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "illegal payload for attribute '",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: "'.\n",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "illegal payload for attribute '%s'.\n%s"
+                  }), s._0, s._1);
       case /* Eliminated_optional_arguments */31 :
           const sl = s._0;
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "implicit elimination of optional argument",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          },
-                          _1: "implicit elimination of optional argument%s %s"
-                        }), Stdlib__List.length(sl) === 1 ? "" : "s", Stdlib__String.concat(", ", sl));
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "implicit elimination of optional argument",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "implicit elimination of optional argument%s %s"
+                  }), Stdlib__List.length(sl) === 1 ? "" : "s", Stdlib__String.concat(", ", sl));
       case /* No_cmi_file */32 :
           return "no cmi file was found in path for module " + s._0;
       case /* Bad_docstring */33 :
@@ -1546,44 +1546,44 @@ function in_file(name) {
     pos_cnum: -1
   };
   return {
-          loc_start: loc,
-          loc_end: loc,
-          loc_ghost: true
-        };
+    loc_start: loc,
+    loc_end: loc,
+    loc_ghost: true
+  };
 }
 
 const none = in_file("_none_");
 
 function curr(lexbuf) {
   return {
-          loc_start: lexbuf.lex_start_p,
-          loc_end: lexbuf.lex_curr_p,
-          loc_ghost: false
-        };
+    loc_start: lexbuf.lex_start_p,
+    loc_end: lexbuf.lex_curr_p,
+    loc_ghost: false
+  };
 }
 
 function symbol_rloc(param) {
   return {
-          loc_start: Stdlib__Parsing.symbol_start_pos(undefined),
-          loc_end: Stdlib__Parsing.symbol_end_pos(undefined),
-          loc_ghost: false
-        };
+    loc_start: Stdlib__Parsing.symbol_start_pos(undefined),
+    loc_end: Stdlib__Parsing.symbol_end_pos(undefined),
+    loc_ghost: false
+  };
 }
 
 function symbol_gloc(param) {
   return {
-          loc_start: Stdlib__Parsing.symbol_start_pos(undefined),
-          loc_end: Stdlib__Parsing.symbol_end_pos(undefined),
-          loc_ghost: true
-        };
+    loc_start: Stdlib__Parsing.symbol_start_pos(undefined),
+    loc_end: Stdlib__Parsing.symbol_end_pos(undefined),
+    loc_ghost: true
+  };
 }
 
 function rhs_loc(n) {
   return {
-          loc_start: Stdlib__Parsing.rhs_start_pos(n),
-          loc_end: Stdlib__Parsing.rhs_end_pos(n),
-          loc_ghost: false
-        };
+    loc_start: Stdlib__Parsing.rhs_start_pos(n),
+    loc_end: Stdlib__Parsing.rhs_end_pos(n),
+    loc_ghost: false
+  };
 }
 
 const input_name = {
@@ -1607,8 +1607,8 @@ function highlight_terminfo(ppf, num_lines, lb, locs) {
   const pos0 = -lb.lex_abs_pos | 0;
   if (pos0 < 0) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-              MEL_EXN_ID: Stdlib.Exit
-            });
+          MEL_EXN_ID: Stdlib.Exit
+        });
   }
   let lines = num_loc_lines.contents;
   for (let i = pos0 ,i_finish = lb.lex_buffer_len; i < i_finish; ++i) {
@@ -1619,8 +1619,8 @@ function highlight_terminfo(ppf, num_lines, lb, locs) {
   }
   if (lines >= (num_lines - 2 | 0)) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-              MEL_EXN_ID: Stdlib.Exit
-            });
+          MEL_EXN_ID: Stdlib.Exit
+        });
   }
   Caml_io.caml_ml_flush(Stdlib.stdout);
   Caml_external_polyfill.resolve("caml_terminfo_backup")(lines);
@@ -1654,8 +1654,8 @@ function highlight_dumb(ppf, lb, loc) {
   const pos0 = -lb.lex_abs_pos | 0;
   if (pos0 < 0) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-              MEL_EXN_ID: Stdlib.Exit
-            });
+          MEL_EXN_ID: Stdlib.Exit
+        });
   }
   const end_pos = (lb.lex_buffer_len - pos0 | 0) - 1 | 0;
   let line_start = 0;
@@ -1876,10 +1876,10 @@ function print_filename(ppf, file) {
 
 function get_pos_info(pos) {
   return [
-          pos.pos_fname,
-          pos.pos_lnum,
-          pos.pos_cnum - pos.pos_bol | 0
-        ];
+    pos.pos_fname,
+    pos.pos_lnum,
+    pos.pos_cnum - pos.pos_bol | 0
+  ];
 }
 
 function print_loc(ppf, loc) {
@@ -1897,30 +1897,30 @@ function print_loc(ppf, loc) {
       return ;
     } else {
       return Curry._2(Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Characters ",
-                        _1: {
-                          TAG: /* Int */4,
-                          _0: /* Int_i */3,
-                          _1: /* No_padding */0,
-                          _2: /* No_precision */0,
-                          _3: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '-' */45,
-                            _1: {
-                              TAG: /* Int */4,
-                              _0: /* Int_i */3,
-                              _1: /* No_padding */0,
-                              _2: /* No_precision */0,
-                              _3: /* End_of_format */0
-                            }
-                          }
-                        }
-                      },
-                      _1: "Characters %i-%i"
-                    }), loc.loc_start.pos_cnum, loc.loc_end.pos_cnum);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Characters ",
+                  _1: {
+                    TAG: /* Int */4,
+                    _0: /* Int_i */3,
+                    _1: /* No_padding */0,
+                    _2: /* No_precision */0,
+                    _3: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '-' */45,
+                      _1: {
+                        TAG: /* Int */4,
+                        _0: /* Int_i */3,
+                        _1: /* No_padding */0,
+                        _2: /* No_precision */0,
+                        _3: /* End_of_format */0
+                      }
+                    }
+                  }
+                },
+                _1: "Characters %i-%i"
+              }), loc.loc_start.pos_cnum, loc.loc_end.pos_cnum);
     }
   } else {
     Curry._5(Stdlib__Format.fprintf(ppf)({
@@ -1988,14 +1988,14 @@ function print_loc(ppf, loc) {
               }), ", characters ", startchar$1, "-", endchar);
     }
     return Stdlib__Format.fprintf(ppf)({
-                TAG: /* Format */0,
-                _0: {
-                  TAG: /* Formatting_lit */17,
-                  _0: /* Close_tag */1,
-                  _1: /* End_of_format */0
-                },
-                _1: "@}"
-              });
+          TAG: /* Format */0,
+          _0: {
+            TAG: /* Formatting_lit */17,
+            _0: /* Close_tag */1,
+            _1: /* End_of_format */0
+          },
+          _1: "@}"
+        });
   }
 }
 
@@ -2008,40 +2008,40 @@ function print$1(ppf, loc) {
     return ;
   } else {
     return Curry._3(Stdlib__Format.fprintf(ppf)({
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_gen */18,
+                _0: {
+                  TAG: /* Open_tag */0,
+                  _0: {
                     TAG: /* Format */0,
                     _0: {
-                      TAG: /* Formatting_gen */18,
-                      _0: {
-                        TAG: /* Open_tag */0,
-                        _0: {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "<loc>",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "<loc>"
-                        }
-                      },
+                      TAG: /* String_literal */11,
+                      _0: "<loc>",
+                      _1: /* End_of_format */0
+                    },
+                    _1: "<loc>"
+                  }
+                },
+                _1: {
+                  TAG: /* Alpha */15,
+                  _0: {
+                    TAG: /* Formatting_lit */17,
+                    _0: /* Close_tag */1,
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
                       _1: {
-                        TAG: /* Alpha */15,
-                        _0: {
-                          TAG: /* Formatting_lit */17,
-                          _0: /* Close_tag */1,
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: /* Flush_newline */4,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        }
+                        TAG: /* Formatting_lit */17,
+                        _0: /* Flush_newline */4,
+                        _1: /* End_of_format */0
                       }
-                    },
-                    _1: "@{<loc>%a@}%s@."
-                  }), print_loc, loc, ":");
+                    }
+                  }
+                }
+              },
+              _1: "@{<loc>%a@}%s@."
+            }), print_loc, loc, ":");
   }
 }
 
@@ -2089,44 +2089,44 @@ function default_warning_printer(loc, ppf, w) {
     Curry._1(Misc_Color.setup, color.contents);
     print$1(ppf, loc);
     return Curry._3(Stdlib__Format.fprintf(ppf)({
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_gen */18,
+                _0: {
+                  TAG: /* Open_tag */0,
+                  _0: {
                     TAG: /* Format */0,
                     _0: {
-                      TAG: /* Formatting_gen */18,
-                      _0: {
-                        TAG: /* Open_tag */0,
-                        _0: {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "<warning>",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "<warning>"
-                        }
-                      },
+                      TAG: /* String_literal */11,
+                      _0: "<warning>",
+                      _1: /* End_of_format */0
+                    },
+                    _1: "<warning>"
+                  }
+                },
+                _1: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* Formatting_lit */17,
+                    _0: /* Close_tag */1,
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
                       _1: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
+                        TAG: /* Alpha */15,
+                        _0: {
                           TAG: /* Formatting_lit */17,
-                          _0: /* Close_tag */1,
-                          _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ' ' */32,
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Formatting_lit */17,
-                                _0: /* Flush_newline */4,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
+                          _0: /* Flush_newline */4,
+                          _1: /* End_of_format */0
                         }
                       }
-                    },
-                    _1: "@{<warning>%s@} %a@."
-                  }), "Warning", print, w);
+                    }
+                  }
+                }
+              },
+              _1: "@{<warning>%s@} %a@."
+            }), "Warning", print, w);
   }
   
 }
@@ -2186,11 +2186,11 @@ function errorf(locOpt, subOpt, if_highlightOpt, fmt) {
   let before = print_phanton_error_prefix;
   const k = function (msg) {
     return {
-            loc: loc,
-            msg: msg,
-            sub: sub,
-            if_highlight: if_highlight
-          };
+      loc: loc,
+      msg: msg,
+      sub: sub,
+      if_highlight: if_highlight
+    };
   };
   const buf = Stdlib__Buffer.create(64);
   const ppf = Stdlib__Format.formatter_of_buffer(buf);
@@ -2199,9 +2199,9 @@ function errorf(locOpt, subOpt, if_highlightOpt, fmt) {
     Curry._1(before, ppf);
   }
   return Stdlib__Format.kfprintf((function (param) {
-                Stdlib__Format.pp_print_flush(ppf, undefined);
-                return Curry._1(k, Stdlib__Buffer.contents(buf));
-              }), ppf, fmt);
+          Stdlib__Format.pp_print_flush(ppf, undefined);
+          return Curry._1(k, Stdlib__Buffer.contents(buf));
+        }), ppf, fmt);
 }
 
 function error(locOpt, subOpt, if_highlightOpt, msg) {
@@ -2209,11 +2209,11 @@ function error(locOpt, subOpt, if_highlightOpt, msg) {
   const sub = subOpt !== undefined ? subOpt : /* [] */0;
   const if_highlight = if_highlightOpt !== undefined ? if_highlightOpt : "";
   return {
-          loc: loc,
-          msg: msg,
-          sub: sub,
-          if_highlight: if_highlight
-        };
+    loc: loc,
+    msg: msg,
+    sub: sub,
+    if_highlight: if_highlight
+  };
 }
 
 const error_of_exn = {
@@ -2229,17 +2229,17 @@ function register_error_of_exn(f) {
 
 function error_of_printer(loc, print, x) {
   return Curry._2(errorf(loc, undefined, undefined, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Alpha */15,
-                    _0: {
-                      TAG: /* Formatting_lit */17,
-                      _0: /* FFlush */2,
-                      _1: /* End_of_format */0
-                    }
-                  },
-                  _1: "%a@?"
-                }), print, x);
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Alpha */15,
+              _0: {
+                TAG: /* Formatting_lit */17,
+                _0: /* FFlush */2,
+                _1: /* End_of_format */0
+              }
+            },
+            _1: "%a@?"
+          }), print, x);
 }
 
 function error_of_printer_file(print, x) {
@@ -2249,38 +2249,38 @@ function error_of_printer_file(print, x) {
 register_error_of_exn(function (msg) {
       if (msg.MEL_EXN_ID === Stdlib.Sys_error) {
         return Curry._1(errorf(in_file(input_name.contents), undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "I/O error: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "I/O error: %s"
-                      }), msg._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "I/O error: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "I/O error: %s"
+                }), msg._1);
       } else if (msg.MEL_EXN_ID === Errors) {
         return Curry._1(errorf(in_file(input_name.contents), undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Some fatal warnings were triggered (",
-                          _1: {
-                            TAG: /* Int */4,
-                            _0: /* Int_d */0,
-                            _1: /* No_padding */0,
-                            _2: /* No_precision */0,
-                            _3: {
-                              TAG: /* String_literal */11,
-                              _0: " occurrences)",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "Some fatal warnings were triggered (%d occurrences)"
-                      }), msg._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Some fatal warnings were triggered (",
+                    _1: {
+                      TAG: /* Int */4,
+                      _0: /* Int_d */0,
+                      _1: /* No_padding */0,
+                      _2: /* No_precision */0,
+                      _3: {
+                        TAG: /* String_literal */11,
+                        _0: " occurrences)",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Some fatal warnings were triggered (%d occurrences)"
+                }), msg._1);
       } else {
         return ;
       }
@@ -2302,28 +2302,28 @@ const currentstamp = {
 function create(s) {
   currentstamp.contents = currentstamp.contents + 1 | 0;
   return {
-          stamp: currentstamp.contents,
-          name: s,
-          flags: 0
-        };
+    stamp: currentstamp.contents,
+    name: s,
+    flags: 0
+  };
 }
 
 function create_predef_exn(s) {
   currentstamp.contents = currentstamp.contents + 1 | 0;
   return {
-          stamp: currentstamp.contents,
-          name: s,
-          flags: 2
-        };
+    stamp: currentstamp.contents,
+    name: s,
+    flags: 2
+  };
 }
 
 function rename(i) {
   currentstamp.contents = currentstamp.contents + 1 | 0;
   return {
-          stamp: currentstamp.contents,
-          name: i.name,
-          flags: i.flags
-        };
+    stamp: currentstamp.contents,
+    name: i.name,
+    flags: i.flags
+  };
 }
 
 function unique_toplevel_name(i) {
@@ -2340,10 +2340,10 @@ function set_current_time(t) {
 
 function hide(i) {
   return {
-          stamp: -1,
-          name: i.name,
-          flags: i.flags
-        };
+    stamp: -1,
+    name: i.name,
+    flags: i.flags
+  };
 }
 
 function make_global(i) {
@@ -2359,57 +2359,57 @@ function print$2(ppf, i) {
   if (n !== -1) {
     if (n !== 0) {
       return Curry._3(Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '/' */47,
+                    _1: {
+                      TAG: /* Int */4,
+                      _0: /* Int_i */3,
+                      _1: /* No_padding */0,
+                      _2: /* No_precision */0,
+                      _3: {
                         TAG: /* String */2,
                         _0: /* No_padding */0,
-                        _1: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '/' */47,
-                          _1: {
-                            TAG: /* Int */4,
-                            _0: /* Int_i */3,
-                            _1: /* No_padding */0,
-                            _2: /* No_precision */0,
-                            _3: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        }
-                      },
-                      _1: "%s/%i%s"
-                    }), i.name, n, $$global(i) ? "g" : "");
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  }
+                },
+                _1: "%s/%i%s"
+              }), i.name, n, $$global(i) ? "g" : "");
     } else {
       return Curry._1(Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '!' */33,
-                          _1: /* End_of_format */0
-                        }
-                      },
-                      _1: "%s!"
-                    }), i.name);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '!' */33,
+                    _1: /* End_of_format */0
+                  }
+                },
+                _1: "%s!"
+              }), i.name);
     }
   } else {
     return Curry._1(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String */2,
-                      _0: /* No_padding */0,
-                      _1: {
-                        TAG: /* Char_literal */12,
-                        _0: /* '#' */35,
-                        _1: /* End_of_format */0
-                      }
-                    },
-                    _1: "%s#"
-                  }), i.name);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String */2,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* Char_literal */12,
+                  _0: /* '#' */35,
+                  _1: /* End_of_format */0
+                }
+              },
+              _1: "%s#"
+            }), i.name);
   }
 }
 
@@ -2419,12 +2419,12 @@ function mknode(l, d, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r._3;
   return {
-          TAG: /* Node */0,
-          _0: l,
-          _1: d,
-          _2: r,
-          _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    _0: l,
+    _1: d,
+    _2: r,
+    _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function balance(l, d, r) {
@@ -2435,13 +2435,13 @@ function balance(l, d, r) {
   if (hl > (hr + 1 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  2781,
-                  11
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              2781,
+              11
+            ]
+          });
     }
     const lr = l._2;
     const ld = l._1;
@@ -2457,26 +2457,26 @@ function balance(l, d, r) {
       return mknode(mknode(ll, ld, lr._0), lr._1, mknode(lr._2, d, r));
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                2781,
-                11
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            2781,
+            11
+          ]
+        });
   } else {
     if (hr <= (hl + 1 | 0)) {
       return mknode(l, d, r);
     }
     if (/* tag */typeof r === "number" || typeof r === "string") {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  2790,
-                  11
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              2790,
+              11
+            ]
+          });
     }
     const rl = r._0;
     const rr = r._2;
@@ -2491,29 +2491,29 @@ function balance(l, d, r) {
       return mknode(mknode(l, d, rl._0), rl._1, mknode(rl._2, r._1, r._2));
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                2790,
-                11
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            2790,
+            11
+          ]
+        });
   }
 }
 
 function add(id, data, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return {
-            TAG: /* Node */0,
-            _0: /* Empty */0,
-            _1: {
-              ident: id,
-              data: data,
-              previous: undefined
-            },
-            _2: /* Empty */0,
-            _3: 1
-          };
+      TAG: /* Node */0,
+      _0: /* Empty */0,
+      _1: {
+        ident: id,
+        data: data,
+        previous: undefined
+      },
+      _2: /* Empty */0,
+      _3: 1
+    };
   }
   const r = param._2;
   const k = param._1;
@@ -2521,16 +2521,16 @@ function add(id, data, param) {
   const c = Caml.caml_string_compare(id.name, k.ident.name);
   if (c === 0) {
     return {
-            TAG: /* Node */0,
-            _0: l,
-            _1: {
-              ident: id,
-              data: data,
-              previous: k
-            },
-            _2: r,
-            _3: param._3
-          };
+      TAG: /* Node */0,
+      _0: l,
+      _1: {
+        ident: id,
+        data: data,
+        previous: k
+      },
+      _2: r,
+      _3: param._3
+    };
   } else if (c < 0) {
     return balance(add(id, data, l), k, r);
   } else {
@@ -2543,8 +2543,8 @@ function find_same(id, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const k = param._1;
     const c = Caml.caml_string_compare(id.name, k.ident.name);
@@ -2564,8 +2564,8 @@ function find_same(id, _param) {
             continue ;
           }
           throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                    MEL_EXN_ID: Stdlib.Not_found
-                  });
+                MEL_EXN_ID: Stdlib.Not_found
+              });
         };
       }
     }
@@ -2579,8 +2579,8 @@ function find_name(name, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const k = param._1;
     const c = Caml.caml_string_compare(name, k.ident.name);
@@ -2595,9 +2595,9 @@ function find_name(name, _param) {
 function get_all(k) {
   if (k !== undefined) {
     return {
-            hd: k.data,
-            tl: get_all(k.previous)
-          };
+      hd: k.data,
+      tl: get_all(k.previous)
+    };
   } else {
     return /* [] */0;
   }
@@ -2613,9 +2613,9 @@ function find_all(name, _param) {
     const c = Caml.caml_string_compare(name, k.ident.name);
     if (c === 0) {
       return {
-              hd: k.data,
-              tl: get_all(k.previous)
-            };
+        hd: k.data,
+        tl: get_all(k.previous)
+      };
     }
     _param = c < 0 ? param._0 : param._2;
     continue ;
@@ -2731,8 +2731,8 @@ function name(parenOpt, id) {
     case /* Pdot */1 :
         const s = id._1;
         return name(paren, id._0) + (
-                Curry._1(paren, s) ? ".( " + (s + " )") : "." + s
-              );
+          Curry._1(paren, s) ? ".( " + (s + " )") : "." + s
+        );
     case /* Papply */2 :
         return name(paren, id._0) + ("(" + (name(paren, id._1) + ")"));
     
@@ -2750,13 +2750,13 @@ function head(_id) {
           continue ;
       case /* Papply */2 :
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      2970,
-                      22
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  2970,
+                  22
+                ]
+              });
       
     }
   };
@@ -2785,9 +2785,9 @@ function flat(_accu, _s) {
     switch (s.TAG) {
       case /* Lident */0 :
           return {
-                  hd: s._0,
-                  tl: accu
-                };
+            hd: s._0,
+            tl: accu
+          };
       case /* Ldot */1 :
           _s = s._0;
           _accu = {
@@ -2826,12 +2826,12 @@ function parse_declaration(arity, decl) {
   const match = decl.tl;
   if (!match) {
     return {
-            prim_name: name,
-            prim_arity: arity,
-            prim_alloc: true,
-            prim_native_name: "",
-            prim_native_float: false
-          };
+      prim_name: name,
+      prim_arity: arity,
+      prim_alloc: true,
+      prim_native_name: "",
+      prim_native_float: false
+    };
   }
   const name2 = match.hd;
   if (name2 === "noalloc") {
@@ -2841,20 +2841,20 @@ function parse_declaration(arity, decl) {
       const match$2 = match$1.tl;
       if (match$2 && match$2.hd === "float") {
         return {
-                prim_name: name,
-                prim_arity: arity,
-                prim_alloc: false,
-                prim_native_name: name2$1,
-                prim_native_float: true
-              };
+          prim_name: name,
+          prim_arity: arity,
+          prim_alloc: false,
+          prim_native_name: name2$1,
+          prim_native_float: true
+        };
       } else {
         return {
-                prim_name: name,
-                prim_arity: arity,
-                prim_alloc: false,
-                prim_native_name: name2$1,
-                prim_native_float: false
-              };
+          prim_name: name,
+          prim_arity: arity,
+          prim_alloc: false,
+          prim_native_name: name2$1,
+          prim_native_float: false
+        };
       }
     }
     
@@ -2862,31 +2862,31 @@ function parse_declaration(arity, decl) {
     const match$3 = match.tl;
     if (match$3 && match$3.hd === "float") {
       return {
-              prim_name: name,
-              prim_arity: arity,
-              prim_alloc: true,
-              prim_native_name: name2,
-              prim_native_float: true
-            };
+        prim_name: name,
+        prim_arity: arity,
+        prim_alloc: true,
+        prim_native_name: name2,
+        prim_native_float: true
+      };
     }
     
   }
   if (name2 === "noalloc") {
     return {
-            prim_name: name,
-            prim_arity: arity,
-            prim_alloc: false,
-            prim_native_name: "",
-            prim_native_float: false
-          };
+      prim_name: name,
+      prim_arity: arity,
+      prim_alloc: false,
+      prim_native_name: "",
+      prim_native_float: false
+    };
   } else {
     return {
-            prim_name: name,
-            prim_arity: arity,
-            prim_alloc: true,
-            prim_native_name: name2,
-            prim_native_float: false
-          };
+      prim_name: name,
+      prim_arity: arity,
+      prim_alloc: true,
+      prim_native_name: name2,
+      prim_native_float: false
+    };
   }
 }
 
@@ -2897,17 +2897,17 @@ function description_list(p) {
     tl: /* [] */0
   };
   const list$1 = p.prim_alloc ? list : ({
-        hd: "noalloc",
-        tl: list
-      });
+      hd: "noalloc",
+      tl: list
+    });
   const list$2 = p.prim_native_name !== "" ? ({
-        hd: p.prim_native_name,
-        tl: list$1
-      }) : list$1;
+      hd: p.prim_native_name,
+      tl: list$1
+    }) : list$1;
   return Stdlib__List.rev(p.prim_native_float ? ({
-                  hd: "float",
-                  tl: list$2
-                }) : list$2);
+          hd: "float",
+          tl: list$2
+        }) : list$2);
 }
 
 function compare(t1, t2) {
@@ -2940,24 +2940,24 @@ function create$1(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function singleton(x, d) {
   return {
-          TAG: /* Node */0,
-          l: /* Empty */0,
-          v: x,
-          d: d,
-          r: /* Empty */0,
-          h: 1
-        };
+    TAG: /* Node */0,
+    l: /* Empty */0,
+    v: x,
+    d: d,
+    r: /* Empty */0,
+    h: 1
+  };
 }
 
 function bal(l, x, d, r) {
@@ -2968,9 +2968,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -2983,25 +2983,25 @@ function bal(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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -3014,9 +3014,9 @@ function bal(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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function is_empty(param) {
@@ -3030,13 +3030,13 @@ function is_empty(param) {
 function add$1(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -3048,13 +3048,13 @@ function add$1(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -3078,8 +3078,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(OrderedString.compare, x, param.v);
     if (c === 0) {
@@ -3095,8 +3095,8 @@ function find_first(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -3109,9 +3109,9 @@ function find_first(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -3146,9 +3146,9 @@ function find_first_opt(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -3171,8 +3171,8 @@ function find_last(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -3185,9 +3185,9 @@ function find_last(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -3222,9 +3222,9 @@ function find_last_opt(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -3277,15 +3277,15 @@ function min_binding(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -3301,9 +3301,9 @@ function min_binding_opt(_param) {
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -3315,15 +3315,15 @@ function max_binding(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = param.r;
     continue ;
@@ -3339,9 +3339,9 @@ function max_binding_opt(_param) {
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = param.r;
     continue ;
@@ -3351,9 +3351,9 @@ function max_binding_opt(_param) {
 function remove_min_binding(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.remove_min_elt"
+        });
   }
   const l = param.l;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -3407,13 +3407,13 @@ function update(x, f, m) {
     const data = Curry._1(f, undefined);
     if (data !== undefined) {
       return {
-              TAG: /* Node */0,
-              l: /* Empty */0,
-              v: x,
-              d: Caml_option.valFromOption(data),
-              r: /* Empty */0,
-              h: 1
-            };
+        TAG: /* Node */0,
+        l: /* Empty */0,
+        v: x,
+        d: Caml_option.valFromOption(data),
+        r: /* Empty */0,
+        h: 1
+      };
     } else {
       return /* Empty */0;
     }
@@ -3433,13 +3433,13 @@ function update(x, f, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data$2,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data$2,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -3462,14 +3462,14 @@ function add_to_list(x, data, m) {
   const add = function (l) {
     if (l !== undefined) {
       return {
-              hd: data,
-              tl: l
-            };
+        hd: data,
+        tl: l
+      };
     } else {
       return {
-              hd: data,
-              tl: /* [] */0
-            };
+        hd: data,
+        tl: /* [] */0
+      };
     }
   };
   return update(x, add, m);
@@ -3496,13 +3496,13 @@ function map(f, param) {
   const d$p = Curry._1(f, param.d);
   const r$p = map(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: param.v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: param.v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function mapi(f, param) {
@@ -3514,13 +3514,13 @@ function mapi(f, param) {
   const d$p = Curry._2(f, v, param.d);
   const r$p = mapi(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function fold(f, _m, _accu) {
@@ -3626,10 +3626,10 @@ function concat_or_join(t1, v, d, t2) {
 function split(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            undefined,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      undefined,
+      /* Empty */0
+    ];
   }
   const r = param.r;
   const d = param.d;
@@ -3638,25 +3638,25 @@ function split(x, param) {
   const c = Curry._2(OrderedString.compare, x, v);
   if (c === 0) {
     return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
+      l,
+      Caml_option.some(d),
+      r
+    ];
   }
   if (c < 0) {
     const 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)
+    ];
   }
   const 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) {
@@ -3675,13 +3675,13 @@ function merge$1(f, s1, s2) {
   }
   if (/* tag */typeof s2 === "number" || typeof s2 === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/stdlib/map.ml",
-                408,
-                10
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/stdlib/map.ml",
+            408,
+            10
+          ]
+        });
   }
   const v2 = s2.v;
   const match$1 = split(v2, s1);
@@ -3761,9 +3761,9 @@ function filter_map(f, param) {
 function partition(p, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      /* Empty */0
+    ];
   }
   const d = param.d;
   const v = param.v;
@@ -3776,14 +3776,14 @@ function partition(p, param) {
   const 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)
+    ];
   }
 }
 
@@ -3897,14 +3897,14 @@ function bindings(s) {
 
 function of_list(bs) {
   return Stdlib__List.fold_left((function (m, param) {
-                return add$1(param[0], param[1], m);
-              }), /* Empty */0, bs);
+          return add$1(param[0], param[1], m);
+        }), /* Empty */0, bs);
 }
 
 function add_seq(i, m) {
   return Stdlib__Seq.fold_left((function (m, param) {
-                return add$1(param[0], param[1], m);
-              }), m, i);
+          return add$1(param[0], param[1], m);
+        }), m, i);
 }
 
 function of_seq(i) {
@@ -3917,15 +3917,15 @@ function seq_of_enum_(c, param) {
   }
   const partial_arg = cons_enum(c._2, c._3);
   return {
-          TAG: /* Cons */0,
-          _0: [
-            c._0,
-            c._1
-          ],
-          _1: (function (param) {
-              return seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: [
+      c._0,
+      c._1
+    ],
+    _1: (function (param) {
+        return seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_seq(m) {
@@ -3960,15 +3960,15 @@ function rev_seq_of_enum_(c, param) {
   }
   const partial_arg = snoc_enum(c._2, c._3);
   return {
-          TAG: /* Cons */0,
-          _0: [
-            c._0,
-            c._1
-          ],
-          _1: (function (param) {
-              return rev_seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: [
+      c._0,
+      c._1
+    ],
+    _1: (function (param) {
+        return rev_seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_rev_seq(c) {
@@ -3992,12 +3992,12 @@ function to_seq_from(low, m) {
       const n = Curry._2(OrderedString.compare, v, low);
       if (n === 0) {
         return {
-                TAG: /* More */0,
-                _0: v,
-                _1: d,
-                _2: r,
-                _3: c
-              };
+          TAG: /* More */0,
+          _0: v,
+          _1: d,
+          _2: r,
+          _3: c
+        };
       }
       if (n < 0) {
         _m = r;
@@ -4124,18 +4124,18 @@ function conjugate(v) {
 
 function get_upper(v) {
   return [
-          mem$1(/* May_pos */0)(v),
-          mem$1(/* May_neg */1)(v)
-        ];
+    mem$1(/* May_pos */0)(v),
+    mem$1(/* May_neg */1)(v)
+  ];
 }
 
 function get_lower(v) {
   return [
-          mem$1(/* Pos */4)(v),
-          mem$1(/* Neg */5)(v),
-          mem$1(/* Inv */6)(v),
-          mem$1(/* Inj */3)(v)
-        ];
+    mem$1(/* Pos */4)(v),
+    mem$1(/* Neg */5)(v),
+    mem$1(/* Inv */6)(v),
+    mem$1(/* Inj */3)(v)
+  ];
 }
 
 function height$1(param) {
@@ -4152,12 +4152,12 @@ function create$2(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r.h;
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$1(l, v, r) {
@@ -4168,9 +4168,9 @@ function bal$1(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const lr = l.r;
     const lv = l.v;
@@ -4182,24 +4182,24 @@ function bal$1(l, v, r) {
       return create$2(create$2(ll, lv, lr.l), lr.v, create$2(lr.r, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   const rr = r.r;
   const rv = r.v;
@@ -4211,20 +4211,20 @@ function bal$1(l, v, r) {
     return create$2(create$2(l, v, rl.l), rl.v, create$2(rl.r, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Set.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Set.bal"
+      });
 }
 
 function add$2(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = t.r;
   const v = t.v;
@@ -4251,12 +4251,12 @@ function add$2(x, t) {
 
 function singleton$1(x) {
   return {
-          TAG: /* Node */0,
-          l: /* Empty */0,
-          v: x,
-          r: /* Empty */0,
-          h: 1
-        };
+    TAG: /* Node */0,
+    l: /* Empty */0,
+    v: x,
+    r: /* Empty */0,
+    h: 1
+  };
 }
 
 function add_min_element(x, param) {
@@ -4298,8 +4298,8 @@ function min_elt(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -4313,9 +4313,9 @@ function min_elt(_param) {
 function remove_min_elt(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.remove_min_elt"
+        });
   }
   const l = param.l;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -4338,10 +4338,10 @@ function concat$1(t1, t2) {
 function split$1(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            false,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      false,
+      /* Empty */0
+    ];
   }
   const r = param.r;
   const v = param.v;
@@ -4349,25 +4349,25 @@ function split$1(x, param) {
   const c = Curry._2(OrderedString.compare, x, v);
   if (c === 0) {
     return [
-            l,
-            true,
-            r
-          ];
+      l,
+      true,
+      r
+    ];
   }
   if (c < 0) {
     const match = split$1(x, l);
     return [
-            match[0],
-            match[1],
-            join$1(match[2], v, r)
-          ];
+      match[0],
+      match[1],
+      join$1(match[2], v, r)
+    ];
   }
   const match$1 = split$1(x, r);
   return [
-          join$1(l, v, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    join$1(l, v, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function is_empty$1(param) {
@@ -4611,12 +4611,12 @@ function create$3(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r.h;
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$2(l, v, r) {
@@ -4627,9 +4627,9 @@ function bal$2(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const lr = l.r;
     const lv = l.v;
@@ -4641,24 +4641,24 @@ function bal$2(l, v, r) {
       return create$3(create$3(ll, lv, lr.l), lr.v, create$3(lr.r, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   const rr = r.r;
   const rv = r.v;
@@ -4670,20 +4670,20 @@ function bal$2(l, v, r) {
     return create$3(create$3(l, v, rl.l), rl.v, create$3(rl.r, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Set.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Set.bal"
+      });
 }
 
 function add$3(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = t.r;
   const v = t.v;
@@ -4710,12 +4710,12 @@ function add$3(x, t) {
 
 function singleton$2(x) {
   return {
-          TAG: /* Node */0,
-          l: /* Empty */0,
-          v: x,
-          r: /* Empty */0,
-          h: 1
-        };
+    TAG: /* Node */0,
+    l: /* Empty */0,
+    v: x,
+    r: /* Empty */0,
+    h: 1
+  };
 }
 
 function add_min_element$1(x, param) {
@@ -4757,8 +4757,8 @@ function min_elt$1(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -4772,9 +4772,9 @@ function min_elt$1(_param) {
 function remove_min_elt$1(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.remove_min_elt"
+        });
   }
   const l = param.l;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -4797,10 +4797,10 @@ function concat$2(t1, t2) {
 function split$2(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            false,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      false,
+      /* Empty */0
+    ];
   }
   const r = param.r;
   const v = param.v;
@@ -4808,25 +4808,25 @@ function split$2(x, param) {
   const c = Curry._2(funarg.compare, x, v);
   if (c === 0) {
     return [
-            l,
-            true,
-            r
-          ];
+      l,
+      true,
+      r
+    ];
   }
   if (c < 0) {
     const match = split$2(x, l);
     return [
-            match[0],
-            match[1],
-            join$2(match[2], v, r)
-          ];
+      match[0],
+      match[1],
+      join$2(match[2], v, r)
+    ];
   }
   const match$1 = split$2(x, r);
   return [
-          join$2(l, v, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    join$2(l, v, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function is_empty$2(param) {
@@ -5030,13 +5030,13 @@ function create$4(l, x, d, r) {
   const hl = height$3(l);
   const hr = height$3(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$3(l, x, d, r) {
@@ -5047,9 +5047,9 @@ function bal$3(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -5062,25 +5062,25 @@ function bal$3(l, x, d, r) {
       return create$4(create$4(ll, lv, ld, lr.l), lr.v, lr.d, create$4(lr.r, x, d, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -5093,21 +5093,21 @@ function bal$3(l, x, d, r) {
     return create$4(create$4(l, x, d, rl.l), rl.v, rl.d, create$4(rl.r, rv, rd, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add$4(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -5119,13 +5119,13 @@ function add$4(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -5149,8 +5149,8 @@ function find$1(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg$1.compare, x, param.v);
     if (c === 0) {
@@ -5183,13 +5183,13 @@ const TypeHash = Stdlib__Hashtbl.Make({
 
 function print_raw(param) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              4836,
-              16
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          4836,
+          16
+        ]
+      });
 }
 
 const pivot_level = -1;
@@ -5201,10 +5201,10 @@ const new_id = {
 function newty2(level, desc) {
   new_id.contents = new_id.contents + 1 | 0;
   return {
-          desc: desc,
-          level: level,
-          id: new_id.contents
-        };
+    desc: desc,
+    level: level,
+    id: new_id.contents
+  };
 }
 
 function is_Tvar(param) {
@@ -5290,9 +5290,9 @@ function row_field_repr_aux(_tl, _fi) {
     if (fi.TAG === /* Rpresent */0) {
       if (fi._0 !== undefined && Caml_obj.caml_notequal(tl, /* [] */0)) {
         return {
-                TAG: /* Rpresent */0,
-                _0: Stdlib__List.hd(tl)
-              };
+          TAG: /* Rpresent */0,
+          _0: Stdlib__List.hd(tl)
+        };
       } else {
         return fi;
       }
@@ -5300,12 +5300,12 @@ function row_field_repr_aux(_tl, _fi) {
     const fi$1 = fi._3.contents;
     if (fi$1 === undefined) {
       return {
-              TAG: /* Reither */1,
-              _0: fi._0,
-              _1: Stdlib.$at(tl, fi._1),
-              _2: fi._2,
-              _3: fi._3
-            };
+        TAG: /* Reither */1,
+        _0: fi._0,
+        _1: Stdlib.$at(tl, fi._1),
+        _2: fi._2,
+        _3: fi._3
+      };
     }
     _fi = fi$1;
     _tl = Stdlib.$at(tl, fi._1);
@@ -5335,22 +5335,22 @@ function row_repr_aux(_ll, _row) {
       const f = row.row_fields;
       _row = row$p._0;
       _ll = Caml_obj.caml_equal(f, /* [] */0) ? ll : ({
-            hd: f,
-            tl: ll
-          });
+          hd: f,
+          tl: ll
+        });
       continue ;
     }
     if (Caml_obj.caml_equal(ll, /* [] */0)) {
       return row;
     } else {
       return {
-              row_fields: rev_concat(row.row_fields, ll),
-              row_more: row.row_more,
-              row_bound: row.row_bound,
-              row_closed: row.row_closed,
-              row_fixed: row.row_fixed,
-              row_name: row.row_name
-            };
+        row_fields: rev_concat(row.row_fields, ll),
+        row_more: row.row_more,
+        row_bound: row.row_bound,
+        row_closed: row.row_closed,
+        row_fixed: row.row_fixed,
+        row_name: row.row_name
+      };
     }
   };
 }
@@ -5410,13 +5410,13 @@ function row_fixed(row) {
         return true;
     default:
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  4946,
-                  9
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              4946,
+              9
+            ]
+          });
   }
 }
 
@@ -5424,13 +5424,13 @@ function static_row(row) {
   const row$1 = row_repr_aux(/* [] */0, row);
   if (row$1.row_closed) {
     return Stdlib__List.for_all((function (param) {
-                  const match = row_field_repr_aux(/* [] */0, param[1]);
-                  if (/* tag */typeof match === "number" || typeof match === "string" || match.TAG === /* Rpresent */0) {
-                    return true;
-                  } else {
-                    return false;
-                  }
-                }), row$1.row_fields);
+            const match = row_field_repr_aux(/* [] */0, param[1]);
+            if (/* tag */typeof match === "number" || typeof match === "string" || match.TAG === /* Rpresent */0) {
+              return true;
+            } else {
+              return false;
+            }
+          }), row$1.row_fields);
   } else {
     return false;
   }
@@ -5477,13 +5477,13 @@ function proxy(ty) {
                 return ty$1;
             default:
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          4976,
-                          15
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/ocaml_typedtree_test.ml",
+                      4976,
+                      15
+                    ]
+                  });
           }
         };
     case /* Tvariant */8 :
@@ -5594,18 +5594,18 @@ function iter_row(f, _row) {
             break;
         default:
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      5023,
-                      9
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  5023,
+                  9
+                ]
+              });
       }
     }
     return may((function (param) {
-                  Stdlib__List.iter(f, param[1]);
-                }), row.row_name);
+            Stdlib__List.iter(f, param[1]);
+          }), row.row_name);
   };
 }
 
@@ -5760,9 +5760,9 @@ function it_class_type(it, cs) {
                 Curry._2(it.it_type_expr, it, param$1[2]);
               }), cs$1.csig_vars);
         return Stdlib__List.iter((function (param) {
-                      Curry._1(it.it_path, param[0]);
-                      Stdlib__List.iter(Curry._1(it.it_type_expr, it), param[1]);
-                    }), cs$1.csig_inher);
+                Curry._1(it.it_path, param[0]);
+                Stdlib__List.iter(Curry._1(it.it_type_expr, it), param[1]);
+              }), cs$1.csig_inher);
     case /* Cty_arrow */2 :
         Curry._2(it.it_type_expr, it, cs._1);
         return Curry._2(it.it_class_type, it, cs._2);
@@ -5775,13 +5775,13 @@ function it_type_kind(it, cl) {
     return ;
   } else if (cl.TAG === /* Type_record */0) {
     return Stdlib__List.iter((function (ld) {
-                  Curry._2(it.it_type_expr, it, ld.ld_type);
-                }), cl._0);
+            Curry._2(it.it_type_expr, it, ld.ld_type);
+          }), cl._0);
   } else {
     return Stdlib__List.iter((function (cd) {
-                  Stdlib__List.iter(Curry._1(it.it_type_expr, it), cd.cd_args);
-                  may(Curry._1(it.it_type_expr, it), cd.cd_res);
-                }), cl._0);
+            Stdlib__List.iter(Curry._1(it.it_type_expr, it), cd.cd_args);
+            may(Curry._1(it.it_type_expr, it), cd.cd_res);
+          }), cl._0);
   }
 }
 
@@ -5801,8 +5801,8 @@ function it_do_type_expr(it, ty) {
         }
     case /* Tvariant */8 :
         return may((function (param) {
-                      Curry._1(it.it_path, param[0]);
-                    }), row_repr_aux(/* [] */0, row._0).row_name);
+                Curry._1(it.it_path, param[0]);
+              }), row_repr_aux(/* [] */0, row._0).row_name);
     case /* Tconstr */3 :
     case /* Tpackage */11 :
         return Curry._1(it.it_path, row._0);
@@ -5825,13 +5825,13 @@ function copy_row(f, fixed, row, keep, more) {
           } else if (match.TAG === /* Rpresent */0) {
             const ty = match._0;
             tmp = ty !== undefined ? ({
-                  TAG: /* Rpresent */0,
-                  _0: Curry._1(f, ty)
-                }) : fi;
+                TAG: /* Rpresent */0,
+                _0: Curry._1(f, ty)
+              }) : fi;
           } else {
             const e = keep ? match._3 : ({
-                  contents: undefined
-                });
+                contents: undefined
+              });
             const m = row.row_fixed ? fixed : match._2;
             const tl = Stdlib__List.map(f, match._1);
             tmp = {
@@ -5843,9 +5843,9 @@ function copy_row(f, fixed, row, keep, more) {
             };
           }
           return [
-                  param[0],
-                  tmp
-                ];
+            param[0],
+            tmp
+          ];
         }), row.row_fields);
   const match = row.row_name;
   const name = match !== undefined ? [
@@ -5853,13 +5853,13 @@ function copy_row(f, fixed, row, keep, more) {
       Stdlib__List.map(f, match[1])
     ] : undefined;
   return {
-          row_fields: fields,
-          row_more: more,
-          row_bound: undefined,
-          row_closed: row.row_closed,
-          row_fixed: row.row_fixed && fixed,
-          row_name: name
-        };
+    row_fields: fields,
+    row_more: more,
+    row_bound: undefined,
+    row_closed: row.row_closed,
+    row_fixed: row.row_fixed && fixed,
+    row_name: name
+  };
 }
 
 function copy_kind(_param) {
@@ -5870,22 +5870,22 @@ function copy_kind(_param) {
         return /* Fpresent */0;
       }
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  5172,
-                  16
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              5172,
+              16
+            ]
+          });
     } else {
       const k = param._0.contents;
       if (k === undefined) {
         return {
-                TAG: /* Fvar */0,
-                _0: {
-                  contents: undefined
-                }
-              };
+          TAG: /* Fvar */0,
+          _0: {
+            contents: undefined
+          }
+        };
       }
       _param = k;
       continue ;
@@ -5898,11 +5898,11 @@ function copy_commu(c) {
     return /* Cok */0;
   } else {
     return {
-            TAG: /* Clink */0,
-            _0: {
-              contents: /* Cunknown */1
-            }
-          };
+      TAG: /* Clink */0,
+      _0: {
+        contents: /* Cunknown */1
+      }
+    };
   }
 }
 
@@ -5920,85 +5920,85 @@ function copy_type_desc(_keep_namesOpt, f, _ty) {
             return ty;
           } else {
             return {
-                    TAG: /* Tvar */0,
-                    _0: undefined
-                  };
+              TAG: /* Tvar */0,
+              _0: undefined
+            };
           }
       case /* Tarrow */1 :
           return {
-                  TAG: /* Tarrow */1,
-                  _0: ty._0,
-                  _1: Curry._1(f, ty._1),
-                  _2: Curry._1(f, ty._2),
-                  _3: copy_commu(ty._3)
-                };
+            TAG: /* Tarrow */1,
+            _0: ty._0,
+            _1: Curry._1(f, ty._1),
+            _2: Curry._1(f, ty._2),
+            _3: copy_commu(ty._3)
+          };
       case /* Ttuple */2 :
           return {
-                  TAG: /* Ttuple */2,
-                  _0: Stdlib__List.map(f, ty._0)
-                };
+            TAG: /* Ttuple */2,
+            _0: Stdlib__List.map(f, ty._0)
+          };
       case /* Tconstr */3 :
           return {
-                  TAG: /* Tconstr */3,
-                  _0: ty._0,
-                  _1: Stdlib__List.map(f, ty._1),
-                  _2: {
-                    contents: /* Mnil */0
-                  }
-                };
+            TAG: /* Tconstr */3,
+            _0: ty._0,
+            _1: Stdlib__List.map(f, ty._1),
+            _2: {
+              contents: /* Mnil */0
+            }
+          };
       case /* Tobject */4 :
           const ty$1 = ty._0;
           const match = ty._1.contents;
           if (match !== undefined) {
             return {
-                    TAG: /* Tobject */4,
-                    _0: Curry._1(f, ty$1),
-                    _1: {
-                      contents: [
-                        match[0],
-                        Stdlib__List.map(f, match[1])
-                      ]
-                    }
-                  };
+              TAG: /* Tobject */4,
+              _0: Curry._1(f, ty$1),
+              _1: {
+                contents: [
+                  match[0],
+                  Stdlib__List.map(f, match[1])
+                ]
+              }
+            };
           } else {
             return {
-                    TAG: /* Tobject */4,
-                    _0: Curry._1(f, ty$1),
-                    _1: {
-                      contents: undefined
-                    }
-                  };
+              TAG: /* Tobject */4,
+              _0: Curry._1(f, ty$1),
+              _1: {
+                contents: undefined
+              }
+            };
           }
       case /* Tfield */5 :
           return {
-                  TAG: /* Tfield */5,
-                  _0: ty._0,
-                  _1: field_kind_repr(ty._1),
-                  _2: Curry._1(f, ty._2),
-                  _3: Curry._1(f, ty._3)
-                };
+            TAG: /* Tfield */5,
+            _0: ty._0,
+            _1: field_kind_repr(ty._1),
+            _2: Curry._1(f, ty._2),
+            _3: Curry._1(f, ty._3)
+          };
       case /* Tlink */6 :
           _ty = ty._0.desc;
           _keep_namesOpt = undefined;
           continue ;
       case /* Tsubst */7 :
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      5199,
-                      27
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  5199,
+                  27
+                ]
+              });
       case /* Tvariant */8 :
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      5194,
-                      27
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  5194,
+                  27
+                ]
+              });
       case /* Tunivar */9 :
           return ty;
       case /* Tpoly */10 :
@@ -6027,27 +6027,27 @@ function copy_type_desc(_keep_namesOpt, f, _ty) {
                       }
                     }
                     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                              MEL_EXN_ID: "Assert_failure",
-                              _1: [
-                                "jscomp/test/ocaml_typedtree_test.ml",
-                                5184,
-                                26
-                              ]
-                            });
+                          MEL_EXN_ID: "Assert_failure",
+                          _1: [
+                            "jscomp/test/ocaml_typedtree_test.ml",
+                            5184,
+                            26
+                          ]
+                        });
                   };
                 }), ty._1);
           return {
-                  TAG: /* Tpoly */10,
-                  _0: Curry._1(f, ty._0),
-                  _1: tyl
-                };
+            TAG: /* Tpoly */10,
+            _0: Curry._1(f, ty._0),
+            _1: tyl
+          };
       case /* Tpackage */11 :
           return {
-                  TAG: /* Tpackage */11,
-                  _0: ty._0,
-                  _1: ty._1,
-                  _2: Stdlib__List.map(f, ty._2)
-                };
+            TAG: /* Tpackage */11,
+            _0: ty._0,
+            _1: ty._1,
+            _2: Stdlib__List.map(f, ty._2)
+          };
       
     }
   };
@@ -6079,13 +6079,13 @@ function dup_kind(r) {
   const match = r.contents;
   if (match !== undefined) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                5217,
-                40
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            5217,
+            40
+          ]
+        });
   }
   if (Stdlib__List.memq(r, new_kinds.contents)) {
     return ;
@@ -6238,33 +6238,33 @@ function memorize_abbrev(mem, priv, path, v, v$p) {
 function forget_abbrev_rec(mem, path) {
   if (/* tag */typeof mem === "number" || typeof mem === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                5329,
-                6
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            5329,
+            6
+          ]
+        });
   }
   if (mem.TAG === /* Mcons */0) {
     if (same(path, mem._1)) {
       return mem._4;
     } else {
       return {
-              TAG: /* Mcons */0,
-              _0: mem._0,
-              _1: mem._1,
-              _2: mem._2,
-              _3: mem._3,
-              _4: forget_abbrev_rec(mem._4, path)
-            };
+        TAG: /* Mcons */0,
+        _0: mem._0,
+        _1: mem._1,
+        _2: mem._2,
+        _3: mem._3,
+        _4: forget_abbrev_rec(mem._4, path)
+      };
     }
   }
   const mem$p = mem._0;
   mem$p.contents = forget_abbrev_rec(mem$p.contents, path);
   throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-            MEL_EXN_ID: Stdlib.Exit
-          });
+        MEL_EXN_ID: Stdlib.Exit
+      });
 }
 
 function forget_abbrev(mem, path) {
@@ -6315,11 +6315,11 @@ function extract_label_aux(_hd, l, _param) {
       const l$p = p[0];
       if (label_name(l$p) === l) {
         return [
-                l$p,
-                p[1],
-                Stdlib__List.rev(hd),
-                ls
-              ];
+          l$p,
+          p[1],
+          Stdlib__List.rev(hd),
+          ls
+        ];
       }
       _param = ls;
       _hd = {
@@ -6329,8 +6329,8 @@ function extract_label_aux(_hd, l, _param) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   };
 }
 
@@ -6373,10 +6373,10 @@ function log_change(ch) {
 function log_type(ty) {
   if (ty.id <= last_snapshot.contents) {
     return log_change({
-                TAG: /* Ctype */0,
-                _0: ty,
-                _1: ty.desc
-              });
+          TAG: /* Ctype */0,
+          _0: ty,
+          _1: ty.desc
+        });
   }
   
 }
@@ -6484,18 +6484,18 @@ function snapshot(param) {
   const r = Caml_array.get(trail, 0);
   if (r !== undefined) {
     return [
-            r,
-            old
-          ];
+      r,
+      old
+    ];
   }
   const r$1 = {
     contents: /* Unchanged */0
   };
   Caml_array.set(trail, 0, r$1);
   return [
-          r$1,
-          old
-        ];
+    r$1,
+    old
+  ];
 }
 
 function rev_log(_accu, _param) {
@@ -6507,13 +6507,13 @@ function rev_log(_accu, _param) {
         return accu;
       }
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  5465,
-                  15
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              5465,
+              15
+            ]
+          });
     } else {
       const next = param._1;
       const d = next.contents;
@@ -6538,9 +6538,9 @@ function backtrack(param) {
       return ;
     }
     throw new Caml_js_exceptions.MelangeError("Failure", {
-              MEL_EXN_ID: "Failure",
-              _1: "Btype.backtrack"
-            });
+          MEL_EXN_ID: "Failure",
+          _1: "Btype.backtrack"
+        });
   } else {
     cleanup_abbrev(undefined);
     const backlog = rev_log(/* [] */0, change);
@@ -6558,11 +6558,11 @@ function input_cmi(ic) {
   const crcs = Caml_external_polyfill.resolve("caml_input_value")(ic);
   const flags = Caml_external_polyfill.resolve("caml_input_value")(ic);
   return {
-          cmi_name: match[0],
-          cmi_sign: match[1],
-          cmi_crcs: crcs,
-          cmi_flags: flags
-        };
+    cmi_name: match[0],
+    cmi_sign: match[1],
+    cmi_crcs: crcs,
+    cmi_flags: flags
+  };
 }
 
 function read_cmi(filename) {
@@ -6575,21 +6575,21 @@ function read_cmi(filename) {
       if (Stdlib__String.sub(buffer, 0, pre_len) === Stdlib__String.sub(cmi_magic_number, 0, pre_len)) {
         const msg = buffer < cmi_magic_number ? "an older" : "a newer";
         throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                  MEL_EXN_ID: $$Error$1,
-                  _1: {
-                    TAG: /* Wrong_version_interface */1,
-                    _0: filename,
-                    _1: msg
-                  }
-                });
+              MEL_EXN_ID: $$Error$1,
+              _1: {
+                TAG: /* Wrong_version_interface */1,
+                _0: filename,
+                _1: msg
+              }
+            });
       }
       throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                MEL_EXN_ID: $$Error$1,
-                _1: {
-                  TAG: /* Not_an_interface */0,
-                  _0: filename
-                }
-              });
+            MEL_EXN_ID: $$Error$1,
+            _1: {
+              TAG: /* Not_an_interface */0,
+              _0: filename
+            }
+          });
     }
     const cmi = input_cmi(ic);
     Caml_external_polyfill.resolve("caml_ml_close_channel")(ic);
@@ -6600,29 +6600,29 @@ function read_cmi(filename) {
     if (e.MEL_EXN_ID === Stdlib.End_of_file) {
       Caml_external_polyfill.resolve("caml_ml_close_channel")(ic);
       throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                MEL_EXN_ID: $$Error$1,
-                _1: {
-                  TAG: /* Corrupted_interface */2,
-                  _0: filename
-                }
-              });
+            MEL_EXN_ID: $$Error$1,
+            _1: {
+              TAG: /* Corrupted_interface */2,
+              _0: filename
+            }
+          });
     }
     if (e.MEL_EXN_ID === Stdlib.Failure) {
       Caml_external_polyfill.resolve("caml_ml_close_channel")(ic);
       throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                MEL_EXN_ID: $$Error$1,
-                _1: {
-                  TAG: /* Corrupted_interface */2,
-                  _0: filename
-                }
-              });
+            MEL_EXN_ID: $$Error$1,
+            _1: {
+              TAG: /* Corrupted_interface */2,
+              _0: filename
+            }
+          });
     }
     if (e.MEL_EXN_ID === $$Error$1) {
       Caml_external_polyfill.resolve("caml_ml_close_channel")(ic);
       throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                MEL_EXN_ID: $$Error$1,
-                _1: e._1
-              });
+            MEL_EXN_ID: $$Error$1,
+            _1: e._1
+          });
     }
     throw new Caml_js_exceptions.MelangeError(e.MEL_EXN_ID, e);
   }
@@ -6654,86 +6654,86 @@ function report_error(ppf, filename) {
   switch (filename.TAG) {
     case /* Not_an_interface */0 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Alpha */15,
-                          _0: {
-                            TAG: /* Formatting_lit */17,
-                            _0: {
-                              TAG: /* Break */0,
-                              _0: "@ ",
-                              _1: 1,
-                              _2: 0
-                            },
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: "is not a compiled interface",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "%a@ is not a compiled interface"
-                      }), print_filename, filename._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Alpha */15,
+                    _0: {
+                      TAG: /* Formatting_lit */17,
+                      _0: {
+                        TAG: /* Break */0,
+                        _0: "@ ",
+                        _1: 1,
+                        _2: 0
+                      },
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "is not a compiled interface",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "%a@ is not a compiled interface"
+                }), print_filename, filename._0);
     case /* Wrong_version_interface */1 :
         return Curry._3(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Alpha */15,
-                          _0: {
-                            TAG: /* Formatting_lit */17,
-                            _0: {
-                              TAG: /* Break */0,
-                              _0: "@ ",
-                              _1: 1,
-                              _2: 0
-                            },
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Alpha */15,
+                    _0: {
+                      TAG: /* Formatting_lit */17,
+                      _0: {
+                        TAG: /* Break */0,
+                        _0: "@ ",
+                        _1: 1,
+                        _2: 0
+                      },
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "is not a compiled interface for this version of OCaml.",
+                        _1: {
+                          TAG: /* Formatting_lit */17,
+                          _0: /* Flush_newline */4,
+                          _1: {
+                            TAG: /* String_literal */11,
+                            _0: "It seems to be for ",
                             _1: {
-                              TAG: /* String_literal */11,
-                              _0: "is not a compiled interface for this version of OCaml.",
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
                               _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: /* Flush_newline */4,
-                                _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: "It seems to be for ",
-                                  _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: {
-                                      TAG: /* String_literal */11,
-                                      _0: " version of OCaml.",
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* String_literal */11,
+                                _0: " version of OCaml.",
+                                _1: /* End_of_format */0
                               }
                             }
                           }
-                        },
-                        _1: "%a@ is not a compiled interface for this version of OCaml.@.It seems to be for %s version of OCaml."
-                      }), print_filename, filename._0, filename._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "%a@ is not a compiled interface for this version of OCaml.@.It seems to be for %s version of OCaml."
+                }), print_filename, filename._0, filename._1);
     case /* Corrupted_interface */2 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Corrupted compiled interface",
-                          _1: {
-                            TAG: /* Formatting_lit */17,
-                            _0: {
-                              TAG: /* Break */0,
-                              _0: "@ ",
-                              _1: 1,
-                              _2: 0
-                            },
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "Corrupted compiled interface@ %a"
-                      }), print_filename, filename._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Corrupted compiled interface",
+                    _1: {
+                      TAG: /* Formatting_lit */17,
+                      _0: {
+                        TAG: /* Break */0,
+                        _0: "@ ",
+                        _1: 1,
+                        _2: 0
+                      },
+                      _1: {
+                        TAG: /* Alpha */15,
+                        _0: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Corrupted compiled interface@ %a"
+                }), print_filename, filename._0);
     
   }
 }
@@ -6757,30 +6757,30 @@ function set$1(tbl, name, crc, source) {
 function extract(l, tbl) {
   const l$1 = Stdlib__List.sort_uniq(Stdlib__String.compare, l);
   return Stdlib__List.fold_left((function (assc, name) {
-                try {
-                  const match = Stdlib__Hashtbl.find(tbl, name);
-                  return {
-                          hd: [
-                            name,
-                            Caml_option.some(match[0])
-                          ],
-                          tl: assc
-                        };
-                }
-                catch (raw_exn){
-                  const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-                  if (exn.MEL_EXN_ID === Stdlib.Not_found) {
-                    return {
-                            hd: [
-                              name,
-                              undefined
-                            ],
-                            tl: assc
-                          };
-                  }
-                  throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
-                }
-              }), /* [] */0, l$1);
+          try {
+            const match = Stdlib__Hashtbl.find(tbl, name);
+            return {
+              hd: [
+                name,
+                Caml_option.some(match[0])
+              ],
+              tl: assc
+            };
+          }
+          catch (raw_exn){
+            const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
+            if (exn.MEL_EXN_ID === Stdlib.Not_found) {
+              return {
+                hd: [
+                  name,
+                  undefined
+                ],
+                tl: assc
+              };
+            }
+            throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
+          }
+        }), /* [] */0, l$1);
 }
 
 function free_vars(ty) {
@@ -6865,20 +6865,20 @@ function extension_descr(path_ext, ext) {
     existentials = /* [] */0;
   }
   return {
-          cstr_name: last(path_ext),
-          cstr_res: ty_res,
-          cstr_existentials: existentials,
-          cstr_args: ext.ext_args,
-          cstr_arity: Stdlib__List.length(ext.ext_args),
-          cstr_tag: tag,
-          cstr_consts: -1,
-          cstr_nonconsts: -1,
-          cstr_normal: -1,
-          cstr_generalized: ext.ext_ret_type !== undefined,
-          cstr_private: ext.ext_private,
-          cstr_loc: ext.ext_loc,
-          cstr_attributes: ext.ext_attributes
-        };
+    cstr_name: last(path_ext),
+    cstr_res: ty_res,
+    cstr_existentials: existentials,
+    cstr_args: ext.ext_args,
+    cstr_arity: Stdlib__List.length(ext.ext_args),
+    cstr_tag: tag,
+    cstr_consts: -1,
+    cstr_nonconsts: -1,
+    cstr_normal: -1,
+    cstr_generalized: ext.ext_ret_type !== undefined,
+    cstr_private: ext.ext_private,
+    cstr_loc: ext.ext_loc,
+    cstr_attributes: ext.ext_attributes
+  };
 }
 
 const none$1 = {
@@ -7091,44 +7091,44 @@ const type_exn = newty2(100000000, {
 
 function type_array(t) {
   return newty2(100000000, {
-              TAG: /* Tconstr */3,
-              _0: path_array,
-              _1: {
-                hd: t,
-                tl: /* [] */0
-              },
-              _2: {
-                contents: /* Mnil */0
-              }
-            });
+        TAG: /* Tconstr */3,
+        _0: path_array,
+        _1: {
+          hd: t,
+          tl: /* [] */0
+        },
+        _2: {
+          contents: /* Mnil */0
+        }
+      });
 }
 
 function type_list(t) {
   return newty2(100000000, {
-              TAG: /* Tconstr */3,
-              _0: path_list,
-              _1: {
-                hd: t,
-                tl: /* [] */0
-              },
-              _2: {
-                contents: /* Mnil */0
-              }
-            });
+        TAG: /* Tconstr */3,
+        _0: path_list,
+        _1: {
+          hd: t,
+          tl: /* [] */0
+        },
+        _2: {
+          contents: /* Mnil */0
+        }
+      });
 }
 
 function type_option(t) {
   return newty2(100000000, {
-              TAG: /* Tconstr */3,
-              _0: path_option,
-              _1: {
-                hd: t,
-                tl: /* [] */0
-              },
-              _2: {
-                contents: /* Mnil */0
-              }
-            });
+        TAG: /* Tconstr */3,
+        _0: path_option,
+        _1: {
+          hd: t,
+          tl: /* [] */0
+        },
+        _2: {
+          contents: /* Mnil */0
+        }
+      });
 }
 
 const type_nativeint = newty2(100000000, {
@@ -7160,16 +7160,16 @@ const type_int64 = newty2(100000000, {
 
 function type_lazy_t(t) {
   return newty2(100000000, {
-              TAG: /* Tconstr */3,
-              _0: path_lazy_t,
-              _1: {
-                hd: t,
-                tl: /* [] */0
-              },
-              _2: {
-                contents: /* Mnil */0
-              }
-            });
+        TAG: /* Tconstr */3,
+        _0: path_lazy_t,
+        _1: {
+          hd: t,
+          tl: /* [] */0
+        },
+        _2: {
+          contents: /* Mnil */0
+        }
+      });
 }
 
 newty2(100000000, {
@@ -7219,12 +7219,12 @@ const decl_abstr = {
 
 function cstr(id, args) {
   return {
-          cd_id: id,
-          cd_args: args,
-          cd_res: undefined,
-          cd_loc: none,
-          cd_attributes: /* [] */0
-        };
+    cd_id: id,
+    cd_args: args,
+    cd_res: undefined,
+    cd_loc: none,
+    cd_attributes: /* [] */0
+  };
 }
 
 const ident_false = wrap(create, "false");
@@ -7415,70 +7415,70 @@ function common_initial_env(add_type, add_extension, empty_env) {
   };
   const add_extension$1 = function (id, l) {
     return Curry._2(add_extension, id, {
-                ext_type_path: path_exn,
-                ext_type_params: /* [] */0,
-                ext_args: l,
-                ext_ret_type: undefined,
-                ext_private: /* Public */1,
-                ext_loc: none,
-                ext_attributes: /* [] */0
-              });
+          ext_type_path: path_exn,
+          ext_type_params: /* [] */0,
+          ext_args: l,
+          ext_ret_type: undefined,
+          ext_private: /* Public */1,
+          ext_loc: none,
+          ext_attributes: /* [] */0
+        });
   };
   return Curry._1(add_extension$1(ident_match_failure, {
-                  hd: newty2(100000000, {
-                        TAG: /* Ttuple */2,
-                        _0: {
-                          hd: type_string,
-                          tl: {
-                            hd: type_int,
-                            tl: {
-                              hd: type_int,
-                              tl: /* [] */0
-                            }
-                          }
-                        }
-                      }),
-                  tl: /* [] */0
-                }), Curry._1(add_extension$1(ident_out_of_memory, /* [] */0), Curry._1(add_extension$1(ident_stack_overflow, /* [] */0), Curry._1(add_extension$1(ident_invalid_argument, {
-                              hd: type_string,
-                              tl: /* [] */0
-                            }), Curry._1(add_extension$1(ident_failure, {
-                                  hd: type_string,
-                                  tl: /* [] */0
-                                }), Curry._1(add_extension$1(ident_not_found, /* [] */0), Curry._1(add_extension$1(ident_sys_blocked_io, /* [] */0), Curry._1(add_extension$1(ident_sys_error, {
-                                              hd: type_string,
-                                              tl: /* [] */0
-                                            }), Curry._1(add_extension$1(ident_end_of_file, /* [] */0), Curry._1(add_extension$1(ident_division_by_zero, /* [] */0), Curry._1(add_extension$1(ident_assert_failure, {
-                                                          hd: newty2(100000000, {
-                                                                TAG: /* Ttuple */2,
-                                                                _0: {
-                                                                  hd: type_string,
+            hd: newty2(100000000, {
+                  TAG: /* Ttuple */2,
+                  _0: {
+                    hd: type_string,
+                    tl: {
+                      hd: type_int,
+                      tl: {
+                        hd: type_int,
+                        tl: /* [] */0
+                      }
+                    }
+                  }
+                }),
+            tl: /* [] */0
+          }), Curry._1(add_extension$1(ident_out_of_memory, /* [] */0), Curry._1(add_extension$1(ident_stack_overflow, /* [] */0), Curry._1(add_extension$1(ident_invalid_argument, {
+                        hd: type_string,
+                        tl: /* [] */0
+                      }), Curry._1(add_extension$1(ident_failure, {
+                            hd: type_string,
+                            tl: /* [] */0
+                          }), Curry._1(add_extension$1(ident_not_found, /* [] */0), Curry._1(add_extension$1(ident_sys_blocked_io, /* [] */0), Curry._1(add_extension$1(ident_sys_error, {
+                                        hd: type_string,
+                                        tl: /* [] */0
+                                      }), Curry._1(add_extension$1(ident_end_of_file, /* [] */0), Curry._1(add_extension$1(ident_division_by_zero, /* [] */0), Curry._1(add_extension$1(ident_assert_failure, {
+                                                    hd: newty2(100000000, {
+                                                          TAG: /* Ttuple */2,
+                                                          _0: {
+                                                            hd: type_string,
+                                                            tl: {
+                                                              hd: type_int,
+                                                              tl: {
+                                                                hd: type_int,
+                                                                tl: /* [] */0
+                                                              }
+                                                            }
+                                                          }
+                                                        }),
+                                                    tl: /* [] */0
+                                                  }), Curry._1(add_extension$1(ident_undefined_recursive_module, {
+                                                        hd: newty2(100000000, {
+                                                              TAG: /* Ttuple */2,
+                                                              _0: {
+                                                                hd: type_string,
+                                                                tl: {
+                                                                  hd: type_int,
                                                                   tl: {
                                                                     hd: type_int,
-                                                                    tl: {
-                                                                      hd: type_int,
-                                                                      tl: /* [] */0
-                                                                    }
+                                                                    tl: /* [] */0
                                                                   }
                                                                 }
-                                                              }),
-                                                          tl: /* [] */0
-                                                        }), Curry._1(add_extension$1(ident_undefined_recursive_module, {
-                                                              hd: newty2(100000000, {
-                                                                    TAG: /* Ttuple */2,
-                                                                    _0: {
-                                                                      hd: type_string,
-                                                                      tl: {
-                                                                        hd: type_int,
-                                                                        tl: {
-                                                                          hd: type_int,
-                                                                          tl: /* [] */0
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }),
-                                                              tl: /* [] */0
-                                                            }), Curry._3(add_type, ident_int64, decl_abstr, Curry._3(add_type, ident_int32, decl_abstr, Curry._3(add_type, ident_nativeint, decl_abstr, Curry._3(add_type, ident_lazy_t, decl_lazy_t, Curry._3(add_type, ident_option, decl_option, Curry._3(add_type, ident_list, decl_list, Curry._3(add_type, ident_array, decl_array, Curry._3(add_type, ident_exn, decl_exn, Curry._3(add_type, ident_unit, decl_unit, Curry._3(add_type, ident_bool, decl_bool, Curry._3(add_type, ident_float, decl_abstr, Curry._3(add_type, ident_string, decl_abstr, Curry._3(add_type, ident_char, decl_abstr, Curry._3(add_type, ident_int, decl_abstr, empty_env))))))))))))))))))))))))));
+                                                              }
+                                                            }),
+                                                        tl: /* [] */0
+                                                      }), Curry._3(add_type, ident_int64, decl_abstr, Curry._3(add_type, ident_int32, decl_abstr, Curry._3(add_type, ident_nativeint, decl_abstr, Curry._3(add_type, ident_lazy_t, decl_lazy_t, Curry._3(add_type, ident_option, decl_option, Curry._3(add_type, ident_list, decl_list, Curry._3(add_type, ident_array, decl_array, Curry._3(add_type, ident_exn, decl_exn, Curry._3(add_type, ident_unit, decl_unit, Curry._3(add_type, ident_bool, decl_bool, Curry._3(add_type, ident_float, decl_abstr, Curry._3(add_type, ident_string, decl_abstr, Curry._3(add_type, ident_char, decl_abstr, Curry._3(add_type, ident_int, decl_abstr, empty_env))))))))))))))))))))))))));
 }
 
 function build_initial_env(add_type, add_exception, empty_env) {
@@ -7498,17 +7498,17 @@ function build_initial_env(add_type, add_exception, empty_env) {
   };
   const unsafe_string = Curry._3(add_type, ident_bytes, decl_bytes_unsafe, common);
   return [
-          safe_string,
-          unsafe_string
-        ];
+    safe_string,
+    unsafe_string
+  ];
 }
 
 Stdlib__List.map((function (id) {
         make_global(id);
         return [
-                id.name,
-                id
-              ];
+          id.name,
+          id
+        ];
       }), {
       hd: ident_match_failure,
       tl: {
@@ -7561,31 +7561,31 @@ function warn_bad_docstrings(param) {
           _0: true
         })) {
     return Stdlib__List.iter((function (ds) {
-                  const match = ds.ds_attached;
-                  switch (match) {
-                    case /* Unattached */0 :
-                        return prerr_warning(ds.ds_loc, {
-                                    TAG: /* Bad_docstring */33,
-                                    _0: true
-                                  });
-                    case /* Info */1 :
+            const match = ds.ds_attached;
+            switch (match) {
+              case /* Unattached */0 :
+                  return prerr_warning(ds.ds_loc, {
+                        TAG: /* Bad_docstring */33,
+                        _0: true
+                      });
+              case /* Info */1 :
+                  return ;
+              case /* Docs */2 :
+                  const match$1 = ds.ds_associated;
+                  switch (match$1) {
+                    case /* Zero */0 :
+                    case /* One */1 :
                         return ;
-                    case /* Docs */2 :
-                        const match$1 = ds.ds_associated;
-                        switch (match$1) {
-                          case /* Zero */0 :
-                          case /* One */1 :
-                              return ;
-                          case /* Many */2 :
-                              return prerr_warning(ds.ds_loc, {
-                                          TAG: /* Bad_docstring */33,
-                                          _0: false
-                                        });
-                          
-                        }
+                    case /* Many */2 :
+                        return prerr_warning(ds.ds_loc, {
+                              TAG: /* Bad_docstring */33,
+                              _0: false
+                            });
                     
                   }
-                }), Stdlib__List.rev(docstrings.contents));
+              
+            }
+          }), Stdlib__List.rev(docstrings.contents));
   }
   
 }
@@ -7640,29 +7640,29 @@ function docs_attr(ds) {
     pstr_loc: item_pstr_loc
   };
   return [
-          doc_loc,
-          {
-            TAG: /* PStr */0,
-            _0: {
-              hd: item,
-              tl: /* [] */0
-            }
-          }
-        ];
+    doc_loc,
+    {
+      TAG: /* PStr */0,
+      _0: {
+        hd: item,
+        tl: /* [] */0
+      }
+    }
+  ];
 }
 
 function add_docs_attrs(docs, attrs) {
   const ds = docs.docs_pre;
   const attrs$1 = ds !== undefined ? ({
-        hd: docs_attr(ds),
-        tl: attrs
-      }) : attrs;
+      hd: docs_attr(ds),
+      tl: attrs
+    }) : attrs;
   const ds$1 = docs.docs_post;
   if (ds$1 !== undefined) {
     return Stdlib.$at(attrs$1, {
-                hd: docs_attr(ds$1),
-                tl: /* [] */0
-              });
+          hd: docs_attr(ds$1),
+          tl: /* [] */0
+        });
   } else {
     return attrs$1;
   }
@@ -7671,9 +7671,9 @@ function add_docs_attrs(docs, attrs) {
 function add_info_attrs(info, attrs) {
   if (info !== undefined) {
     return Stdlib.$at(attrs, {
-                hd: docs_attr(info),
-                tl: /* [] */0
-              });
+          hd: docs_attr(info),
+          tl: /* [] */0
+        });
   } else {
     return attrs;
   }
@@ -7710,15 +7710,15 @@ function text_attr(ds) {
     pstr_loc: item_pstr_loc
   };
   return [
-          text_loc,
-          {
-            TAG: /* PStr */0,
-            _0: {
-              hd: item,
-              tl: /* [] */0
-            }
-          }
-        ];
+    text_loc,
+    {
+      TAG: /* PStr */0,
+      _0: {
+        hd: item,
+        tl: /* [] */0
+      }
+    }
+  ];
 }
 
 function add_text_attrs(dsl, attrs) {
@@ -7950,23 +7950,23 @@ function get_post_extra_text(pos) {
 
 function symbol_docs(param) {
   return {
-          docs_pre: get_pre_docs(Stdlib__Parsing.symbol_start_pos(undefined)),
-          docs_post: get_post_docs(Stdlib__Parsing.symbol_end_pos(undefined))
-        };
+    docs_pre: get_pre_docs(Stdlib__Parsing.symbol_start_pos(undefined)),
+    docs_post: get_post_docs(Stdlib__Parsing.symbol_end_pos(undefined))
+  };
 }
 
 function symbol_docs_lazy(param) {
   const p1 = Stdlib__Parsing.symbol_start_pos(undefined);
   const p2 = Stdlib__Parsing.symbol_end_pos(undefined);
   return {
-          LAZY_DONE: false,
-          VAL: (function () {
-              return {
-                      docs_pre: get_pre_docs(p1),
-                      docs_post: get_post_docs(p2)
-                    };
-            })
+    LAZY_DONE: false,
+    VAL: (function () {
+        return {
+          docs_pre: get_pre_docs(p1),
+          docs_post: get_post_docs(p2)
         };
+      })
+  };
 }
 
 function mark_symbol_docs(param) {
@@ -7982,11 +7982,11 @@ function mark_rhs_docs(pos1, pos2) {
 function symbol_text_lazy(param) {
   const pos = Stdlib__Parsing.symbol_start_pos(undefined);
   return {
-          LAZY_DONE: false,
-          VAL: (function () {
-              return get_text(pos);
-            })
-        };
+    LAZY_DONE: false,
+    VAL: (function () {
+        return get_text(pos);
+      })
+  };
 }
 
 function init(param) {
@@ -8006,110 +8006,110 @@ function mk(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          ptyp_desc: d,
-          ptyp_loc: loc,
-          ptyp_attributes: attrs
-        };
+    ptyp_desc: d,
+    ptyp_loc: loc,
+    ptyp_attributes: attrs
+  };
 }
 
 function attr(d, a) {
   return {
-          ptyp_desc: d.ptyp_desc,
-          ptyp_loc: d.ptyp_loc,
-          ptyp_attributes: Stdlib.$at(d.ptyp_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    ptyp_desc: d.ptyp_desc,
+    ptyp_loc: d.ptyp_loc,
+    ptyp_attributes: Stdlib.$at(d.ptyp_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function $$var(loc, attrs, a) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_var */0,
-              _0: a
-            });
+        TAG: /* Ptyp_var */0,
+        _0: a
+      });
 }
 
 function arrow(loc, attrs, a, b, c) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_arrow */1,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Ptyp_arrow */1,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function tuple(loc, attrs, a) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_tuple */2,
-              _0: a
-            });
+        TAG: /* Ptyp_tuple */2,
+        _0: a
+      });
 }
 
 function constr(loc, attrs, a, b) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_constr */3,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ptyp_constr */3,
+        _0: a,
+        _1: b
+      });
 }
 
 function object_(loc, attrs, a, b) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_object */4,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ptyp_object */4,
+        _0: a,
+        _1: b
+      });
 }
 
 function class_(loc, attrs, a, b) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_class */5,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ptyp_class */5,
+        _0: a,
+        _1: b
+      });
 }
 
 function alias(loc, attrs, a, b) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_alias */6,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ptyp_alias */6,
+        _0: a,
+        _1: b
+      });
 }
 
 function variant(loc, attrs, a, b, c) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_variant */7,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Ptyp_variant */7,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function poly(loc, attrs, a, b) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_poly */8,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ptyp_poly */8,
+        _0: a,
+        _1: b
+      });
 }
 
 function $$package(loc, attrs, a, b) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_package */9,
-              _0: [
-                a,
-                b
-              ]
-            });
+        TAG: /* Ptyp_package */9,
+        _0: [
+          a,
+          b
+        ]
+      });
 }
 
 function extension(loc, attrs, a) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_extension */10,
-              _0: a
-            });
+        TAG: /* Ptyp_extension */10,
+        _0: a
+      });
 }
 
 function force_poly(t) {
@@ -8124,790 +8124,790 @@ function mk$1(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          ppat_desc: d,
-          ppat_loc: loc,
-          ppat_attributes: attrs
-        };
+    ppat_desc: d,
+    ppat_loc: loc,
+    ppat_attributes: attrs
+  };
 }
 
 function attr$1(d, a) {
   return {
-          ppat_desc: d.ppat_desc,
-          ppat_loc: d.ppat_loc,
-          ppat_attributes: Stdlib.$at(d.ppat_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    ppat_desc: d.ppat_desc,
+    ppat_loc: d.ppat_loc,
+    ppat_attributes: Stdlib.$at(d.ppat_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function $$var$1(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_var */0,
-              _0: a
-            });
+        TAG: /* Ppat_var */0,
+        _0: a
+      });
 }
 
 function alias$1(loc, attrs, a, b) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_alias */1,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ppat_alias */1,
+        _0: a,
+        _1: b
+      });
 }
 
 function constant(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_constant */2,
-              _0: a
-            });
+        TAG: /* Ppat_constant */2,
+        _0: a
+      });
 }
 
 function interval(loc, attrs, a, b) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_interval */3,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ppat_interval */3,
+        _0: a,
+        _1: b
+      });
 }
 
 function tuple$1(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_tuple */4,
-              _0: a
-            });
+        TAG: /* Ppat_tuple */4,
+        _0: a
+      });
 }
 
 function construct(loc, attrs, a, b) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_construct */5,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ppat_construct */5,
+        _0: a,
+        _1: b
+      });
 }
 
 function variant$1(loc, attrs, a, b) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_variant */6,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ppat_variant */6,
+        _0: a,
+        _1: b
+      });
 }
 
 function record(loc, attrs, a, b) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_record */7,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ppat_record */7,
+        _0: a,
+        _1: b
+      });
 }
 
 function array(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_array */8,
-              _0: a
-            });
+        TAG: /* Ppat_array */8,
+        _0: a
+      });
 }
 
 function or_(loc, attrs, a, b) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_or */9,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ppat_or */9,
+        _0: a,
+        _1: b
+      });
 }
 
 function constraint_(loc, attrs, a, b) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_constraint */10,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ppat_constraint */10,
+        _0: a,
+        _1: b
+      });
 }
 
 function type_(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_type */11,
-              _0: a
-            });
+        TAG: /* Ppat_type */11,
+        _0: a
+      });
 }
 
 function lazy_(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_lazy */12,
-              _0: a
-            });
+        TAG: /* Ppat_lazy */12,
+        _0: a
+      });
 }
 
 function unpack(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_unpack */13,
-              _0: a
-            });
+        TAG: /* Ppat_unpack */13,
+        _0: a
+      });
 }
 
 function exception_(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_exception */14,
-              _0: a
-            });
+        TAG: /* Ppat_exception */14,
+        _0: a
+      });
 }
 
 function extension$1(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_extension */15,
-              _0: a
-            });
+        TAG: /* Ppat_extension */15,
+        _0: a
+      });
 }
 
 function mk$2(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pexp_desc: d,
-          pexp_loc: loc,
-          pexp_attributes: attrs
-        };
+    pexp_desc: d,
+    pexp_loc: loc,
+    pexp_attributes: attrs
+  };
 }
 
 function attr$2(d, a) {
   return {
-          pexp_desc: d.pexp_desc,
-          pexp_loc: d.pexp_loc,
-          pexp_attributes: Stdlib.$at(d.pexp_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pexp_desc: d.pexp_desc,
+    pexp_loc: d.pexp_loc,
+    pexp_attributes: Stdlib.$at(d.pexp_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function ident(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_ident */0,
-              _0: a
-            });
+        TAG: /* Pexp_ident */0,
+        _0: a
+      });
 }
 
 function constant$1(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_constant */1,
-              _0: a
-            });
+        TAG: /* Pexp_constant */1,
+        _0: a
+      });
 }
 
 function let_(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_let */2,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_let */2,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function fun_(loc, attrs, a, b, c, d) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_fun */4,
-              _0: a,
-              _1: b,
-              _2: c,
-              _3: d
-            });
+        TAG: /* Pexp_fun */4,
+        _0: a,
+        _1: b,
+        _2: c,
+        _3: d
+      });
 }
 
 function function_(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_function */3,
-              _0: a
-            });
+        TAG: /* Pexp_function */3,
+        _0: a
+      });
 }
 
 function apply(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_apply */5,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_apply */5,
+        _0: a,
+        _1: b
+      });
 }
 
 function match_(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_match */6,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_match */6,
+        _0: a,
+        _1: b
+      });
 }
 
 function try_(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_try */7,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_try */7,
+        _0: a,
+        _1: b
+      });
 }
 
 function tuple$2(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_tuple */8,
-              _0: a
-            });
+        TAG: /* Pexp_tuple */8,
+        _0: a
+      });
 }
 
 function construct$1(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_construct */9,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_construct */9,
+        _0: a,
+        _1: b
+      });
 }
 
 function variant$2(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_variant */10,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_variant */10,
+        _0: a,
+        _1: b
+      });
 }
 
 function record$1(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_record */11,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_record */11,
+        _0: a,
+        _1: b
+      });
 }
 
 function field(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_field */12,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_field */12,
+        _0: a,
+        _1: b
+      });
 }
 
 function setfield(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_setfield */13,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_setfield */13,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function array$1(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_array */14,
-              _0: a
-            });
+        TAG: /* Pexp_array */14,
+        _0: a
+      });
 }
 
 function ifthenelse(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_ifthenelse */15,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_ifthenelse */15,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function sequence(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_sequence */16,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_sequence */16,
+        _0: a,
+        _1: b
+      });
 }
 
 function while_(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_while */17,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_while */17,
+        _0: a,
+        _1: b
+      });
 }
 
 function for_(loc, attrs, a, b, c, d, e) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_for */18,
-              _0: a,
-              _1: b,
-              _2: c,
-              _3: d,
-              _4: e
-            });
+        TAG: /* Pexp_for */18,
+        _0: a,
+        _1: b,
+        _2: c,
+        _3: d,
+        _4: e
+      });
 }
 
 function constraint_$1(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_constraint */19,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_constraint */19,
+        _0: a,
+        _1: b
+      });
 }
 
 function coerce(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_coerce */20,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_coerce */20,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function send(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_send */21,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_send */21,
+        _0: a,
+        _1: b
+      });
 }
 
 function new_(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_new */22,
-              _0: a
-            });
+        TAG: /* Pexp_new */22,
+        _0: a
+      });
 }
 
 function setinstvar(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_setinstvar */23,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_setinstvar */23,
+        _0: a,
+        _1: b
+      });
 }
 
 function override(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_override */24,
-              _0: a
-            });
+        TAG: /* Pexp_override */24,
+        _0: a
+      });
 }
 
 function letmodule(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_letmodule */25,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_letmodule */25,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function assert_(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_assert */26,
-              _0: a
-            });
+        TAG: /* Pexp_assert */26,
+        _0: a
+      });
 }
 
 function lazy_$1(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_lazy */27,
-              _0: a
-            });
+        TAG: /* Pexp_lazy */27,
+        _0: a
+      });
 }
 
 function poly$1(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_poly */28,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_poly */28,
+        _0: a,
+        _1: b
+      });
 }
 
 function object_$1(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_object */29,
-              _0: a
-            });
+        TAG: /* Pexp_object */29,
+        _0: a
+      });
 }
 
 function newtype(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_newtype */30,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_newtype */30,
+        _0: a,
+        _1: b
+      });
 }
 
 function pack(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_pack */31,
-              _0: a
-            });
+        TAG: /* Pexp_pack */31,
+        _0: a
+      });
 }
 
 function open_(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_open */32,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_open */32,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function extension$2(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_extension */33,
-              _0: a
-            });
+        TAG: /* Pexp_extension */33,
+        _0: a
+      });
 }
 
 function $$case(lhs, guard, rhs) {
   return {
-          pc_lhs: lhs,
-          pc_guard: guard,
-          pc_rhs: rhs
-        };
+    pc_lhs: lhs,
+    pc_guard: guard,
+    pc_rhs: rhs
+  };
 }
 
 function mk$3(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pmty_desc: d,
-          pmty_loc: loc,
-          pmty_attributes: attrs
-        };
+    pmty_desc: d,
+    pmty_loc: loc,
+    pmty_attributes: attrs
+  };
 }
 
 function attr$3(d, a) {
   return {
-          pmty_desc: d.pmty_desc,
-          pmty_loc: d.pmty_loc,
-          pmty_attributes: Stdlib.$at(d.pmty_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pmty_desc: d.pmty_desc,
+    pmty_loc: d.pmty_loc,
+    pmty_attributes: Stdlib.$at(d.pmty_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function ident$1(loc, attrs, a) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_ident */0,
-              _0: a
-            });
+        TAG: /* Pmty_ident */0,
+        _0: a
+      });
 }
 
 function alias$2(loc, attrs, a) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_alias */6,
-              _0: a
-            });
+        TAG: /* Pmty_alias */6,
+        _0: a
+      });
 }
 
 function signature(loc, attrs, a) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_signature */1,
-              _0: a
-            });
+        TAG: /* Pmty_signature */1,
+        _0: a
+      });
 }
 
 function functor_(loc, attrs, a, b, c) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_functor */2,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pmty_functor */2,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function with_(loc, attrs, a, b) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_with */3,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pmty_with */3,
+        _0: a,
+        _1: b
+      });
 }
 
 function typeof_(loc, attrs, a) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_typeof */4,
-              _0: a
-            });
+        TAG: /* Pmty_typeof */4,
+        _0: a
+      });
 }
 
 function extension$3(loc, attrs, a) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_extension */5,
-              _0: a
-            });
+        TAG: /* Pmty_extension */5,
+        _0: a
+      });
 }
 
 function mk$4(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pmod_desc: d,
-          pmod_loc: loc,
-          pmod_attributes: attrs
-        };
+    pmod_desc: d,
+    pmod_loc: loc,
+    pmod_attributes: attrs
+  };
 }
 
 function attr$4(d, a) {
   return {
-          pmod_desc: d.pmod_desc,
-          pmod_loc: d.pmod_loc,
-          pmod_attributes: Stdlib.$at(d.pmod_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pmod_desc: d.pmod_desc,
+    pmod_loc: d.pmod_loc,
+    pmod_attributes: Stdlib.$at(d.pmod_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function ident$2(loc, attrs, x) {
   return mk$4(loc, attrs, {
-              TAG: /* Pmod_ident */0,
-              _0: x
-            });
+        TAG: /* Pmod_ident */0,
+        _0: x
+      });
 }
 
 function structure(loc, attrs, x) {
   return mk$4(loc, attrs, {
-              TAG: /* Pmod_structure */1,
-              _0: x
-            });
+        TAG: /* Pmod_structure */1,
+        _0: x
+      });
 }
 
 function functor_$1(loc, attrs, arg, arg_ty, body) {
   return mk$4(loc, attrs, {
-              TAG: /* Pmod_functor */2,
-              _0: arg,
-              _1: arg_ty,
-              _2: body
-            });
+        TAG: /* Pmod_functor */2,
+        _0: arg,
+        _1: arg_ty,
+        _2: body
+      });
 }
 
 function apply$1(loc, attrs, m1, m2) {
   return mk$4(loc, attrs, {
-              TAG: /* Pmod_apply */3,
-              _0: m1,
-              _1: m2
-            });
+        TAG: /* Pmod_apply */3,
+        _0: m1,
+        _1: m2
+      });
 }
 
 function constraint_$2(loc, attrs, m, mty) {
   return mk$4(loc, attrs, {
-              TAG: /* Pmod_constraint */4,
-              _0: m,
-              _1: mty
-            });
+        TAG: /* Pmod_constraint */4,
+        _0: m,
+        _1: mty
+      });
 }
 
 function unpack$1(loc, attrs, e) {
   return mk$4(loc, attrs, {
-              TAG: /* Pmod_unpack */5,
-              _0: e
-            });
+        TAG: /* Pmod_unpack */5,
+        _0: e
+      });
 }
 
 function extension$4(loc, attrs, a) {
   return mk$4(loc, attrs, {
-              TAG: /* Pmod_extension */6,
-              _0: a
-            });
+        TAG: /* Pmod_extension */6,
+        _0: a
+      });
 }
 
 function mk$5(locOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   return {
-          psig_desc: d,
-          psig_loc: loc
-        };
+    psig_desc: d,
+    psig_loc: loc
+  };
 }
 
 function extension$5(loc, attrsOpt, a) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return mk$5(loc, {
-              TAG: /* Psig_extension */12,
-              _0: a,
-              _1: attrs
-            });
+        TAG: /* Psig_extension */12,
+        _0: a,
+        _1: attrs
+      });
 }
 
 function text(txt) {
   return Stdlib__List.map((function (ds) {
-                const a = text_attr(ds);
-                const loc = ds.ds_loc;
-                return mk$5(loc, {
-                            TAG: /* Psig_attribute */11,
-                            _0: a
-                          });
-              }), txt);
+          const a = text_attr(ds);
+          const loc = ds.ds_loc;
+          return mk$5(loc, {
+                TAG: /* Psig_attribute */11,
+                _0: a
+              });
+        }), txt);
 }
 
 function mk$6(locOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   return {
-          pstr_desc: d,
-          pstr_loc: loc
-        };
+    pstr_desc: d,
+    pstr_loc: loc
+  };
 }
 
 function $$eval(loc, attrsOpt, a) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return mk$6(loc, {
-              TAG: /* Pstr_eval */0,
-              _0: a,
-              _1: attrs
-            });
+        TAG: /* Pstr_eval */0,
+        _0: a,
+        _1: attrs
+      });
 }
 
 function value(loc, a, b) {
   return mk$6(loc, {
-              TAG: /* Pstr_value */1,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pstr_value */1,
+        _0: a,
+        _1: b
+      });
 }
 
 function extension$6(loc, attrsOpt, a) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return mk$6(loc, {
-              TAG: /* Pstr_extension */14,
-              _0: a,
-              _1: attrs
-            });
+        TAG: /* Pstr_extension */14,
+        _0: a,
+        _1: attrs
+      });
 }
 
 function text$1(txt) {
   return Stdlib__List.map((function (ds) {
-                const a = text_attr(ds);
-                const loc = ds.ds_loc;
-                return mk$6(loc, {
-                            TAG: /* Pstr_attribute */13,
-                            _0: a
-                          });
-              }), txt);
+          const a = text_attr(ds);
+          const loc = ds.ds_loc;
+          return mk$6(loc, {
+                TAG: /* Pstr_attribute */13,
+                _0: a
+              });
+        }), txt);
 }
 
 function mk$7(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pcl_desc: d,
-          pcl_loc: loc,
-          pcl_attributes: attrs
-        };
+    pcl_desc: d,
+    pcl_loc: loc,
+    pcl_attributes: attrs
+  };
 }
 
 function attr$5(d, a) {
   return {
-          pcl_desc: d.pcl_desc,
-          pcl_loc: d.pcl_loc,
-          pcl_attributes: Stdlib.$at(d.pcl_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pcl_desc: d.pcl_desc,
+    pcl_loc: d.pcl_loc,
+    pcl_attributes: Stdlib.$at(d.pcl_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function constr$1(loc, attrs, a, b) {
   return mk$7(loc, attrs, {
-              TAG: /* Pcl_constr */0,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pcl_constr */0,
+        _0: a,
+        _1: b
+      });
 }
 
 function structure$1(loc, attrs, a) {
   return mk$7(loc, attrs, {
-              TAG: /* Pcl_structure */1,
-              _0: a
-            });
+        TAG: /* Pcl_structure */1,
+        _0: a
+      });
 }
 
 function fun_$1(loc, attrs, a, b, c, d) {
   return mk$7(loc, attrs, {
-              TAG: /* Pcl_fun */2,
-              _0: a,
-              _1: b,
-              _2: c,
-              _3: d
-            });
+        TAG: /* Pcl_fun */2,
+        _0: a,
+        _1: b,
+        _2: c,
+        _3: d
+      });
 }
 
 function apply$2(loc, attrs, a, b) {
   return mk$7(loc, attrs, {
-              TAG: /* Pcl_apply */3,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pcl_apply */3,
+        _0: a,
+        _1: b
+      });
 }
 
 function let_$1(loc, attrs, a, b, c) {
   return mk$7(loc, attrs, {
-              TAG: /* Pcl_let */4,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pcl_let */4,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function constraint_$3(loc, attrs, a, b) {
   return mk$7(loc, attrs, {
-              TAG: /* Pcl_constraint */5,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pcl_constraint */5,
+        _0: a,
+        _1: b
+      });
 }
 
 function extension$7(loc, attrs, a) {
   return mk$7(loc, attrs, {
-              TAG: /* Pcl_extension */6,
-              _0: a
-            });
+        TAG: /* Pcl_extension */6,
+        _0: a
+      });
 }
 
 function mk$8(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pcty_desc: d,
-          pcty_loc: loc,
-          pcty_attributes: attrs
-        };
+    pcty_desc: d,
+    pcty_loc: loc,
+    pcty_attributes: attrs
+  };
 }
 
 function attr$6(d, a) {
   return {
-          pcty_desc: d.pcty_desc,
-          pcty_loc: d.pcty_loc,
-          pcty_attributes: Stdlib.$at(d.pcty_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pcty_desc: d.pcty_desc,
+    pcty_loc: d.pcty_loc,
+    pcty_attributes: Stdlib.$at(d.pcty_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function constr$2(loc, attrs, a, b) {
   return mk$8(loc, attrs, {
-              TAG: /* Pcty_constr */0,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pcty_constr */0,
+        _0: a,
+        _1: b
+      });
 }
 
 function signature$1(loc, attrs, a) {
   return mk$8(loc, attrs, {
-              TAG: /* Pcty_signature */1,
-              _0: a
-            });
+        TAG: /* Pcty_signature */1,
+        _0: a
+      });
 }
 
 function arrow$1(loc, attrs, a, b, c) {
   return mk$8(loc, attrs, {
-              TAG: /* Pcty_arrow */2,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pcty_arrow */2,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function extension$8(loc, attrs, a) {
   return mk$8(loc, attrs, {
-              TAG: /* Pcty_extension */3,
-              _0: a
-            });
+        TAG: /* Pcty_extension */3,
+        _0: a
+      });
 }
 
 function mk$9(locOpt, attrsOpt, docsOpt, d) {
@@ -8915,82 +8915,82 @@ function mk$9(locOpt, attrsOpt, docsOpt, d) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   return {
-          pctf_desc: d,
-          pctf_loc: loc,
-          pctf_attributes: add_docs_attrs(docs, attrs)
-        };
+    pctf_desc: d,
+    pctf_loc: loc,
+    pctf_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 function inherit_(loc, attrs, a) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_inherit */0,
-              _0: a
-            });
+        TAG: /* Pctf_inherit */0,
+        _0: a
+      });
 }
 
 function val_(loc, attrs, a, b, c, d) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_val */1,
-              _0: [
-                a,
-                b,
-                c,
-                d
-              ]
-            });
+        TAG: /* Pctf_val */1,
+        _0: [
+          a,
+          b,
+          c,
+          d
+        ]
+      });
 }
 
 function method_(loc, attrs, a, b, c, d) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_method */2,
-              _0: [
-                a,
-                b,
-                c,
-                d
-              ]
-            });
+        TAG: /* Pctf_method */2,
+        _0: [
+          a,
+          b,
+          c,
+          d
+        ]
+      });
 }
 
 function constraint_$4(loc, attrs, a, b) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_constraint */3,
-              _0: [
-                a,
-                b
-              ]
-            });
+        TAG: /* Pctf_constraint */3,
+        _0: [
+          a,
+          b
+        ]
+      });
 }
 
 function extension$9(loc, attrs, a) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_extension */5,
-              _0: a
-            });
+        TAG: /* Pctf_extension */5,
+        _0: a
+      });
 }
 
 function attribute(loc, a) {
   return mk$9(loc, undefined, undefined, {
-              TAG: /* Pctf_attribute */4,
-              _0: a
-            });
+        TAG: /* Pctf_attribute */4,
+        _0: a
+      });
 }
 
 function text$2(txt) {
   return Stdlib__List.map((function (ds) {
-                return attribute(ds.ds_loc, text_attr(ds));
-              }), txt);
+          return attribute(ds.ds_loc, text_attr(ds));
+        }), txt);
 }
 
 function attr$7(d, a) {
   return {
-          pctf_desc: d.pctf_desc,
-          pctf_loc: d.pctf_loc,
-          pctf_attributes: Stdlib.$at(d.pctf_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pctf_desc: d.pctf_desc,
+    pctf_loc: d.pctf_loc,
+    pctf_attributes: Stdlib.$at(d.pctf_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function mk$10(locOpt, attrsOpt, docsOpt, d) {
@@ -8998,104 +8998,104 @@ function mk$10(locOpt, attrsOpt, docsOpt, d) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   return {
-          pcf_desc: d,
-          pcf_loc: loc,
-          pcf_attributes: add_docs_attrs(docs, attrs)
-        };
+    pcf_desc: d,
+    pcf_loc: loc,
+    pcf_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 function inherit_$1(loc, attrs, a, b, c) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_inherit */0,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pcf_inherit */0,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function val_$1(loc, attrs, a, b, c) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_val */1,
-              _0: [
-                a,
-                b,
-                c
-              ]
-            });
+        TAG: /* Pcf_val */1,
+        _0: [
+          a,
+          b,
+          c
+        ]
+      });
 }
 
 function method_$1(loc, attrs, a, b, c) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_method */2,
-              _0: [
-                a,
-                b,
-                c
-              ]
-            });
+        TAG: /* Pcf_method */2,
+        _0: [
+          a,
+          b,
+          c
+        ]
+      });
 }
 
 function constraint_$5(loc, attrs, a, b) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_constraint */3,
-              _0: [
-                a,
-                b
-              ]
-            });
+        TAG: /* Pcf_constraint */3,
+        _0: [
+          a,
+          b
+        ]
+      });
 }
 
 function initializer_(loc, attrs, a) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_initializer */4,
-              _0: a
-            });
+        TAG: /* Pcf_initializer */4,
+        _0: a
+      });
 }
 
 function extension$10(loc, attrs, a) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_extension */6,
-              _0: a
-            });
+        TAG: /* Pcf_extension */6,
+        _0: a
+      });
 }
 
 function attribute$1(loc, a) {
   return mk$10(loc, undefined, undefined, {
-              TAG: /* Pcf_attribute */5,
-              _0: a
-            });
+        TAG: /* Pcf_attribute */5,
+        _0: a
+      });
 }
 
 function text$3(txt) {
   return Stdlib__List.map((function (ds) {
-                return attribute$1(ds.ds_loc, text_attr(ds));
-              }), txt);
+          return attribute$1(ds.ds_loc, text_attr(ds));
+        }), txt);
 }
 
 function virtual_(ct) {
   return {
-          TAG: /* Cfk_virtual */0,
-          _0: ct
-        };
+    TAG: /* Cfk_virtual */0,
+    _0: ct
+  };
 }
 
 function concrete(o, e) {
   return {
-          TAG: /* Cfk_concrete */1,
-          _0: o,
-          _1: e
-        };
+    TAG: /* Cfk_concrete */1,
+    _0: o,
+    _1: e
+  };
 }
 
 function attr$8(d, a) {
   return {
-          pcf_desc: d.pcf_desc,
-          pcf_loc: d.pcf_loc,
-          pcf_attributes: Stdlib.$at(d.pcf_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pcf_desc: d.pcf_desc,
+    pcf_loc: d.pcf_loc,
+    pcf_attributes: Stdlib.$at(d.pcf_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function mk$11(locOpt, attrsOpt, docsOpt, primOpt, name, typ) {
@@ -9104,12 +9104,12 @@ function mk$11(locOpt, attrsOpt, docsOpt, primOpt, name, typ) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const prim = primOpt !== undefined ? primOpt : /* [] */0;
   return {
-          pval_name: name,
-          pval_type: typ,
-          pval_prim: prim,
-          pval_attributes: add_docs_attrs(docs, attrs),
-          pval_loc: loc
-        };
+    pval_name: name,
+    pval_type: typ,
+    pval_prim: prim,
+    pval_attributes: add_docs_attrs(docs, attrs),
+    pval_loc: loc
+  };
 }
 
 function mk$12(locOpt, attrsOpt, docsOpt, textOpt, name, typ) {
@@ -9118,11 +9118,11 @@ function mk$12(locOpt, attrsOpt, docsOpt, textOpt, name, typ) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const text = textOpt !== undefined ? textOpt : /* [] */0;
   return {
-          pmd_name: name,
-          pmd_type: typ,
-          pmd_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          pmd_loc: loc
-        };
+    pmd_name: name,
+    pmd_type: typ,
+    pmd_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    pmd_loc: loc
+  };
 }
 
 function mk$13(locOpt, attrsOpt, docsOpt, textOpt, typ, name) {
@@ -9131,11 +9131,11 @@ function mk$13(locOpt, attrsOpt, docsOpt, textOpt, typ, name) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const text = textOpt !== undefined ? textOpt : /* [] */0;
   return {
-          pmtd_name: name,
-          pmtd_type: typ,
-          pmtd_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          pmtd_loc: loc
-        };
+    pmtd_name: name,
+    pmtd_type: typ,
+    pmtd_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    pmtd_loc: loc
+  };
 }
 
 function mk$14(locOpt, attrsOpt, docsOpt, textOpt, name, expr) {
@@ -9144,11 +9144,11 @@ function mk$14(locOpt, attrsOpt, docsOpt, textOpt, name, expr) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const text = textOpt !== undefined ? textOpt : /* [] */0;
   return {
-          pmb_name: name,
-          pmb_expr: expr,
-          pmb_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          pmb_loc: loc
-        };
+    pmb_name: name,
+    pmb_expr: expr,
+    pmb_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    pmb_loc: loc
+  };
 }
 
 function mk$15(locOpt, attrsOpt, docsOpt, overrideOpt, lid) {
@@ -9157,11 +9157,11 @@ function mk$15(locOpt, attrsOpt, docsOpt, overrideOpt, lid) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const override = overrideOpt !== undefined ? overrideOpt : /* Fresh */1;
   return {
-          popen_lid: lid,
-          popen_override: override,
-          popen_loc: loc,
-          popen_attributes: add_docs_attrs(docs, attrs)
-        };
+    popen_lid: lid,
+    popen_override: override,
+    popen_loc: loc,
+    popen_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 function mk$16(locOpt, attrsOpt, docsOpt, mexpr) {
@@ -9169,10 +9169,10 @@ function mk$16(locOpt, attrsOpt, docsOpt, mexpr) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   return {
-          pincl_mod: mexpr,
-          pincl_loc: loc,
-          pincl_attributes: add_docs_attrs(docs, attrs)
-        };
+    pincl_mod: mexpr,
+    pincl_loc: loc,
+    pincl_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 function mk$17(locOpt, attrsOpt, docsOpt, textOpt, pat, expr) {
@@ -9181,11 +9181,11 @@ function mk$17(locOpt, attrsOpt, docsOpt, textOpt, pat, expr) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const text = textOpt !== undefined ? textOpt : /* [] */0;
   return {
-          pvb_pat: pat,
-          pvb_expr: expr,
-          pvb_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          pvb_loc: loc
-        };
+    pvb_pat: pat,
+    pvb_expr: expr,
+    pvb_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    pvb_loc: loc
+  };
 }
 
 function mk$18(locOpt, attrsOpt, docsOpt, textOpt, virtOpt, paramsOpt, name, expr) {
@@ -9196,13 +9196,13 @@ function mk$18(locOpt, attrsOpt, docsOpt, textOpt, virtOpt, paramsOpt, name, exp
   const virt = virtOpt !== undefined ? virtOpt : /* Concrete */1;
   const params = paramsOpt !== undefined ? paramsOpt : /* [] */0;
   return {
-          pci_virt: virt,
-          pci_params: params,
-          pci_name: name,
-          pci_expr: expr,
-          pci_loc: loc,
-          pci_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs))
-        };
+    pci_virt: virt,
+    pci_params: params,
+    pci_name: name,
+    pci_expr: expr,
+    pci_loc: loc,
+    pci_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs))
+  };
 }
 
 function mk$19(locOpt, attrsOpt, docsOpt, textOpt, paramsOpt, cstrsOpt, kindOpt, privOpt, manifest, name) {
@@ -9215,15 +9215,15 @@ function mk$19(locOpt, attrsOpt, docsOpt, textOpt, paramsOpt, cstrsOpt, kindOpt,
   const kind = kindOpt !== undefined ? kindOpt : /* Ptype_abstract */0;
   const priv = privOpt !== undefined ? privOpt : /* Public */1;
   return {
-          ptype_name: name,
-          ptype_params: params,
-          ptype_cstrs: cstrs,
-          ptype_kind: kind,
-          ptype_private: priv,
-          ptype_manifest: manifest,
-          ptype_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          ptype_loc: loc
-        };
+    ptype_name: name,
+    ptype_params: params,
+    ptype_cstrs: cstrs,
+    ptype_kind: kind,
+    ptype_private: priv,
+    ptype_manifest: manifest,
+    ptype_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    ptype_loc: loc
+  };
 }
 
 function constructor(locOpt, attrsOpt, infoOpt, argsOpt, res, name) {
@@ -9232,12 +9232,12 @@ function constructor(locOpt, attrsOpt, infoOpt, argsOpt, res, name) {
   const info = infoOpt !== undefined ? Caml_option.valFromOption(infoOpt) : undefined;
   const args = argsOpt !== undefined ? argsOpt : /* [] */0;
   return {
-          pcd_name: name,
-          pcd_args: args,
-          pcd_res: res,
-          pcd_loc: loc,
-          pcd_attributes: add_info_attrs(info, attrs)
-        };
+    pcd_name: name,
+    pcd_args: args,
+    pcd_res: res,
+    pcd_loc: loc,
+    pcd_attributes: add_info_attrs(info, attrs)
+  };
 }
 
 function field$1(locOpt, attrsOpt, infoOpt, mutOpt, name, typ) {
@@ -9246,12 +9246,12 @@ function field$1(locOpt, attrsOpt, infoOpt, mutOpt, name, typ) {
   const info = infoOpt !== undefined ? Caml_option.valFromOption(infoOpt) : undefined;
   const mut = mutOpt !== undefined ? mutOpt : /* Immutable */0;
   return {
-          pld_name: name,
-          pld_mutable: mut,
-          pld_type: typ,
-          pld_loc: loc,
-          pld_attributes: add_info_attrs(info, attrs)
-        };
+    pld_name: name,
+    pld_mutable: mut,
+    pld_type: typ,
+    pld_loc: loc,
+    pld_attributes: add_info_attrs(info, attrs)
+  };
 }
 
 function mk$20(attrsOpt, docsOpt, paramsOpt, privOpt, path, constructors) {
@@ -9260,12 +9260,12 @@ function mk$20(attrsOpt, docsOpt, paramsOpt, privOpt, path, constructors) {
   const params = paramsOpt !== undefined ? paramsOpt : /* [] */0;
   const priv = privOpt !== undefined ? privOpt : /* Public */1;
   return {
-          ptyext_path: path,
-          ptyext_params: params,
-          ptyext_constructors: constructors,
-          ptyext_private: priv,
-          ptyext_attributes: add_docs_attrs(docs, attrs)
-        };
+    ptyext_path: path,
+    ptyext_params: params,
+    ptyext_constructors: constructors,
+    ptyext_private: priv,
+    ptyext_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 function constructor$1(locOpt, attrsOpt, docsOpt, infoOpt, name, kind) {
@@ -9274,11 +9274,11 @@ function constructor$1(locOpt, attrsOpt, docsOpt, infoOpt, name, kind) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const info = infoOpt !== undefined ? Caml_option.valFromOption(infoOpt) : undefined;
   return {
-          pext_name: name,
-          pext_kind: kind,
-          pext_loc: loc,
-          pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
-        };
+    pext_name: name,
+    pext_kind: kind,
+    pext_loc: loc,
+    pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
+  };
 }
 
 function decl(locOpt, attrsOpt, docsOpt, infoOpt, argsOpt, res, name) {
@@ -9288,15 +9288,15 @@ function decl(locOpt, attrsOpt, docsOpt, infoOpt, argsOpt, res, name) {
   const info = infoOpt !== undefined ? Caml_option.valFromOption(infoOpt) : undefined;
   const args = argsOpt !== undefined ? argsOpt : /* [] */0;
   return {
-          pext_name: name,
-          pext_kind: {
-            TAG: /* Pext_decl */0,
-            _0: args,
-            _1: res
-          },
-          pext_loc: loc,
-          pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
-        };
+    pext_name: name,
+    pext_kind: {
+      TAG: /* Pext_decl */0,
+      _0: args,
+      _1: res
+    },
+    pext_loc: loc,
+    pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
+  };
 }
 
 function rebind(locOpt, attrsOpt, docsOpt, infoOpt, name, lid) {
@@ -9305,14 +9305,14 @@ function rebind(locOpt, attrsOpt, docsOpt, infoOpt, name, lid) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const info = infoOpt !== undefined ? Caml_option.valFromOption(infoOpt) : undefined;
   return {
-          pext_name: name,
-          pext_kind: {
-            TAG: /* Pext_rebind */1,
-            _0: lid
-          },
-          pext_loc: loc,
-          pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
-        };
+    pext_name: name,
+    pext_kind: {
+      TAG: /* Pext_rebind */1,
+      _0: lid
+    },
+    pext_loc: loc,
+    pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
+  };
 }
 
 const Ast_helper_Exp = {
@@ -9384,23 +9384,23 @@ const Ast_helper_Cf = {
 
 function map_fst(f, param) {
   return [
-          Curry._1(f, param[0]),
-          param[1]
-        ];
+    Curry._1(f, param[0]),
+    param[1]
+  ];
 }
 
 function map_snd(f, param) {
   return [
-          param[0],
-          Curry._1(f, param[1])
-        ];
+    param[0],
+    Curry._1(f, param[1])
+  ];
 }
 
 function map_tuple(f1, f2, param) {
   return [
-          Curry._1(f1, param[0]),
-          Curry._1(f2, param[1])
-        ];
+    Curry._1(f1, param[0]),
+    Curry._1(f2, param[1])
+  ];
 }
 
 function map_opt(f, x) {
@@ -9412,9 +9412,9 @@ function map_opt(f, x) {
 
 function map_loc(sub, param) {
   return {
-          txt: param.txt,
-          loc: Curry._2(sub.location, sub, param.loc)
-        };
+    txt: param.txt,
+    loc: Curry._2(sub.location, sub, param.loc)
+  };
 }
 
 function map$1(sub, param) {
@@ -9436,10 +9436,10 @@ function map$1(sub, param) {
     case /* Ptyp_object */4 :
         const f = function (param) {
           return [
-                  param[0],
-                  Curry._2(sub.attributes, sub, param[1]),
-                  Curry._2(sub.typ, sub, param[2])
-                ];
+            param[0],
+            Curry._2(sub.attributes, sub, param[1]),
+            Curry._2(sub.typ, sub, param[2])
+          ];
         };
         return object_(loc, attrs, Stdlib__List.map(f, desc._0), desc._1);
     case /* Ptyp_class */5 :
@@ -9448,31 +9448,31 @@ function map$1(sub, param) {
         return alias(loc, attrs, Curry._2(sub.typ, sub, desc._0), desc._1);
     case /* Ptyp_variant */7 :
         return variant(loc, attrs, Stdlib__List.map((function (param) {
-                          if (param.TAG === /* Rtag */0) {
-                            return {
-                                    TAG: /* Rtag */0,
-                                    _0: param._0,
-                                    _1: Curry._2(sub.attributes, sub, param._1),
-                                    _2: param._2,
-                                    _3: Stdlib__List.map(Curry._1(sub.typ, sub), param._3)
-                                  };
-                          } else {
-                            return {
-                                    TAG: /* Rinherit */1,
-                                    _0: Curry._2(sub.typ, sub, param._0)
-                                  };
-                          }
-                        }), desc._0), desc._1, desc._2);
+                    if (param.TAG === /* Rtag */0) {
+                      return {
+                        TAG: /* Rtag */0,
+                        _0: param._0,
+                        _1: Curry._2(sub.attributes, sub, param._1),
+                        _2: param._2,
+                        _3: Stdlib__List.map(Curry._1(sub.typ, sub), param._3)
+                      };
+                    } else {
+                      return {
+                        TAG: /* Rinherit */1,
+                        _0: Curry._2(sub.typ, sub, param._0)
+                      };
+                    }
+                  }), desc._0), desc._1, desc._2);
     case /* Ptyp_poly */8 :
         return poly(loc, attrs, desc._0, Curry._2(sub.typ, sub, desc._1));
     case /* Ptyp_package */9 :
         const match = desc._0;
         const partial_arg = Curry._1(sub.typ, sub);
         return $$package(loc, attrs, map_loc(sub, match[0]), Stdlib__List.map((function (param) {
-                          return map_tuple((function (param) {
-                                        return map_loc(sub, param);
-                                      }), partial_arg, param);
-                        }), match[1]));
+                    return map_tuple((function (param) {
+                            return map_loc(sub, param);
+                          }), partial_arg, param);
+                  }), match[1]));
     case /* Ptyp_extension */10 :
         return extension(loc, attrs, Curry._2(sub.extension, sub, desc._0));
     
@@ -9485,14 +9485,14 @@ function map_type_declaration(sub, param) {
   const partial_arg$2 = Curry._1(sub.typ, sub);
   const partial_arg$3 = Curry._1(sub.typ, sub);
   return mk$19(Curry._2(sub.location, sub, param.ptype_loc), Curry._2(sub.attributes, sub, param.ptype_attributes), undefined, undefined, Stdlib__List.map((function (param) {
-                    return map_fst(partial_arg, param);
-                  }), param.ptype_params), Stdlib__List.map((function (param) {
-                    return [
-                            Curry._1(partial_arg$3, param[0]),
-                            Curry._1(partial_arg$2, param[1]),
-                            Curry._1(partial_arg$1, param[2])
-                          ];
-                  }), param.ptype_cstrs), Curry._2(sub.type_kind, sub, param.ptype_kind), param.ptype_private, map_opt(Curry._1(sub.typ, sub), param.ptype_manifest), map_loc(sub, param.ptype_name));
+              return map_fst(partial_arg, param);
+            }), param.ptype_params), Stdlib__List.map((function (param) {
+              return [
+                Curry._1(partial_arg$3, param[0]),
+                Curry._1(partial_arg$2, param[1]),
+                Curry._1(partial_arg$1, param[2])
+              ];
+            }), param.ptype_cstrs), Curry._2(sub.type_kind, sub, param.ptype_kind), param.ptype_private, map_opt(Curry._1(sub.typ, sub), param.ptype_manifest), map_loc(sub, param.ptype_name));
 }
 
 function map_type_kind(sub, l) {
@@ -9504,36 +9504,36 @@ function map_type_kind(sub, l) {
     }
   } else if (l.TAG === /* Ptype_variant */0) {
     return {
-            TAG: /* Ptype_variant */0,
-            _0: Stdlib__List.map(Curry._1(sub.constructor_declaration, sub), l._0)
-          };
+      TAG: /* Ptype_variant */0,
+      _0: Stdlib__List.map(Curry._1(sub.constructor_declaration, sub), l._0)
+    };
   } else {
     return {
-            TAG: /* Ptype_record */1,
-            _0: Stdlib__List.map(Curry._1(sub.label_declaration, sub), l._0)
-          };
+      TAG: /* Ptype_record */1,
+      _0: Stdlib__List.map(Curry._1(sub.label_declaration, sub), l._0)
+    };
   }
 }
 
 function map_type_extension(sub, param) {
   const partial_arg = Curry._1(sub.typ, sub);
   return mk$20(Curry._2(sub.attributes, sub, param.ptyext_attributes), undefined, Stdlib__List.map((function (param) {
-                    return map_fst(partial_arg, param);
-                  }), param.ptyext_params), param.ptyext_private, map_loc(sub, param.ptyext_path), Stdlib__List.map(Curry._1(sub.extension_constructor, sub), param.ptyext_constructors));
+              return map_fst(partial_arg, param);
+            }), param.ptyext_params), param.ptyext_private, map_loc(sub, param.ptyext_path), Stdlib__List.map(Curry._1(sub.extension_constructor, sub), param.ptyext_constructors));
 }
 
 function map_extension_constructor_kind(sub, li) {
   if (li.TAG === /* Pext_decl */0) {
     return {
-            TAG: /* Pext_decl */0,
-            _0: Stdlib__List.map(Curry._1(sub.typ, sub), li._0),
-            _1: map_opt(Curry._1(sub.typ, sub), li._1)
-          };
+      TAG: /* Pext_decl */0,
+      _0: Stdlib__List.map(Curry._1(sub.typ, sub), li._0),
+      _1: map_opt(Curry._1(sub.typ, sub), li._1)
+    };
   } else {
     return {
-            TAG: /* Pext_rebind */1,
-            _0: map_loc(sub, li._0)
-          };
+      TAG: /* Pext_rebind */1,
+      _0: map_loc(sub, li._0)
+    };
   }
 }
 
@@ -9584,9 +9584,9 @@ function map_field(sub, param) {
 
 function map_signature(sub, param) {
   return {
-          pcsig_self: Curry._2(sub.typ, sub, param.pcsig_self),
-          pcsig_fields: Stdlib__List.map(Curry._1(sub.class_type_field, sub), param.pcsig_fields)
-        };
+    pcsig_self: Curry._2(sub.typ, sub, param.pcsig_self),
+    pcsig_fields: Stdlib__List.map(Curry._1(sub.class_type_field, sub), param.pcsig_fields)
+  };
 }
 
 function map$3(sub, param) {
@@ -9616,27 +9616,27 @@ function map_with_constraint(sub, d) {
   switch (d.TAG) {
     case /* Pwith_type */0 :
         return {
-                TAG: /* Pwith_type */0,
-                _0: map_loc(sub, d._0),
-                _1: Curry._2(sub.type_declaration, sub, d._1)
-              };
+          TAG: /* Pwith_type */0,
+          _0: map_loc(sub, d._0),
+          _1: Curry._2(sub.type_declaration, sub, d._1)
+        };
     case /* Pwith_module */1 :
         return {
-                TAG: /* Pwith_module */1,
-                _0: map_loc(sub, d._0),
-                _1: map_loc(sub, d._1)
-              };
+          TAG: /* Pwith_module */1,
+          _0: map_loc(sub, d._0),
+          _1: map_loc(sub, d._1)
+        };
     case /* Pwith_typesubst */2 :
         return {
-                TAG: /* Pwith_typesubst */2,
-                _0: Curry._2(sub.type_declaration, sub, d._0)
-              };
+          TAG: /* Pwith_typesubst */2,
+          _0: Curry._2(sub.type_declaration, sub, d._0)
+        };
     case /* Pwith_modsubst */3 :
         return {
-                TAG: /* Pwith_modsubst */3,
-                _0: map_loc(sub, d._0),
-                _1: map_loc(sub, d._1)
-              };
+          TAG: /* Pwith_modsubst */3,
+          _0: map_loc(sub, d._0),
+          _1: map_loc(sub, d._1)
+        };
     
   }
 }
@@ -9648,75 +9648,75 @@ function map_signature_item(sub, param) {
     case /* Psig_value */0 :
         const a = Curry._2(sub.value_description, sub, desc._0);
         return mk$5(loc, {
-                    TAG: /* Psig_value */0,
-                    _0: a
-                  });
+              TAG: /* Psig_value */0,
+              _0: a
+            });
     case /* Psig_type */1 :
         const a$1 = Stdlib__List.map(Curry._1(sub.type_declaration, sub), desc._0);
         return mk$5(loc, {
-                    TAG: /* Psig_type */1,
-                    _0: a$1
-                  });
+              TAG: /* Psig_type */1,
+              _0: a$1
+            });
     case /* Psig_typext */2 :
         const a$2 = Curry._2(sub.type_extension, sub, desc._0);
         return mk$5(loc, {
-                    TAG: /* Psig_typext */2,
-                    _0: a$2
-                  });
+              TAG: /* Psig_typext */2,
+              _0: a$2
+            });
     case /* Psig_exception */3 :
         const a$3 = Curry._2(sub.extension_constructor, sub, desc._0);
         return mk$5(loc, {
-                    TAG: /* Psig_exception */3,
-                    _0: a$3
-                  });
+              TAG: /* Psig_exception */3,
+              _0: a$3
+            });
     case /* Psig_module */4 :
         const a$4 = Curry._2(sub.module_declaration, sub, desc._0);
         return mk$5(loc, {
-                    TAG: /* Psig_module */4,
-                    _0: a$4
-                  });
+              TAG: /* Psig_module */4,
+              _0: a$4
+            });
     case /* Psig_recmodule */5 :
         const a$5 = Stdlib__List.map(Curry._1(sub.module_declaration, sub), desc._0);
         return mk$5(loc, {
-                    TAG: /* Psig_recmodule */5,
-                    _0: a$5
-                  });
+              TAG: /* Psig_recmodule */5,
+              _0: a$5
+            });
     case /* Psig_modtype */6 :
         const a$6 = Curry._2(sub.module_type_declaration, sub, desc._0);
         return mk$5(loc, {
-                    TAG: /* Psig_modtype */6,
-                    _0: a$6
-                  });
+              TAG: /* Psig_modtype */6,
+              _0: a$6
+            });
     case /* Psig_open */7 :
         const a$7 = Curry._2(sub.open_description, sub, desc._0);
         return mk$5(loc, {
-                    TAG: /* Psig_open */7,
-                    _0: a$7
-                  });
+              TAG: /* Psig_open */7,
+              _0: a$7
+            });
     case /* Psig_include */8 :
         const a$8 = Curry._2(sub.include_description, sub, desc._0);
         return mk$5(loc, {
-                    TAG: /* Psig_include */8,
-                    _0: a$8
-                  });
+              TAG: /* Psig_include */8,
+              _0: a$8
+            });
     case /* Psig_class */9 :
         const a$9 = Stdlib__List.map(Curry._1(sub.class_description, sub), desc._0);
         return mk$5(loc, {
-                    TAG: /* Psig_class */9,
-                    _0: a$9
-                  });
+              TAG: /* Psig_class */9,
+              _0: a$9
+            });
     case /* Psig_class_type */10 :
         const a$10 = Stdlib__List.map(Curry._1(sub.class_type_declaration, sub), desc._0);
         return mk$5(loc, {
-                    TAG: /* Psig_class_type */10,
-                    _0: a$10
-                  });
+              TAG: /* Psig_class_type */10,
+              _0: a$10
+            });
     case /* Psig_attribute */11 :
         const a$11 = Curry._2(sub.attribute, sub, desc._0);
         return mk$5(loc, {
-                    TAG: /* Psig_attribute */11,
-                    _0: a$11
-                  });
+              TAG: /* Psig_attribute */11,
+              _0: a$11
+            });
     case /* Psig_extension */12 :
         return extension$5(loc, Curry._2(sub.attributes, sub, desc._1), Curry._2(sub.extension, sub, desc._0));
     
@@ -9757,75 +9757,75 @@ function map_structure_item(sub, param) {
     case /* Pstr_primitive */2 :
         const a = Curry._2(sub.value_description, sub, desc._0);
         return mk$6(loc, {
-                    TAG: /* Pstr_primitive */2,
-                    _0: a
-                  });
+              TAG: /* Pstr_primitive */2,
+              _0: a
+            });
     case /* Pstr_type */3 :
         const a$1 = Stdlib__List.map(Curry._1(sub.type_declaration, sub), desc._0);
         return mk$6(loc, {
-                    TAG: /* Pstr_type */3,
-                    _0: a$1
-                  });
+              TAG: /* Pstr_type */3,
+              _0: a$1
+            });
     case /* Pstr_typext */4 :
         const a$2 = Curry._2(sub.type_extension, sub, desc._0);
         return mk$6(loc, {
-                    TAG: /* Pstr_typext */4,
-                    _0: a$2
-                  });
+              TAG: /* Pstr_typext */4,
+              _0: a$2
+            });
     case /* Pstr_exception */5 :
         const a$3 = Curry._2(sub.extension_constructor, sub, desc._0);
         return mk$6(loc, {
-                    TAG: /* Pstr_exception */5,
-                    _0: a$3
-                  });
+              TAG: /* Pstr_exception */5,
+              _0: a$3
+            });
     case /* Pstr_module */6 :
         const a$4 = Curry._2(sub.module_binding, sub, desc._0);
         return mk$6(loc, {
-                    TAG: /* Pstr_module */6,
-                    _0: a$4
-                  });
+              TAG: /* Pstr_module */6,
+              _0: a$4
+            });
     case /* Pstr_recmodule */7 :
         const a$5 = Stdlib__List.map(Curry._1(sub.module_binding, sub), desc._0);
         return mk$6(loc, {
-                    TAG: /* Pstr_recmodule */7,
-                    _0: a$5
-                  });
+              TAG: /* Pstr_recmodule */7,
+              _0: a$5
+            });
     case /* Pstr_modtype */8 :
         const a$6 = Curry._2(sub.module_type_declaration, sub, desc._0);
         return mk$6(loc, {
-                    TAG: /* Pstr_modtype */8,
-                    _0: a$6
-                  });
+              TAG: /* Pstr_modtype */8,
+              _0: a$6
+            });
     case /* Pstr_open */9 :
         const a$7 = Curry._2(sub.open_description, sub, desc._0);
         return mk$6(loc, {
-                    TAG: /* Pstr_open */9,
-                    _0: a$7
-                  });
+              TAG: /* Pstr_open */9,
+              _0: a$7
+            });
     case /* Pstr_class */10 :
         const a$8 = Stdlib__List.map(Curry._1(sub.class_declaration, sub), desc._0);
         return mk$6(loc, {
-                    TAG: /* Pstr_class */10,
-                    _0: a$8
-                  });
+              TAG: /* Pstr_class */10,
+              _0: a$8
+            });
     case /* Pstr_class_type */11 :
         const a$9 = Stdlib__List.map(Curry._1(sub.class_type_declaration, sub), desc._0);
         return mk$6(loc, {
-                    TAG: /* Pstr_class_type */11,
-                    _0: a$9
-                  });
+              TAG: /* Pstr_class_type */11,
+              _0: a$9
+            });
     case /* Pstr_include */12 :
         const a$10 = Curry._2(sub.include_declaration, sub, desc._0);
         return mk$6(loc, {
-                    TAG: /* Pstr_include */12,
-                    _0: a$10
-                  });
+              TAG: /* Pstr_include */12,
+              _0: a$10
+            });
     case /* Pstr_attribute */13 :
         const a$11 = Curry._2(sub.attribute, sub, desc._0);
         return mk$6(loc, {
-                    TAG: /* Pstr_attribute */13,
-                    _0: a$11
-                  });
+              TAG: /* Pstr_attribute */13,
+              _0: a$11
+            });
     case /* Pstr_extension */14 :
         return extension$6(loc, Curry._2(sub.attributes, sub, desc._1), Curry._2(sub.extension, sub, desc._0));
     
@@ -9850,8 +9850,8 @@ function map$5(sub, param) {
     case /* Pexp_apply */5 :
         const partial_arg = Curry._1(sub.expr, sub);
         return Curry._4(Ast_helper_Exp.apply, loc, attrs, Curry._2(sub.expr, sub, desc._0), Stdlib__List.map((function (param) {
-                          return map_snd(partial_arg, param);
-                        }), desc._1));
+                    return map_snd(partial_arg, param);
+                  }), desc._1));
     case /* Pexp_match */6 :
         return Curry._4(Ast_helper_Exp.match_, loc, attrs, Curry._2(sub.expr, sub, desc._0), Curry._2(sub.cases, sub, desc._1));
     case /* Pexp_try */7 :
@@ -9865,10 +9865,10 @@ function map$5(sub, param) {
     case /* Pexp_record */11 :
         const partial_arg$1 = Curry._1(sub.expr, sub);
         return Curry._4(Ast_helper_Exp.record, loc, attrs, Stdlib__List.map((function (param) {
-                          return map_tuple((function (param) {
-                                        return map_loc(sub, param);
-                                      }), partial_arg$1, param);
-                        }), desc._0), map_opt(Curry._1(sub.expr, sub), desc._1));
+                    return map_tuple((function (param) {
+                            return map_loc(sub, param);
+                          }), partial_arg$1, param);
+                  }), desc._0), map_opt(Curry._1(sub.expr, sub), desc._1));
     case /* Pexp_field */12 :
         return Curry._4(Ast_helper_Exp.field, loc, attrs, Curry._2(sub.expr, sub, desc._0), map_loc(sub, desc._1));
     case /* Pexp_setfield */13 :
@@ -9896,10 +9896,10 @@ function map$5(sub, param) {
     case /* Pexp_override */24 :
         const partial_arg$2 = Curry._1(sub.expr, sub);
         return Curry._3(Ast_helper_Exp.override, loc, attrs, Stdlib__List.map((function (param) {
-                          return map_tuple((function (param) {
-                                        return map_loc(sub, param);
-                                      }), partial_arg$2, param);
-                        }), desc._0));
+                    return map_tuple((function (param) {
+                            return map_loc(sub, param);
+                          }), partial_arg$2, param);
+                  }), desc._0));
     case /* Pexp_letmodule */25 :
         return Curry._5(Ast_helper_Exp.letmodule, loc, attrs, map_loc(sub, desc._0), Curry._2(sub.module_expr, sub, desc._1), Curry._2(sub.expr, sub, desc._2));
     case /* Pexp_assert */26 :
@@ -9947,10 +9947,10 @@ function map$6(sub, param) {
     case /* Ppat_record */7 :
         const partial_arg = Curry._1(sub.pat, sub);
         return record(loc, attrs, Stdlib__List.map((function (param) {
-                          return map_tuple((function (param) {
-                                        return map_loc(sub, param);
-                                      }), partial_arg, param);
-                        }), desc._0), desc._1);
+                    return map_tuple((function (param) {
+                            return map_loc(sub, param);
+                          }), partial_arg, param);
+                  }), desc._0), desc._1);
     case /* Ppat_array */8 :
         return array(loc, attrs, Stdlib__List.map(Curry._1(sub.pat, sub), desc._0));
     case /* Ppat_or */9 :
@@ -9985,8 +9985,8 @@ function map$7(sub, param) {
     case /* Pcl_apply */3 :
         const partial_arg = Curry._1(sub.expr, sub);
         return apply$2(loc, attrs, Curry._2(sub.class_expr, sub, desc._0), Stdlib__List.map((function (param) {
-                          return map_snd(partial_arg, param);
-                        }), desc._1));
+                    return map_snd(partial_arg, param);
+                  }), desc._1));
     case /* Pcl_let */4 :
         return let_$1(loc, attrs, desc._0, Stdlib__List.map(Curry._1(sub.value_binding, sub), desc._1), Curry._2(sub.class_expr, sub, desc._2));
     case /* Pcl_constraint */5 :
@@ -10000,15 +10000,15 @@ function map$7(sub, param) {
 function map_kind(sub, t) {
   if (t.TAG === /* Cfk_virtual */0) {
     return {
-            TAG: /* Cfk_virtual */0,
-            _0: Curry._2(sub.typ, sub, t._0)
-          };
+      TAG: /* Cfk_virtual */0,
+      _0: Curry._2(sub.typ, sub, t._0)
+    };
   } else {
     return {
-            TAG: /* Cfk_concrete */1,
-            _0: t._0,
-            _1: Curry._2(sub.expr, sub, t._1)
-          };
+      TAG: /* Cfk_concrete */1,
+      _0: t._0,
+      _1: Curry._2(sub.expr, sub, t._1)
+    };
   }
 }
 
@@ -10040,23 +10040,23 @@ function map_field$1(sub, param) {
 
 function map_structure(sub, param) {
   return {
-          pcstr_self: Curry._2(sub.pat, sub, param.pcstr_self),
-          pcstr_fields: Stdlib__List.map(Curry._1(sub.class_field, sub), param.pcstr_fields)
-        };
+    pcstr_self: Curry._2(sub.pat, sub, param.pcstr_self),
+    pcstr_fields: Stdlib__List.map(Curry._1(sub.class_field, sub), param.pcstr_fields)
+  };
 }
 
 function class_infos(sub, f, param) {
   const partial_arg = Curry._1(sub.typ, sub);
   return mk$18(Curry._2(sub.location, sub, param.pci_loc), Curry._2(sub.attributes, sub, param.pci_attributes), undefined, undefined, param.pci_virt, Stdlib__List.map((function (param) {
-                    return map_fst(partial_arg, param);
-                  }), param.pci_params), map_loc(sub, param.pci_name), Curry._1(f, param.pci_expr));
+              return map_fst(partial_arg, param);
+            }), param.pci_params), map_loc(sub, param.pci_name), Curry._1(f, param.pci_expr));
 }
 
 function default_mapper_attribute($$this, param) {
   return [
-          map_loc($$this, param[0]),
-          Curry._2($$this.payload, $$this, param[1])
-        ];
+    map_loc($$this, param[0]),
+    Curry._2($$this.payload, $$this, param[1])
+  ];
 }
 
 function default_mapper_attributes($$this, l) {
@@ -10065,10 +10065,10 @@ function default_mapper_attributes($$this, l) {
 
 function default_mapper_case($$this, param) {
   return {
-          pc_lhs: Curry._2($$this.pat, $$this, param.pc_lhs),
-          pc_guard: map_opt(Curry._1($$this.expr, $$this), param.pc_guard),
-          pc_rhs: Curry._2($$this.expr, $$this, param.pc_rhs)
-        };
+    pc_lhs: Curry._2($$this.pat, $$this, param.pc_lhs),
+    pc_guard: map_opt(Curry._1($$this.expr, $$this), param.pc_guard),
+    pc_rhs: Curry._2($$this.expr, $$this, param.pc_rhs)
+  };
 }
 
 function default_mapper_cases($$this, l) {
@@ -10102,9 +10102,9 @@ function default_mapper_constructor_declaration($$this, param) {
 
 function default_mapper_extension($$this, param) {
   return [
-          map_loc($$this, param[0]),
-          Curry._2($$this.payload, $$this, param[1])
-        ];
+    map_loc($$this, param[0]),
+    Curry._2($$this.payload, $$this, param[1])
+  ];
 }
 
 function default_mapper_include_declaration($$this, param) {
@@ -10143,20 +10143,20 @@ function default_mapper_payload($$this, x) {
   switch (x.TAG) {
     case /* PStr */0 :
         return {
-                TAG: /* PStr */0,
-                _0: Curry._2($$this.structure, $$this, x._0)
-              };
+          TAG: /* PStr */0,
+          _0: Curry._2($$this.structure, $$this, x._0)
+        };
     case /* PTyp */1 :
         return {
-                TAG: /* PTyp */1,
-                _0: Curry._2($$this.typ, $$this, x._0)
-              };
+          TAG: /* PTyp */1,
+          _0: Curry._2($$this.typ, $$this, x._0)
+        };
     case /* PPat */2 :
         return {
-                TAG: /* PPat */2,
-                _0: Curry._2($$this.pat, $$this, x._0),
-                _1: map_opt(Curry._1($$this.expr, $$this), x._1)
-              };
+          TAG: /* PPat */2,
+          _0: Curry._2($$this.pat, $$this, x._0),
+          _1: map_opt(Curry._1($$this.expr, $$this), x._1)
+        };
     
   }
 }
@@ -10232,13 +10232,13 @@ function create$5(l, x, d, r) {
   const hl = height$4(l);
   const hr = height$4(r);
   return {
-          TAG: /* Node */0,
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    _0: l,
+    _1: x,
+    _2: d,
+    _3: r,
+    _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$4(l, x, d, r) {
@@ -10247,13 +10247,13 @@ function bal$4(l, x, d, r) {
   if (hl > (hr + 1 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  8866,
-                  11
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              8866,
+              11
+            ]
+          });
     }
     const lr = l._3;
     const ld = l._2;
@@ -10266,26 +10266,26 @@ function bal$4(l, x, d, r) {
       return create$5(create$5(ll, lv, ld, lr._0), lr._1, lr._2, create$5(lr._3, x, d, r));
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                8866,
-                11
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            8866,
+            11
+          ]
+        });
   }
   if (hr <= (hl + 1 | 0)) {
     return create$5(l, x, d, r);
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                8873,
-                11
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            8873,
+            11
+          ]
+        });
   }
   const rl = r._0;
   const rr = r._3;
@@ -10296,25 +10296,25 @@ function bal$4(l, x, d, r) {
     return create$5(create$5(l, x, d, rl._0), rl._1, rl._2, create$5(rl._3, r._1, r._2, r._3));
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              8873,
-              11
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          8873,
+          11
+        ]
+      });
 }
 
 function add$5(x, data, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return {
-            TAG: /* Node */0,
-            _0: /* Empty */0,
-            _1: x,
-            _2: data,
-            _3: /* Empty */0,
-            _4: 1
-          };
+      TAG: /* Node */0,
+      _0: /* Empty */0,
+      _1: x,
+      _2: data,
+      _3: /* Empty */0,
+      _4: 1
+    };
   }
   const r = param._3;
   const d = param._2;
@@ -10323,13 +10323,13 @@ function add$5(x, data, param) {
   const c = Caml_obj.caml_compare(x, v);
   if (c === 0) {
     return {
-            TAG: /* Node */0,
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: param._4
-          };
+      TAG: /* Node */0,
+      _0: l,
+      _1: x,
+      _2: data,
+      _3: r,
+      _4: param._4
+    };
   } else if (c < 0) {
     return bal$4(add$5(x, data, l), v, d, r);
   } else {
@@ -10342,8 +10342,8 @@ function find$2(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Caml_obj.caml_compare(x, param._1);
     if (c === 0) {
@@ -10404,38 +10404,38 @@ const identity = {
 
 function add_type(id, p, s) {
   return {
-          types: add$5(id, p, s.types),
-          modules: s.modules,
-          modtypes: s.modtypes,
-          for_saving: s.for_saving
-        };
+    types: add$5(id, p, s.types),
+    modules: s.modules,
+    modtypes: s.modtypes,
+    for_saving: s.for_saving
+  };
 }
 
 function add_module(id, p, s) {
   return {
-          types: s.types,
-          modules: add$5(id, p, s.modules),
-          modtypes: s.modtypes,
-          for_saving: s.for_saving
-        };
+    types: s.types,
+    modules: add$5(id, p, s.modules),
+    modtypes: s.modtypes,
+    for_saving: s.for_saving
+  };
 }
 
 function add_modtype(id, ty, s) {
   return {
-          types: s.types,
-          modules: s.modules,
-          modtypes: add$5(id, ty, s.modtypes),
-          for_saving: s.for_saving
-        };
+    types: s.types,
+    modules: s.modules,
+    modtypes: add$5(id, ty, s.modtypes),
+    for_saving: s.for_saving
+  };
 }
 
 function for_saving(s) {
   return {
-          types: s.types,
-          modules: s.modules,
-          modtypes: s.modtypes,
-          for_saving: true
-        };
+    types: s.types,
+    modules: s.modules,
+    modtypes: s.modtypes,
+    for_saving: true
+  };
 }
 
 function loc(s, x) {
@@ -10488,17 +10488,17 @@ function module_path(s, p) {
         }
     case /* Pdot */1 :
         return {
-                TAG: /* Pdot */1,
-                _0: module_path(s, p._0),
-                _1: p._1,
-                _2: p._2
-              };
+          TAG: /* Pdot */1,
+          _0: module_path(s, p._0),
+          _1: p._1,
+          _2: p._2
+        };
     case /* Papply */2 :
         return {
-                TAG: /* Papply */2,
-                _0: module_path(s, p._0),
-                _1: module_path(s, p._1)
-              };
+          TAG: /* Papply */2,
+          _0: module_path(s, p._0),
+          _1: module_path(s, p._1)
+        };
     
   }
 }
@@ -10523,11 +10523,11 @@ function modtype_path(s, p) {
         }
     case /* Pdot */1 :
         return {
-                TAG: /* Pdot */1,
-                _0: module_path(s, p._0),
-                _1: p._1,
-                _2: p._2
-              };
+          TAG: /* Pdot */1,
+          _0: module_path(s, p._0),
+          _1: p._1,
+          _2: p._2
+        };
     case /* Papply */2 :
         return fatal_error("Subst.modtype_path");
     
@@ -10549,11 +10549,11 @@ function type_path(s, p) {
         }
     case /* Pdot */1 :
         return {
-                TAG: /* Pdot */1,
-                _0: module_path(s, p._0),
-                _1: p._1,
-                _2: p._2
-              };
+          TAG: /* Pdot */1,
+          _0: module_path(s, p._0),
+          _1: p._1,
+          _2: p._2
+        };
     case /* Papply */2 :
         return fatal_error("Subst.type_path");
     
@@ -10567,10 +10567,10 @@ const new_id$1 = {
 function newpersty(desc) {
   new_id$1.contents = new_id$1.contents - 1 | 0;
   return {
-          desc: desc,
-          level: 100000000,
-          id: new_id$1.contents
-        };
+    desc: desc,
+    level: 100000000,
+    id: new_id$1.contents
+  };
 }
 
 function norm(d) {
@@ -10583,18 +10583,18 @@ function norm(d) {
           return d;
         } else {
           return {
-                  TAG: /* Tvar */0,
-                  _0: undefined
-                };
+            TAG: /* Tvar */0,
+            _0: undefined
+          };
         }
     case /* Tunivar */9 :
         if (d._0 !== undefined) {
           return d;
         } else {
           return {
-                  TAG: /* Tunivar */9,
-                  _0: undefined
-                };
+            TAG: /* Tunivar */9,
+            _0: undefined
+          };
         }
     default:
       return d;
@@ -10754,13 +10754,13 @@ function typexp(s, ty) {
                           break;
                       default:
                         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                  MEL_EXN_ID: "Assert_failure",
-                                  _1: [
-                                    "jscomp/test/ocaml_typedtree_test.ml",
-                                    9179,
-                                    23
-                                  ]
-                                });
+                              MEL_EXN_ID: "Assert_failure",
+                              _1: [
+                                "jscomp/test/ocaml_typedtree_test.ml",
+                                9179,
+                                23
+                              ]
+                            });
                     }
                   }
                   if (exit$3 === 5) {
@@ -10787,22 +10787,22 @@ function typexp(s, ty) {
                         }), true, row, !dup, more$p);
                   const match$6 = row$1.row_name;
                   tmp = match$6 !== undefined ? ({
-                        TAG: /* Tvariant */8,
-                        _0: {
-                          row_fields: row$1.row_fields,
-                          row_more: row$1.row_more,
-                          row_bound: row$1.row_bound,
-                          row_closed: row$1.row_closed,
-                          row_fixed: row$1.row_fixed,
-                          row_name: [
-                            type_path(s, match$6[0]),
-                            match$6[1]
-                          ]
-                        }
-                      }) : ({
-                        TAG: /* Tvariant */8,
-                        _0: row$1
-                      });
+                      TAG: /* Tvariant */8,
+                      _0: {
+                        row_fields: row$1.row_fields,
+                        row_more: row$1.row_more,
+                        row_bound: row$1.row_bound,
+                        row_closed: row$1.row_closed,
+                        row_fixed: row$1.row_fixed,
+                        row_name: [
+                          type_path(s, match$6[0]),
+                          match$6[1]
+                        ]
+                      }
+                    }) : ({
+                      TAG: /* Tvariant */8,
+                      _0: row$1
+                    });
                 }
                 break;
             case /* Tpackage */11 :
@@ -10854,33 +10854,33 @@ function type_declaration(s, decl) {
       cstrs === /* Type_abstract */0 ? /* Type_abstract */0 : /* Type_open */1
     ) : (
       cstrs.TAG === /* Type_record */0 ? ({
-            TAG: /* Type_record */0,
-            _0: Stdlib__List.map((function (l) {
-                    return {
-                            ld_id: l.ld_id,
-                            ld_mutable: l.ld_mutable,
-                            ld_type: typexp(s, l.ld_type),
-                            ld_loc: loc(s, l.ld_loc),
-                            ld_attributes: attrs(s, l.ld_attributes)
-                          };
-                  }), cstrs._0),
-            _1: cstrs._1
-          }) : ({
-            TAG: /* Type_variant */1,
-            _0: Stdlib__List.map((function (c) {
-                    return {
-                            cd_id: c.cd_id,
-                            cd_args: Stdlib__List.map((function (param) {
-                                    return typexp(s, param);
-                                  }), c.cd_args),
-                            cd_res: may_map((function (param) {
-                                    return typexp(s, param);
-                                  }), c.cd_res),
-                            cd_loc: loc(s, c.cd_loc),
-                            cd_attributes: attrs(s, c.cd_attributes)
-                          };
-                  }), cstrs._0)
-          })
+          TAG: /* Type_record */0,
+          _0: Stdlib__List.map((function (l) {
+                  return {
+                    ld_id: l.ld_id,
+                    ld_mutable: l.ld_mutable,
+                    ld_type: typexp(s, l.ld_type),
+                    ld_loc: loc(s, l.ld_loc),
+                    ld_attributes: attrs(s, l.ld_attributes)
+                  };
+                }), cstrs._0),
+          _1: cstrs._1
+        }) : ({
+          TAG: /* Type_variant */1,
+          _0: Stdlib__List.map((function (c) {
+                  return {
+                    cd_id: c.cd_id,
+                    cd_args: Stdlib__List.map((function (param) {
+                            return typexp(s, param);
+                          }), c.cd_args),
+                    cd_res: may_map((function (param) {
+                            return typexp(s, param);
+                          }), c.cd_res),
+                    cd_loc: loc(s, c.cd_loc),
+                    cd_attributes: attrs(s, c.cd_attributes)
+                  };
+                }), cstrs._0)
+        })
     );
   const ty = decl.type_manifest;
   const decl_type_params = Stdlib__List.map((function (param) {
@@ -10909,49 +10909,49 @@ function type_declaration(s, decl) {
 
 function class_signature(s, sign) {
   return {
-          csig_self: typexp(s, sign.csig_self),
-          csig_vars: Curry._2(Meths.map, (function (param) {
-                  return [
-                          param[0],
-                          param[1],
-                          typexp(s, param[2])
-                        ];
-                }), sign.csig_vars),
-          csig_concr: sign.csig_concr,
-          csig_inher: Stdlib__List.map((function (param) {
-                  return [
-                          type_path(s, param[0]),
-                          Stdlib__List.map((function (param) {
-                                  return typexp(s, param);
-                                }), param[1])
-                        ];
-                }), sign.csig_inher)
-        };
+    csig_self: typexp(s, sign.csig_self),
+    csig_vars: Curry._2(Meths.map, (function (param) {
+            return [
+              param[0],
+              param[1],
+              typexp(s, param[2])
+            ];
+          }), sign.csig_vars),
+    csig_concr: sign.csig_concr,
+    csig_inher: Stdlib__List.map((function (param) {
+            return [
+              type_path(s, param[0]),
+              Stdlib__List.map((function (param) {
+                      return typexp(s, param);
+                    }), param[1])
+            ];
+          }), sign.csig_inher)
+  };
 }
 
 function class_type(s, sign) {
   switch (sign.TAG) {
     case /* Cty_constr */0 :
         return {
-                TAG: /* Cty_constr */0,
-                _0: type_path(s, sign._0),
-                _1: Stdlib__List.map((function (param) {
-                        return typexp(s, param);
-                      }), sign._1),
-                _2: class_type(s, sign._2)
-              };
+          TAG: /* Cty_constr */0,
+          _0: type_path(s, sign._0),
+          _1: Stdlib__List.map((function (param) {
+                  return typexp(s, param);
+                }), sign._1),
+          _2: class_type(s, sign._2)
+        };
     case /* Cty_signature */1 :
         return {
-                TAG: /* Cty_signature */1,
-                _0: class_signature(s, sign._0)
-              };
+          TAG: /* Cty_signature */1,
+          _0: class_signature(s, sign._0)
+        };
     case /* Cty_arrow */2 :
         return {
-                TAG: /* Cty_arrow */2,
-                _0: sign._0,
-                _1: typexp(s, sign._1),
-                _2: class_type(s, sign._2)
-              };
+          TAG: /* Cty_arrow */2,
+          _0: sign._0,
+          _1: typexp(s, sign._1),
+          _2: class_type(s, sign._2)
+        };
     
   }
 }
@@ -11004,11 +11004,11 @@ function class_type$1(s, cty) {
 
 function value_description(s, descr) {
   return {
-          val_type: type_expr(s, descr.val_type),
-          val_kind: descr.val_kind,
-          val_loc: loc(s, descr.val_loc),
-          val_attributes: attrs(s, descr.val_attributes)
-        };
+    val_type: type_expr(s, descr.val_type),
+    val_kind: descr.val_kind,
+    val_loc: loc(s, descr.val_loc),
+    val_attributes: attrs(s, descr.val_attributes)
+  };
 }
 
 function extension_constructor(s, ext) {
@@ -11045,9 +11045,9 @@ function rename_bound_idents(_s, _idents, _param) {
     const s = _s;
     if (!param) {
       return [
-              Stdlib__List.rev(idents),
-              s
-            ];
+        Stdlib__List.rev(idents),
+        s
+      ];
     }
     const match = param.hd;
     switch (match.TAG) {
@@ -11123,42 +11123,42 @@ function modtype(s, mty) {
               }
           case /* Pdot */1 :
               return {
-                      TAG: /* Mty_ident */0,
-                      _0: {
-                        TAG: /* Pdot */1,
-                        _0: module_path(s, p._0),
-                        _1: p._1,
-                        _2: p._2
-                      }
-                    };
+                TAG: /* Mty_ident */0,
+                _0: {
+                  TAG: /* Pdot */1,
+                  _0: module_path(s, p._0),
+                  _1: p._1,
+                  _2: p._2
+                }
+              };
           case /* Papply */2 :
               return fatal_error("Subst.modtype");
           
         }
     case /* Mty_signature */1 :
         return {
-                TAG: /* Mty_signature */1,
-                _0: signature$2(s, mty._0)
-              };
+          TAG: /* Mty_signature */1,
+          _0: signature$2(s, mty._0)
+        };
     case /* Mty_functor */2 :
         const id = mty._0;
         const id$p = rename(id);
         return {
-                TAG: /* Mty_functor */2,
-                _0: id$p,
-                _1: may_map((function (param) {
-                        return modtype(s, param);
-                      }), mty._1),
-                _2: modtype(add_module(id, {
-                          TAG: /* Pident */0,
-                          _0: id$p
-                        }, s), mty._2)
-              };
+          TAG: /* Mty_functor */2,
+          _0: id$p,
+          _1: may_map((function (param) {
+                  return modtype(s, param);
+                }), mty._1),
+          _2: modtype(add_module(id, {
+                    TAG: /* Pident */0,
+                    _0: id$p
+                  }, s), mty._2)
+        };
     case /* Mty_alias */3 :
         return {
-                TAG: /* Mty_alias */3,
-                _0: module_path(s, mty._0)
-              };
+          TAG: /* Mty_alias */3,
+          _0: module_path(s, mty._0)
+        };
     
   }
 }
@@ -11167,87 +11167,87 @@ function signature$2(s, sg) {
   const match = rename_bound_idents(s, /* [] */0, sg);
   const s$p = match[1];
   return Stdlib__List.map2((function (param, param$1) {
-                switch (param.TAG) {
-                  case /* Sig_value */0 :
-                      return {
-                              TAG: /* Sig_value */0,
-                              _0: param$1,
-                              _1: value_description(s$p, param._1)
-                            };
-                  case /* Sig_type */1 :
-                      return {
-                              TAG: /* Sig_type */1,
-                              _0: param$1,
-                              _1: type_declaration(s$p, param._1),
-                              _2: param._2
-                            };
-                  case /* Sig_typext */2 :
-                      return {
-                              TAG: /* Sig_typext */2,
-                              _0: param$1,
-                              _1: extension_constructor(s$p, param._1),
-                              _2: param._2
-                            };
-                  case /* Sig_module */3 :
-                      return {
-                              TAG: /* Sig_module */3,
-                              _0: param$1,
-                              _1: module_declaration(s$p, param._1),
-                              _2: param._2
-                            };
-                  case /* Sig_modtype */4 :
-                      return {
-                              TAG: /* Sig_modtype */4,
-                              _0: param$1,
-                              _1: modtype_declaration(s$p, param._1)
-                            };
-                  case /* Sig_class */5 :
-                      return {
-                              TAG: /* Sig_class */5,
-                              _0: param$1,
-                              _1: class_declaration(s$p, param._1),
-                              _2: param._2
-                            };
-                  case /* Sig_class_type */6 :
-                      return {
-                              TAG: /* Sig_class_type */6,
-                              _0: param$1,
-                              _1: cltype_declaration(s$p, param._1),
-                              _2: param._2
-                            };
-                  
-                }
-              }), sg, match[0]);
+          switch (param.TAG) {
+            case /* Sig_value */0 :
+                return {
+                  TAG: /* Sig_value */0,
+                  _0: param$1,
+                  _1: value_description(s$p, param._1)
+                };
+            case /* Sig_type */1 :
+                return {
+                  TAG: /* Sig_type */1,
+                  _0: param$1,
+                  _1: type_declaration(s$p, param._1),
+                  _2: param._2
+                };
+            case /* Sig_typext */2 :
+                return {
+                  TAG: /* Sig_typext */2,
+                  _0: param$1,
+                  _1: extension_constructor(s$p, param._1),
+                  _2: param._2
+                };
+            case /* Sig_module */3 :
+                return {
+                  TAG: /* Sig_module */3,
+                  _0: param$1,
+                  _1: module_declaration(s$p, param._1),
+                  _2: param._2
+                };
+            case /* Sig_modtype */4 :
+                return {
+                  TAG: /* Sig_modtype */4,
+                  _0: param$1,
+                  _1: modtype_declaration(s$p, param._1)
+                };
+            case /* Sig_class */5 :
+                return {
+                  TAG: /* Sig_class */5,
+                  _0: param$1,
+                  _1: class_declaration(s$p, param._1),
+                  _2: param._2
+                };
+            case /* Sig_class_type */6 :
+                return {
+                  TAG: /* Sig_class_type */6,
+                  _0: param$1,
+                  _1: cltype_declaration(s$p, param._1),
+                  _2: param._2
+                };
+            
+          }
+        }), sg, match[0]);
 }
 
 function module_declaration(s, decl) {
   return {
-          md_type: modtype(s, decl.md_type),
-          md_attributes: attrs(s, decl.md_attributes),
-          md_loc: loc(s, decl.md_loc)
-        };
+    md_type: modtype(s, decl.md_type),
+    md_attributes: attrs(s, decl.md_attributes),
+    md_loc: loc(s, decl.md_loc)
+  };
 }
 
 function modtype_declaration(s, decl) {
   return {
-          mtd_type: may_map((function (param) {
-                  return modtype(s, param);
-                }), decl.mtd_type),
-          mtd_attributes: attrs(s, decl.mtd_attributes),
-          mtd_loc: loc(s, decl.mtd_loc)
-        };
+    mtd_type: may_map((function (param) {
+            return modtype(s, param);
+          }), decl.mtd_type),
+    mtd_attributes: attrs(s, decl.mtd_attributes),
+    mtd_loc: loc(s, decl.mtd_loc)
+  };
 }
 
 const add_delayed_check_forward = {
   contents: (function (param) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  9717,
-                  46
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              9717,
+              46
+            ]
+          });
     })
 };
 
@@ -11340,9 +11340,9 @@ function add$6(kind, slot, id, x, tbl, ref_tbl) {
         Curry._3(slot, kind, s, already_defined(s, ref_tbl));
       }) : nothing;
   return add(id, [
-              x,
-              slot$1
-            ], tbl);
+        x,
+        slot$1
+      ], tbl);
 }
 
 function find_same$1(id, tbl) {
@@ -11414,40 +11414,40 @@ const empty = {
 
 function in_signature(env) {
   return {
-          values: env.values,
-          constrs: env.constrs,
-          labels: env.labels,
-          types: env.types,
-          modules: env.modules,
-          modtypes: env.modtypes,
-          components: env.components,
-          classes: env.classes,
-          cltypes: env.cltypes,
-          functor_args: env.functor_args,
-          summary: env.summary,
-          local_constraints: env.local_constraints,
-          gadt_instances: env.gadt_instances,
-          flags: env.flags | 1
-        };
+    values: env.values,
+    constrs: env.constrs,
+    labels: env.labels,
+    types: env.types,
+    modules: env.modules,
+    modtypes: env.modtypes,
+    components: env.components,
+    classes: env.classes,
+    cltypes: env.cltypes,
+    functor_args: env.functor_args,
+    summary: env.summary,
+    local_constraints: env.local_constraints,
+    gadt_instances: env.gadt_instances,
+    flags: env.flags | 1
+  };
 }
 
 function implicit_coercion(env) {
   return {
-          values: env.values,
-          constrs: env.constrs,
-          labels: env.labels,
-          types: env.types,
-          modules: env.modules,
-          modtypes: env.modtypes,
-          components: env.components,
-          classes: env.classes,
-          cltypes: env.cltypes,
-          functor_args: env.functor_args,
-          summary: env.summary,
-          local_constraints: env.local_constraints,
-          gadt_instances: env.gadt_instances,
-          flags: env.flags | 2
-        };
+    values: env.values,
+    constrs: env.constrs,
+    labels: env.labels,
+    types: env.types,
+    modules: env.modules,
+    modtypes: env.modtypes,
+    components: env.components,
+    classes: env.classes,
+    cltypes: env.cltypes,
+    functor_args: env.functor_args,
+    summary: env.summary,
+    local_constraints: env.local_constraints,
+    gadt_instances: env.gadt_instances,
+    flags: env.flags | 2
+  };
 }
 
 function is_in_signature(env) {
@@ -11461,65 +11461,65 @@ function is_implicit_coercion(env) {
 const components_of_module$p = {
   contents: (function (env, sub, path, mty) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  9965,
-                  32
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              9965,
+              32
+            ]
+          });
     })
 };
 
 const components_of_module_maker$p = {
   contents: (function (param) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  9968,
-                  37
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              9968,
+              37
+            ]
+          });
     })
 };
 
 const components_of_functor_appl$p = {
   contents: (function (f, p1, p2) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  9971,
-                  23
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              9971,
+              23
+            ]
+          });
     })
 };
 
 const check_modtype_inclusion = {
   contents: (function (env, mty1, path1, mty2) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  9975,
-                  35
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              9975,
+              35
+            ]
+          });
     })
 };
 
 const strengthen = {
   contents: (function (env, mty, path) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  9979,
-                  28
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              9979,
+              28
+            ]
+          });
     })
 };
 
@@ -11549,12 +11549,12 @@ function create$6(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r.h;
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$5(l, v, r) {
@@ -11565,9 +11565,9 @@ function bal$5(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const lr = l.r;
     const lv = l.v;
@@ -11579,24 +11579,24 @@ function bal$5(l, v, r) {
       return create$6(create$6(ll, lv, lr.l), lr.v, create$6(lr.r, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   const rr = r.r;
   const rv = r.v;
@@ -11608,20 +11608,20 @@ function bal$5(l, v, r) {
     return create$6(create$6(l, v, rl.l), rl.v, create$6(rl.r, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Set.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Set.bal"
+      });
 }
 
 function add$7(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = t.r;
   const v = t.v;
@@ -11706,19 +11706,19 @@ function check_consistency(ps) {
                 return ;
               }
               throw new Caml_js_exceptions.MelangeError(Inconsistency, {
-                        MEL_EXN_ID: Inconsistency,
-                        _1: name,
-                        _2: source,
-                        _3: match[1]
-                      });
+                    MEL_EXN_ID: Inconsistency,
+                    _1: name,
+                    _2: source,
+                    _3: match[1]
+                  });
             }
             catch (raw_exn){
               const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
               if (exn.MEL_EXN_ID === Stdlib.Not_found) {
                 return Stdlib__Hashtbl.add(crc_units, name, [
-                            crco,
-                            source
-                          ]);
+                      crco,
+                      source
+                    ]);
               }
               throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
             }
@@ -11730,14 +11730,14 @@ function check_consistency(ps) {
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Inconsistency) {
       throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                MEL_EXN_ID: $$Error$2,
-                _1: {
-                  TAG: /* Inconsistent_import */1,
-                  _0: exn._1,
-                  _1: exn._3,
-                  _2: exn._2
-                }
-              });
+            MEL_EXN_ID: $$Error$2,
+            _1: {
+              TAG: /* Inconsistent_import */1,
+              _0: exn._1,
+              _1: exn._3,
+              _2: exn._2
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -11778,14 +11778,14 @@ function read_pers_struct(modname, filename) {
   };
   if (ps.ps_name !== modname) {
     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-              MEL_EXN_ID: $$Error$2,
-              _1: {
-                TAG: /* Illegal_renaming */0,
-                _0: modname,
-                _1: ps.ps_name,
-                _2: filename
-              }
-            });
+          MEL_EXN_ID: $$Error$2,
+          _1: {
+            TAG: /* Illegal_renaming */0,
+            _0: modname,
+            _1: ps.ps_name,
+            _2: filename
+          }
+        });
   }
   add_import(name);
   Stdlib__List.iter((function (param) {
@@ -11793,13 +11793,13 @@ function read_pers_struct(modname, filename) {
             return ;
           }
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: {
-                      TAG: /* Need_recursive_types */2,
-                      _0: ps.ps_name,
-                      _1: current_unit.contents
-                    }
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: {
+                  TAG: /* Need_recursive_types */2,
+                  _0: ps.ps_name,
+                  _1: current_unit.contents
+                }
+              });
         }), ps.ps_flags);
   Stdlib__Hashtbl.add(persistent_structures, modname, ps);
   return ps;
@@ -11809,8 +11809,8 @@ function find_pers_struct(checkOpt, name) {
   const check = checkOpt !== undefined ? checkOpt : true;
   if (name === "*predef*") {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   }
   let r;
   try {
@@ -11831,8 +11831,8 @@ function find_pers_struct(checkOpt, name) {
       ps = sg;
     } else {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
   } else {
     add_import(name);
@@ -11845,8 +11845,8 @@ function find_pers_struct(checkOpt, name) {
       if (exn$1.MEL_EXN_ID === Stdlib.Not_found) {
         Stdlib__Hashtbl.add(persistent_structures, name, undefined);
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
       }
       throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
     }
@@ -11872,8 +11872,8 @@ function find_module_descr(path, env) {
               return find_pers_struct(undefined, id.name).ps_comps;
             }
             throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                      MEL_EXN_ID: Stdlib.Not_found
-                    });
+                  MEL_EXN_ID: Stdlib.Not_found
+                });
           }
           throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
         }
@@ -11883,8 +11883,8 @@ function find_module_descr(path, env) {
           return find$2(path._1, c._0.comp_components)[0];
         }
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     case /* Papply */2 :
         const p1 = path._0;
         const f = force(components_of_module_maker$p.contents, find_module_descr(p1, env));
@@ -11892,8 +11892,8 @@ function find_module_descr(path, env) {
           return Curry._3(components_of_functor_appl$p.contents, f._0, p1, path._1);
         }
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     
   }
 }
@@ -11908,46 +11908,46 @@ function find$3(proj1, proj2, path, env) {
           return find$2(path._1, Curry._1(proj2, c._0))[0];
         }
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     case /* Papply */2 :
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     
   }
 }
 
 function find_value(param, param$1) {
   return find$3((function (env) {
-                return env.values;
-              }), (function (sc) {
-                return sc.comp_values;
-              }), param, param$1);
+          return env.values;
+        }), (function (sc) {
+          return sc.comp_values;
+        }), param, param$1);
 }
 
 function find_type_full(param, param$1) {
   return find$3((function (env) {
-                return env.types;
-              }), (function (sc) {
-                return sc.comp_types;
-              }), param, param$1);
+          return env.types;
+        }), (function (sc) {
+          return sc.comp_types;
+        }), param, param$1);
 }
 
 function find_modtype(param, param$1) {
   return find$3((function (env) {
-                return env.modtypes;
-              }), (function (sc) {
-                return sc.comp_modtypes;
-              }), param, param$1);
+          return env.modtypes;
+        }), (function (sc) {
+          return sc.comp_modtypes;
+        }), param, param$1);
 }
 
 function find_class(param, param$1) {
   return find$3((function (env) {
-                return env.classes;
-              }), (function (sc) {
-                return sc.comp_classes;
-              }), param, param$1);
+          return env.classes;
+        }), (function (sc) {
+          return sc.comp_classes;
+        }), param, param$1);
 }
 
 function find_module(alias, path, env) {
@@ -11963,17 +11963,17 @@ function find_module(alias, path, env) {
             if (id.stamp === 0 && id.name !== current_unit.contents) {
               const ps = find_pers_struct(undefined, id.name);
               return {
-                      md_type: {
-                        TAG: /* Mty_signature */1,
-                        _0: ps.ps_sig
-                      },
-                      md_attributes: /* [] */0,
-                      md_loc: none
-                    };
+                md_type: {
+                  TAG: /* Mty_signature */1,
+                  _0: ps.ps_sig
+                },
+                md_attributes: /* [] */0,
+                md_loc: none
+              };
             }
             throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                      MEL_EXN_ID: Stdlib.Not_found
-                    });
+                  MEL_EXN_ID: Stdlib.Not_found
+                });
           }
           throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
         }
@@ -11983,22 +11983,22 @@ function find_module(alias, path, env) {
           const match = find$2(path._1, c._0.comp_modules);
           const md_type = force(subst_modtype_maker, match[0]);
           return {
-                  md_type: md_type,
-                  md_attributes: /* [] */0,
-                  md_loc: none
-                };
+            md_type: md_type,
+            md_attributes: /* [] */0,
+            md_loc: none
+          };
         }
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     case /* Papply */2 :
         const p2 = path._1;
         const desc1 = find_module_descr(path._0, env);
         const f = force(components_of_module_maker$p.contents, desc1);
         if (f.TAG === /* Structure_comps */0) {
           throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                    MEL_EXN_ID: Stdlib.Not_found
-                  });
+                MEL_EXN_ID: Stdlib.Not_found
+              });
         }
         const f$1 = f._0;
         const p = f$1.fcomp_res;
@@ -12026,10 +12026,10 @@ function find_module(alias, path, env) {
           }
         }
         return {
-                md_type: md_type$1,
-                md_attributes: /* [] */0,
-                md_loc: none
-              };
+          md_type: md_type$1,
+          md_attributes: /* [] */0,
+          md_loc: none
+        };
     
   }
 }
@@ -12127,23 +12127,23 @@ function normalize_path$1(oloc, env, path) {
     if (exn.MEL_EXN_ID === Stdlib.Not_found) {
       if (oloc !== undefined) {
         throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                  MEL_EXN_ID: $$Error$2,
-                  _1: {
-                    TAG: /* Missing_module */3,
-                    _0: oloc,
-                    _1: path,
-                    _2: normalize_path(true, env, path)
-                  }
-                });
+              MEL_EXN_ID: $$Error$2,
+              _1: {
+                TAG: /* Missing_module */3,
+                _0: oloc,
+                _1: path,
+                _2: normalize_path(true, env, path)
+              }
+            });
       }
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  10272,
-                  28
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              10272,
+              28
+            ]
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -12154,33 +12154,33 @@ function find_type_expansion(path, env) {
   const body = decl.type_manifest;
   if (body !== undefined && (decl.type_private === /* Public */1 || Caml_obj.caml_notequal(decl.type_kind, /* Type_abstract */0) || has_constr_row(body))) {
     return [
-            decl.type_params,
-            body,
-            may_map((function (prim) {
-                    return prim[1];
-                  }), decl.type_newtype_level)
-          ];
+      decl.type_params,
+      body,
+      may_map((function (prim) {
+              return prim[1];
+            }), decl.type_newtype_level)
+    ];
   }
   const path$p = normalize_path$1(undefined, env, path);
   if (same(path, path$p)) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   }
   return [
-          decl.type_params,
-          newty2(100000000, {
-                TAG: /* Tconstr */3,
-                _0: path$p,
-                _1: decl.type_params,
-                _2: {
-                  contents: /* Mnil */0
-                }
-              }),
-          may_map((function (prim) {
-                  return prim[1];
-                }), decl.type_newtype_level)
-        ];
+    decl.type_params,
+    newty2(100000000, {
+          TAG: /* Tconstr */3,
+          _0: path$p,
+          _1: decl.type_params,
+          _2: {
+            contents: /* Mnil */0
+          }
+        }),
+    may_map((function (prim) {
+            return prim[1];
+          }), decl.type_newtype_level)
+  ];
 }
 
 function find_type_expansion_opt(path, env) {
@@ -12188,33 +12188,33 @@ function find_type_expansion_opt(path, env) {
   const body = decl.type_manifest;
   if (body !== undefined) {
     return [
-            decl.type_params,
-            body,
-            may_map((function (prim) {
-                    return prim[1];
-                  }), decl.type_newtype_level)
-          ];
+      decl.type_params,
+      body,
+      may_map((function (prim) {
+              return prim[1];
+            }), decl.type_newtype_level)
+    ];
   }
   const path$p = normalize_path$1(undefined, env, path);
   if (same(path, path$p)) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   }
   return [
-          decl.type_params,
-          newty2(100000000, {
-                TAG: /* Tconstr */3,
-                _0: path$p,
-                _1: decl.type_params,
-                _2: {
-                  contents: /* Mnil */0
-                }
-              }),
-          may_map((function (prim) {
-                  return prim[1];
-                }), decl.type_newtype_level)
-        ];
+    decl.type_params,
+    newty2(100000000, {
+          TAG: /* Tconstr */3,
+          _0: path$p,
+          _1: decl.type_params,
+          _2: {
+            contents: /* Mnil */0
+          }
+        }),
+    may_map((function (prim) {
+            return prim[1];
+          }), decl.type_newtype_level)
+  ];
 }
 
 function find_modtype_expansion(path, env) {
@@ -12223,8 +12223,8 @@ function find_modtype_expansion(path, env) {
     return mty;
   }
   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-            MEL_EXN_ID: Stdlib.Not_found
-          });
+        MEL_EXN_ID: Stdlib.Not_found
+      });
 }
 
 function is_functor_arg(_path, env) {
@@ -12267,21 +12267,21 @@ function lookup_module_descr(lid, env) {
           if (exn.MEL_EXN_ID === Stdlib.Not_found) {
             if (s === current_unit.contents) {
               throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                        MEL_EXN_ID: Stdlib.Not_found
-                      });
+                    MEL_EXN_ID: Stdlib.Not_found
+                  });
             }
             const ps = find_pers_struct(undefined, s);
             return [
-                    {
-                      TAG: /* Pident */0,
-                      _0: {
-                        stamp: 0,
-                        name: s,
-                        flags: 1
-                      }
-                    },
-                    ps.ps_comps
-                  ];
+              {
+                TAG: /* Pident */0,
+                _0: {
+                  stamp: 0,
+                  name: s,
+                  flags: 1
+                }
+              },
+              ps.ps_comps
+            ];
           }
           throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
         }
@@ -12292,18 +12292,18 @@ function lookup_module_descr(lid, env) {
         if (c.TAG === /* Structure_comps */0) {
           const match$1 = find$2(s$1, c._0.comp_components);
           return [
-                  {
-                    TAG: /* Pdot */1,
-                    _0: match[0],
-                    _1: s$1,
-                    _2: match$1[1]
-                  },
-                  match$1[0]
-                ];
+            {
+              TAG: /* Pdot */1,
+              _0: match[0],
+              _1: s$1,
+              _2: match$1[1]
+            },
+            match$1[0]
+          ];
         }
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     case /* Lapply */2 :
         const match$2 = lookup_module_descr(lid._0, env);
         const p1 = match$2[0];
@@ -12312,19 +12312,19 @@ function lookup_module_descr(lid, env) {
         const f = force(components_of_module_maker$p.contents, match$2[1]);
         if (f.TAG === /* Structure_comps */0) {
           throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                    MEL_EXN_ID: Stdlib.Not_found
-                  });
+                MEL_EXN_ID: Stdlib.Not_found
+              });
         }
         const f$1 = f._0;
         may(Curry._3(check_modtype_inclusion.contents, env, match$3.md_type, p2), f$1.fcomp_arg);
         return [
-                {
-                  TAG: /* Papply */2,
-                  _0: p1,
-                  _1: p2
-                },
-                Curry._3(components_of_functor_appl$p.contents, f$1, p1, p2)
-              ];
+          {
+            TAG: /* Papply */2,
+            _0: p1,
+            _1: p2
+          },
+          Curry._3(components_of_functor_appl$p.contents, f$1, p1, p2)
+        ];
     
   }
 }
@@ -12342,8 +12342,8 @@ function lookup_module(load, lid, env) {
               case /* Pident */0 :
                   if (id._0.name === "#recmod#") {
                     throw new Caml_js_exceptions.MelangeError(Recmodule, {
-                              MEL_EXN_ID: Recmodule
-                            });
+                          MEL_EXN_ID: Recmodule
+                        });
                   }
                   break;
               case /* Pdot */1 :
@@ -12359,8 +12359,8 @@ function lookup_module(load, lid, env) {
           if (exn.MEL_EXN_ID === Stdlib.Not_found) {
             if (s === current_unit.contents) {
               throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                        MEL_EXN_ID: Stdlib.Not_found
-                      });
+                    MEL_EXN_ID: Stdlib.Not_found
+                  });
             }
             if (transparent_modules.contents && !load) {
               try {
@@ -12381,13 +12381,13 @@ function lookup_module(load, lid, env) {
               find_pers_struct(undefined, s);
             }
             return {
-                    TAG: /* Pident */0,
-                    _0: {
-                      stamp: 0,
-                      name: s,
-                      flags: 1
-                    }
-                  };
+              TAG: /* Pident */0,
+              _0: {
+                stamp: 0,
+                name: s,
+                flags: 1
+              }
+            };
           }
           throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
         }
@@ -12398,15 +12398,15 @@ function lookup_module(load, lid, env) {
         if (c.TAG === /* Structure_comps */0) {
           const match$1 = find$2(s$1, c._0.comp_modules);
           return {
-                  TAG: /* Pdot */1,
-                  _0: match[0],
-                  _1: s$1,
-                  _2: match$1[1]
-                };
+            TAG: /* Pdot */1,
+            _0: match[0],
+            _1: s$1,
+            _2: match$1[1]
+          };
         }
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     case /* Lapply */2 :
         const match$2 = lookup_module_descr(lid._0, env);
         const p2 = lookup_module(true, lid._1, env);
@@ -12420,8 +12420,8 @@ function lookup_module(load, lid, env) {
         const f = force(components_of_module_maker$p.contents, match$2[1]);
         if (f.TAG === /* Structure_comps */0) {
           throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                    MEL_EXN_ID: Stdlib.Not_found
-                  });
+                MEL_EXN_ID: Stdlib.Not_found
+              });
         }
         may(Curry._3(check_modtype_inclusion.contents, env, match$3.md_type, p2), f._0.fcomp_arg);
         return p;
@@ -12440,22 +12440,22 @@ function lookup(proj1, proj2, lid, env) {
         if (c.TAG === /* Structure_comps */0) {
           const match$1 = find$2(s, Curry._1(proj2, c._0));
           return [
-                  {
-                    TAG: /* Pdot */1,
-                    _0: match[0],
-                    _1: s,
-                    _2: match$1[1]
-                  },
-                  match$1[0]
-                ];
+            {
+              TAG: /* Pdot */1,
+              _0: match[0],
+              _1: s,
+              _2: match$1[1]
+            },
+            match$1[0]
+          ];
         }
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     case /* Lapply */2 :
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     
   }
 }
@@ -12471,14 +12471,14 @@ function lookup_all_simple(proj1, proj2, shadow, lid, env) {
           const match = param.hd;
           const x = match[0];
           return {
-                  hd: [
-                    x,
-                    match[1]
-                  ],
-                  tl: do_shadow(Stdlib__List.filter((function (param) {
-                              return !Curry._2(shadow, x, param[0]);
-                            }), param.tl))
-                };
+            hd: [
+              x,
+              match[1]
+            ],
+            tl: do_shadow(Stdlib__List.filter((function (param) {
+                        return !Curry._2(shadow, x, param[0]);
+                      }), param.tl))
+          };
         };
         return do_shadow(xl);
     case /* Ldot */1 :
@@ -12498,21 +12498,21 @@ function lookup_all_simple(proj1, proj2, shadow, lid, env) {
             }
           }
           return Stdlib__List.map((function (param) {
-                        return [
-                                param[0],
-                                (function (param) {
-                                    
-                                  })
-                              ];
-                      }), comps);
+                  return [
+                    param[0],
+                    (function (param) {
+                        
+                      })
+                  ];
+                }), comps);
         }
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     case /* Lapply */2 :
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     
   }
 }
@@ -12543,58 +12543,58 @@ function lbl_shadow(lbl1, lbl2) {
 
 function lookup_value(param, param$1) {
   return lookup((function (env) {
-                return env.values;
-              }), (function (sc) {
-                return sc.comp_values;
-              }), param, param$1);
+          return env.values;
+        }), (function (sc) {
+          return sc.comp_values;
+        }), param, param$1);
 }
 
 function lookup_all_constructors(param, param$1) {
   return lookup_all_simple((function (env) {
-                return env.constrs;
-              }), (function (sc) {
-                return sc.comp_constrs;
-              }), cstr_shadow, param, param$1);
+          return env.constrs;
+        }), (function (sc) {
+          return sc.comp_constrs;
+        }), cstr_shadow, param, param$1);
 }
 
 function lookup_all_labels(param, param$1) {
   return lookup_all_simple((function (env) {
-                return env.labels;
-              }), (function (sc) {
-                return sc.comp_labels;
-              }), lbl_shadow, param, param$1);
+          return env.labels;
+        }), (function (sc) {
+          return sc.comp_labels;
+        }), lbl_shadow, param, param$1);
 }
 
 function lookup_type(param, param$1) {
   return lookup((function (env) {
-                return env.types;
-              }), (function (sc) {
-                return sc.comp_types;
-              }), param, param$1);
+          return env.types;
+        }), (function (sc) {
+          return sc.comp_types;
+        }), param, param$1);
 }
 
 function lookup_modtype(param, param$1) {
   return lookup((function (env) {
-                return env.modtypes;
-              }), (function (sc) {
-                return sc.comp_modtypes;
-              }), param, param$1);
+          return env.modtypes;
+        }), (function (sc) {
+          return sc.comp_modtypes;
+        }), param, param$1);
 }
 
 function lookup_class(param, param$1) {
   return lookup((function (env) {
-                return env.classes;
-              }), (function (sc) {
-                return sc.comp_classes;
-              }), param, param$1);
+          return env.classes;
+        }), (function (sc) {
+          return sc.comp_classes;
+        }), param, param$1);
 }
 
 function lookup_cltype(param, param$1) {
   return lookup((function (env) {
-                return env.cltypes;
-              }), (function (sc) {
-                return sc.comp_cltypes;
-              }), param, param$1);
+          return env.cltypes;
+        }), (function (sc) {
+          return sc.comp_cltypes;
+        }), param, param$1);
 }
 
 function mark_value_used(env, name, vd) {
@@ -12603,9 +12603,9 @@ function mark_value_used(env, name, vd) {
   }
   try {
     return Curry._1(Stdlib__Hashtbl.find(value_declarations, [
-                    name,
-                    vd.val_loc
-                  ]), undefined);
+              name,
+              vd.val_loc
+            ]), undefined);
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -12622,9 +12622,9 @@ function mark_type_used(env, name, vd) {
   }
   try {
     return Curry._1(Stdlib__Hashtbl.find(type_declarations, [
-                    name,
-                    vd.type_loc
-                  ]), undefined);
+              name,
+              vd.type_loc
+            ]), undefined);
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -12641,10 +12641,10 @@ function mark_constructor_used(usage, env, name, vd, constr) {
   }
   try {
     return Curry._1(Stdlib__Hashtbl.find(used_constructors, [
-                    name,
-                    vd.type_loc,
-                    constr
-                  ]), usage);
+              name,
+              vd.type_loc,
+              constr
+            ]), usage);
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -12662,10 +12662,10 @@ function mark_extension_used(usage, env, ext, name) {
   const ty_name = last(ext.ext_type_path);
   try {
     return Curry._1(Stdlib__Hashtbl.find(used_constructors, [
-                    ty_name,
-                    ext.ext_loc,
-                    name
-                  ]), usage);
+              ty_name,
+              ext.ext_loc,
+              name
+            ]), usage);
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -12693,13 +12693,13 @@ function set_type_used_callback(name, td, callback) {
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Stdlib.Not_found) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  10534,
-                  22
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              10534,
+              22
+            ]
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -12719,9 +12719,9 @@ function lookup_type$1(lid, env) {
   const decl = match[1][0];
   mark_type_used(env, last$1(lid), decl);
   return [
-          match[0],
-          decl
-        ];
+    match[0],
+    decl
+  ];
 }
 
 function mark_type_path(env, path) {
@@ -12743,25 +12743,25 @@ function ty_path(t) {
   const match$1 = match.desc;
   if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                10564,
-                9
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            10564,
+            9
+          ]
+        });
   }
   if (match$1.TAG === /* Tconstr */3) {
     return match$1._0;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              10564,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          10564,
+          9
+        ]
+      });
 }
 
 function lookup_constructor(lid, env) {
@@ -12774,8 +12774,8 @@ function lookup_constructor(lid, env) {
     return desc;
   }
   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-            MEL_EXN_ID: Stdlib.Not_found
-          });
+        MEL_EXN_ID: Stdlib.Not_found
+      });
 }
 
 function is_lident(param) {
@@ -12793,16 +12793,16 @@ function lookup_all_constructors$1(lid, env) {
   try {
     const cstrs = lookup_all_constructors(lid, env);
     return Stdlib__List.map((function (param) {
-                  const use = param[1];
-                  const cstr = param[0];
-                  return [
-                          cstr,
-                          (function (param) {
-                              mark_type_path(env, ty_path(cstr.cstr_res));
-                              return Curry._1(use, undefined);
-                            })
-                        ];
-                }), cstrs);
+            const use = param[1];
+            const cstr = param[0];
+            return [
+              cstr,
+              (function (param) {
+                  mark_type_path(env, ty_path(cstr.cstr_res));
+                  return Curry._1(use, undefined);
+                })
+            ];
+          }), cstrs);
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -12830,10 +12830,10 @@ function mark_constructor(usage, env, name, desc) {
         const ty_name = last(ty_path$1);
         try {
           return Curry._1(Stdlib__Hashtbl.find(used_constructors, [
-                          ty_name,
-                          desc.cstr_loc,
-                          name
-                        ]), usage);
+                    ty_name,
+                    desc.cstr_loc,
+                    name
+                  ]), usage);
         }
         catch (raw_exn){
           const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -12853,13 +12853,13 @@ function mark_constructor(usage, env, name, desc) {
     const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
     if (exn$1.MEL_EXN_ID === Stdlib.Not_found) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  10601,
-                  64
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              10601,
+              64
+            ]
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
   }
@@ -12871,16 +12871,16 @@ function lookup_all_labels$1(lid, env) {
   try {
     const lbls = lookup_all_labels(lid, env);
     return Stdlib__List.map((function (param) {
-                  const use = param[1];
-                  const lbl = param[0];
-                  return [
-                          lbl,
-                          (function (param) {
-                              mark_type_path(env, ty_path(lbl.lbl_res));
-                              return Curry._1(use, undefined);
-                            })
-                        ];
-                }), lbls);
+            const use = param[1];
+            const lbl = param[0];
+            return [
+              lbl,
+              (function (param) {
+                  mark_type_path(env, ty_path(lbl.lbl_res));
+                  return Curry._1(use, undefined);
+                })
+            ];
+          }), lbls);
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -13050,12 +13050,12 @@ function iter_types(f) {
             iter_components(id, id, pso.ps_comps);
           }), persistent_structures);
     return iter((function (id, param) {
-                  const match = param[0];
-                  iter_components({
-                        TAG: /* Pident */0,
-                        _0: id
-                      }, match[0], match[1]);
-                }), param.components);
+            const match = param[0];
+            iter_components({
+                  TAG: /* Pident */0,
+                  _0: id
+                }, match[0], match[1]);
+          }), param.components);
   };
 }
 
@@ -13089,17 +13089,17 @@ function find_all_comps(proj, s, param) {
   try {
     const match = find$2(s, Curry._1(proj, comps._0));
     return {
-            hd: [
-              {
-                TAG: /* Pdot */1,
-                _0: param[0],
-                _1: s,
-                _2: match[1]
-              },
-              match[0]
-            ],
-            tl: /* [] */0
-          };
+      hd: [
+        {
+          TAG: /* Pdot */1,
+          _0: param[0],
+          _1: s,
+          _2: match[1]
+        },
+        match[0]
+      ],
+      tl: /* [] */0
+    };
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -13114,16 +13114,16 @@ function find_shadowed_comps(path, env) {
   switch (path.TAG) {
     case /* Pident */0 :
         return Stdlib__List.map((function (prim) {
-                      return prim[0];
-                    }), find_all(path._0.name, env.components));
+                return prim[0];
+              }), find_all(path._0.name, env.components));
     case /* Pdot */1 :
         const s = path._1;
         const l = find_shadowed_comps(path._0, env);
         return Stdlib__List.flatten(Stdlib__List.map((function (param) {
-                          return find_all_comps((function (comps) {
-                                        return comps.comp_components;
-                                      }), s, param);
-                        }), l));
+                    return find_all_comps((function (comps) {
+                            return comps.comp_components;
+                          }), s, param);
+                  }), l));
     case /* Papply */2 :
         return /* [] */0;
     
@@ -13134,14 +13134,14 @@ function find_shadowed(proj1, proj2, path, env) {
   switch (path.TAG) {
     case /* Pident */0 :
         return Stdlib__List.map((function (prim) {
-                      return prim[0];
-                    }), find_all(path._0.name, Curry._1(proj1, env)));
+                return prim[0];
+              }), find_all(path._0.name, Curry._1(proj1, env)));
     case /* Pdot */1 :
         const s = path._1;
         const l = find_shadowed_comps(path._0, env);
         return Stdlib__List.flatten(Stdlib__List.map((function (param) {
-                          return find_all_comps(proj2, s, param);
-                        }), l));
+                    return find_all_comps(proj2, s, param);
+                  }), l));
     case /* Papply */2 :
         return /* [] */0;
     
@@ -13155,35 +13155,35 @@ function find_shadowed_types(path, env) {
           return comps.comp_types;
         }), path, env);
   return Stdlib__List.map((function (prim) {
-                return prim[0];
-              }), l);
+          return prim[0];
+        }), l);
 }
 
 function add_gadt_instance_level(lv, env) {
   return {
-          values: env.values,
-          constrs: env.constrs,
-          labels: env.labels,
-          types: env.types,
-          modules: env.modules,
-          modtypes: env.modtypes,
-          components: env.components,
-          classes: env.classes,
-          cltypes: env.cltypes,
-          functor_args: env.functor_args,
-          summary: env.summary,
-          local_constraints: env.local_constraints,
-          gadt_instances: {
-            hd: [
-              lv,
-              {
-                contents: /* Empty */0
-              }
-            ],
-            tl: env.gadt_instances
-          },
-          flags: env.flags
-        };
+    values: env.values,
+    constrs: env.constrs,
+    labels: env.labels,
+    types: env.types,
+    modules: env.modules,
+    modtypes: env.modtypes,
+    components: env.components,
+    classes: env.classes,
+    cltypes: env.cltypes,
+    functor_args: env.functor_args,
+    summary: env.summary,
+    local_constraints: env.local_constraints,
+    gadt_instances: {
+      hd: [
+        lv,
+        {
+          contents: /* Empty */0
+        }
+      ],
+      tl: env.gadt_instances
+    },
+    flags: env.flags
+  };
 }
 
 function is_Tlink(param) {
@@ -13226,13 +13226,13 @@ function add_gadt_instances(env, lv, tl) {
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Stdlib.Not_found) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  10759,
-                  59
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              10759,
+              59
+            ]
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -13248,13 +13248,13 @@ function add_gadt_instance_chain(env, lv, t) {
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Stdlib.Not_found) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  10768,
-                  59
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              10768,
+              59
+            ]
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -13406,12 +13406,12 @@ function constructors_of_type(ty_path, decl) {
         cstr_attributes: cstr_cstr_attributes
       };
       return {
-              hd: [
-                cd_id,
-                cstr
-              ],
-              tl: match$1[1]
-            };
+        hd: [
+          cd_id,
+          cstr
+        ],
+        tl: match$1[1]
+      };
     };
     const result = describe_constructors(0, 0, cstrs$1);
     let a_id;
@@ -13488,52 +13488,52 @@ function constructors_of_type(ty_path, decl) {
         return result;
     }
     return {
-            hd: [
-              a_id,
-              {
-                cstr_name: a_descr.cstr_name,
-                cstr_res: a_descr.cstr_res,
-                cstr_existentials: a_descr.cstr_existentials,
-                cstr_args: a_descr.cstr_args,
-                cstr_arity: a_descr.cstr_arity,
-                cstr_tag: a_descr.cstr_tag,
-                cstr_consts: a_descr.cstr_consts,
-                cstr_nonconsts: a_descr.cstr_nonconsts,
-                cstr_normal: a_descr.cstr_normal,
-                cstr_generalized: a_descr.cstr_generalized,
-                cstr_private: a_descr.cstr_private,
-                cstr_loc: a_descr.cstr_loc,
-                cstr_attributes: {
-                  hd: optional_shape,
-                  tl: a_descr.cstr_attributes
-                }
-              }
-            ],
-            tl: {
-              hd: [
-                b_id,
-                {
-                  cstr_name: b_descr.cstr_name,
-                  cstr_res: b_descr.cstr_res,
-                  cstr_existentials: b_descr.cstr_existentials,
-                  cstr_args: b_descr.cstr_args,
-                  cstr_arity: b_descr.cstr_arity,
-                  cstr_tag: b_descr.cstr_tag,
-                  cstr_consts: b_descr.cstr_consts,
-                  cstr_nonconsts: b_descr.cstr_nonconsts,
-                  cstr_normal: b_descr.cstr_normal,
-                  cstr_generalized: b_descr.cstr_generalized,
-                  cstr_private: b_descr.cstr_private,
-                  cstr_loc: b_descr.cstr_loc,
-                  cstr_attributes: {
-                    hd: optional_shape,
-                    tl: b_descr.cstr_attributes
-                  }
-                }
-              ],
-              tl: /* [] */0
+      hd: [
+        a_id,
+        {
+          cstr_name: a_descr.cstr_name,
+          cstr_res: a_descr.cstr_res,
+          cstr_existentials: a_descr.cstr_existentials,
+          cstr_args: a_descr.cstr_args,
+          cstr_arity: a_descr.cstr_arity,
+          cstr_tag: a_descr.cstr_tag,
+          cstr_consts: a_descr.cstr_consts,
+          cstr_nonconsts: a_descr.cstr_nonconsts,
+          cstr_normal: a_descr.cstr_normal,
+          cstr_generalized: a_descr.cstr_generalized,
+          cstr_private: a_descr.cstr_private,
+          cstr_loc: a_descr.cstr_loc,
+          cstr_attributes: {
+            hd: optional_shape,
+            tl: a_descr.cstr_attributes
+          }
+        }
+      ],
+      tl: {
+        hd: [
+          b_id,
+          {
+            cstr_name: b_descr.cstr_name,
+            cstr_res: b_descr.cstr_res,
+            cstr_existentials: b_descr.cstr_existentials,
+            cstr_args: b_descr.cstr_args,
+            cstr_arity: b_descr.cstr_arity,
+            cstr_tag: b_descr.cstr_tag,
+            cstr_consts: b_descr.cstr_consts,
+            cstr_nonconsts: b_descr.cstr_nonconsts,
+            cstr_normal: b_descr.cstr_normal,
+            cstr_generalized: b_descr.cstr_generalized,
+            cstr_private: b_descr.cstr_private,
+            cstr_loc: b_descr.cstr_loc,
+            cstr_attributes: {
+              hd: optional_shape,
+              tl: b_descr.cstr_attributes
             }
-          };
+          }
+        ],
+        tl: /* [] */0
+      }
+    };
   }
 }
 
@@ -13578,12 +13578,12 @@ function labels_of_type(ty_path, decl) {
       };
       Caml_array.set(all_labels, num, lbl);
       return {
-              hd: [
-                l.ld_id,
-                lbl
-              ],
-              tl: describe_labels(num + 1 | 0, param.tl)
-            };
+        hd: [
+          l.ld_id,
+          lbl
+        ],
+        tl: describe_labels(num + 1 | 0, param.tl)
+      };
     };
     return describe_labels(0, lbls);
   }
@@ -13592,9 +13592,9 @@ function labels_of_type(ty_path, decl) {
 function prefix_idents(root, pos, sub, param) {
   if (!param) {
     return [
-            /* [] */0,
-            sub
-          ];
+      /* [] */0,
+      sub
+    ];
   }
   const match = param.hd;
   switch (match.TAG) {
@@ -13611,12 +13611,12 @@ function prefix_idents(root, pos, sub, param) {
         nextpos = /* tag */typeof match$1 === "number" || typeof match$1 === "string" || match$1.TAG !== /* Val_prim */0 ? pos + 1 | 0 : pos;
         const match$2 = prefix_idents(root, nextpos, sub, param.tl);
         return [
-                {
-                  hd: p,
-                  tl: match$2[0]
-                },
-                match$2[1]
-              ];
+          {
+            hd: p,
+            tl: match$2[0]
+          },
+          match$2[1]
+        ];
     case /* Sig_type */1 :
         const id = match._0;
         const p_1$1 = id.name;
@@ -13628,12 +13628,12 @@ function prefix_idents(root, pos, sub, param) {
         };
         const match$3 = prefix_idents(root, pos, add_type(id, p$1, sub), param.tl);
         return [
-                {
-                  hd: p$1,
-                  tl: match$3[0]
-                },
-                match$3[1]
-              ];
+          {
+            hd: p$1,
+            tl: match$3[0]
+          },
+          match$3[1]
+        ];
     case /* Sig_typext */2 :
         const p_1$2 = match._0.name;
         const p$2 = {
@@ -13644,12 +13644,12 @@ function prefix_idents(root, pos, sub, param) {
         };
         const match$4 = prefix_idents(root, pos + 1 | 0, sub, param.tl);
         return [
-                {
-                  hd: p$2,
-                  tl: match$4[0]
-                },
-                match$4[1]
-              ];
+          {
+            hd: p$2,
+            tl: match$4[0]
+          },
+          match$4[1]
+        ];
     case /* Sig_module */3 :
         const id$1 = match._0;
         const p_1$3 = id$1.name;
@@ -13661,12 +13661,12 @@ function prefix_idents(root, pos, sub, param) {
         };
         const match$5 = prefix_idents(root, pos + 1 | 0, add_module(id$1, p$3, sub), param.tl);
         return [
-                {
-                  hd: p$3,
-                  tl: match$5[0]
-                },
-                match$5[1]
-              ];
+          {
+            hd: p$3,
+            tl: match$5[0]
+          },
+          match$5[1]
+        ];
     case /* Sig_modtype */4 :
         const id$2 = match._0;
         const p_1$4 = id$2.name;
@@ -13681,12 +13681,12 @@ function prefix_idents(root, pos, sub, param) {
                   _0: p$4
                 }, sub), param.tl);
         return [
-                {
-                  hd: p$4,
-                  tl: match$6[0]
-                },
-                match$6[1]
-              ];
+          {
+            hd: p$4,
+            tl: match$6[0]
+          },
+          match$6[1]
+        ];
     case /* Sig_class */5 :
         const p_1$5 = match._0.name;
         const p$5 = {
@@ -13697,12 +13697,12 @@ function prefix_idents(root, pos, sub, param) {
         };
         const match$7 = prefix_idents(root, pos + 1 | 0, sub, param.tl);
         return [
-                {
-                  hd: p$5,
-                  tl: match$7[0]
-                },
-                match$7[1]
-              ];
+          {
+            hd: p$5,
+            tl: match$7[0]
+          },
+          match$7[1]
+        ];
     case /* Sig_class_type */6 :
         const p_1$6 = match._0.name;
         const p$6 = {
@@ -13713,12 +13713,12 @@ function prefix_idents(root, pos, sub, param) {
         };
         const match$8 = prefix_idents(root, pos, sub, param.tl);
         return [
-                {
-                  hd: p$6,
-                  tl: match$8[0]
-                },
-                match$8[1]
-              ];
+          {
+            hd: p$6,
+            tl: match$8[0]
+          },
+          match$8[1]
+        ];
     
   }
 }
@@ -13727,66 +13727,66 @@ function prefix_idents_and_subst(root, sub, sg) {
   const match = prefix_idents(root, 0, sub, sg);
   const sub$1 = match[1];
   return [
-          match[0],
-          sub$1,
-          {
-            LAZY_DONE: false,
-            VAL: (function () {
-                return Stdlib__List.map((function (item) {
-                              switch (item.TAG) {
-                                case /* Sig_value */0 :
-                                    return {
-                                            TAG: /* Sig_value */0,
-                                            _0: item._0,
-                                            _1: value_description(sub$1, item._1)
-                                          };
-                                case /* Sig_type */1 :
-                                    return {
-                                            TAG: /* Sig_type */1,
-                                            _0: item._0,
-                                            _1: type_declaration(sub$1, item._1),
-                                            _2: item._2
-                                          };
-                                case /* Sig_typext */2 :
-                                    return {
-                                            TAG: /* Sig_typext */2,
-                                            _0: item._0,
-                                            _1: extension_constructor(sub$1, item._1),
-                                            _2: item._2
-                                          };
-                                case /* Sig_module */3 :
-                                    return {
-                                            TAG: /* Sig_module */3,
-                                            _0: item._0,
-                                            _1: module_declaration(sub$1, item._1),
-                                            _2: item._2
-                                          };
-                                case /* Sig_modtype */4 :
-                                    return {
-                                            TAG: /* Sig_modtype */4,
-                                            _0: item._0,
-                                            _1: modtype_declaration(sub$1, item._1)
-                                          };
-                                case /* Sig_class */5 :
-                                    return {
-                                            TAG: /* Sig_class */5,
-                                            _0: item._0,
-                                            _1: class_declaration(sub$1, item._1),
-                                            _2: item._2
-                                          };
-                                case /* Sig_class_type */6 :
-                                    return {
-                                            TAG: /* Sig_class_type */6,
-                                            _0: item._0,
-                                            _1: cltype_declaration(sub$1, item._1),
-                                            _2: item._2
-                                          };
-                                
-                              }
-                            }), sg);
-              })
-          }
-        ];
+    match[0],
+    sub$1,
+    {
+      LAZY_DONE: false,
+      VAL: (function () {
+          return Stdlib__List.map((function (item) {
+                  switch (item.TAG) {
+                    case /* Sig_value */0 :
+                        return {
+                          TAG: /* Sig_value */0,
+                          _0: item._0,
+                          _1: value_description(sub$1, item._1)
+                        };
+                    case /* Sig_type */1 :
+                        return {
+                          TAG: /* Sig_type */1,
+                          _0: item._0,
+                          _1: type_declaration(sub$1, item._1),
+                          _2: item._2
+                        };
+                    case /* Sig_typext */2 :
+                        return {
+                          TAG: /* Sig_typext */2,
+                          _0: item._0,
+                          _1: extension_constructor(sub$1, item._1),
+                          _2: item._2
+                        };
+                    case /* Sig_module */3 :
+                        return {
+                          TAG: /* Sig_module */3,
+                          _0: item._0,
+                          _1: module_declaration(sub$1, item._1),
+                          _2: item._2
+                        };
+                    case /* Sig_modtype */4 :
+                        return {
+                          TAG: /* Sig_modtype */4,
+                          _0: item._0,
+                          _1: modtype_declaration(sub$1, item._1)
+                        };
+                    case /* Sig_class */5 :
+                        return {
+                          TAG: /* Sig_class */5,
+                          _0: item._0,
+                          _1: class_declaration(sub$1, item._1),
+                          _2: item._2
+                        };
+                    case /* Sig_class_type */6 :
+                        return {
+                          TAG: /* Sig_class_type */6,
+                          _0: item._0,
+                          _1: cltype_declaration(sub$1, item._1),
+                          _2: item._2
+                        };
+                    
+                  }
+                }), sg);
+        })
+    }
+  ];
 }
 
 function prefix_idents_and_subst$1(root, sub, sg) {
@@ -13843,125 +13843,125 @@ function add_to_tbl(id, decl, tbl) {
     }
   }
   return add$5(id, {
-              hd: decl,
-              tl: decls
-            }, tbl);
+        hd: decl,
+        tl: decls
+      }, tbl);
 }
 
 function components_of_module(env, sub, path, mty) {
   return {
-          contents: {
-            TAG: /* Thunk */2,
-            _0: [
-              env,
-              sub,
-              path,
-              mty
-            ]
-          }
-        };
+    contents: {
+      TAG: /* Thunk */2,
+      _0: [
+        env,
+        sub,
+        path,
+        mty
+      ]
+    }
+  };
 }
 
 function store_modtype(slot, id, path, info, env, renv) {
   return {
-          values: env.values,
-          constrs: env.constrs,
-          labels: env.labels,
-          types: env.types,
-          modules: env.modules,
-          modtypes: add$6("module type", slot, id, [
-                path,
-                info
-              ], env.modtypes, renv.modtypes),
-          components: env.components,
-          classes: env.classes,
-          cltypes: env.cltypes,
-          functor_args: env.functor_args,
-          summary: {
-            TAG: /* Env_modtype */4,
-            _0: env.summary,
-            _1: id,
-            _2: info
-          },
-          local_constraints: env.local_constraints,
-          gadt_instances: env.gadt_instances,
-          flags: env.flags
-        };
+    values: env.values,
+    constrs: env.constrs,
+    labels: env.labels,
+    types: env.types,
+    modules: env.modules,
+    modtypes: add$6("module type", slot, id, [
+          path,
+          info
+        ], env.modtypes, renv.modtypes),
+    components: env.components,
+    classes: env.classes,
+    cltypes: env.cltypes,
+    functor_args: env.functor_args,
+    summary: {
+      TAG: /* Env_modtype */4,
+      _0: env.summary,
+      _1: id,
+      _2: info
+    },
+    local_constraints: env.local_constraints,
+    gadt_instances: env.gadt_instances,
+    flags: env.flags
+  };
 }
 
 function store_type_infos(slot, id, path, info, env, renv) {
   return {
-          values: env.values,
-          constrs: env.constrs,
-          labels: env.labels,
-          types: add$6("type", slot, id, [
-                path,
-                [
-                  info,
-                  [
-                    /* [] */0,
-                    /* [] */0
-                  ]
-                ]
-              ], env.types, renv.types),
-          modules: env.modules,
-          modtypes: env.modtypes,
-          components: env.components,
-          classes: env.classes,
-          cltypes: env.cltypes,
-          functor_args: env.functor_args,
-          summary: {
-            TAG: /* Env_type */1,
-            _0: env.summary,
-            _1: id,
-            _2: info
-          },
-          local_constraints: env.local_constraints,
-          gadt_instances: env.gadt_instances,
-          flags: env.flags
-        };
+    values: env.values,
+    constrs: env.constrs,
+    labels: env.labels,
+    types: add$6("type", slot, id, [
+          path,
+          [
+            info,
+            [
+              /* [] */0,
+              /* [] */0
+            ]
+          ]
+        ], env.types, renv.types),
+    modules: env.modules,
+    modtypes: env.modtypes,
+    components: env.components,
+    classes: env.classes,
+    cltypes: env.cltypes,
+    functor_args: env.functor_args,
+    summary: {
+      TAG: /* Env_type */1,
+      _0: env.summary,
+      _1: id,
+      _2: info
+    },
+    local_constraints: env.local_constraints,
+    gadt_instances: env.gadt_instances,
+    flags: env.flags
+  };
 }
 
 function store_module(slot, id, path, md, env, renv) {
   return {
-          values: env.values,
-          constrs: env.constrs,
-          labels: env.labels,
-          types: env.types,
-          modules: add$6("module", slot, id, [
-                path,
-                md
-              ], env.modules, renv.modules),
-          modtypes: env.modtypes,
-          components: add$6("module", slot, id, [
-                path,
-                components_of_module(env, identity, path, md.md_type)
-              ], env.components, renv.components),
-          classes: env.classes,
-          cltypes: env.cltypes,
-          functor_args: env.functor_args,
-          summary: {
-            TAG: /* Env_module */3,
-            _0: env.summary,
-            _1: id,
-            _2: md
-          },
-          local_constraints: env.local_constraints,
-          gadt_instances: env.gadt_instances,
-          flags: env.flags
-        };
+    values: env.values,
+    constrs: env.constrs,
+    labels: env.labels,
+    types: env.types,
+    modules: add$6("module", slot, id, [
+          path,
+          md
+        ], env.modules, renv.modules),
+    modtypes: env.modtypes,
+    components: add$6("module", slot, id, [
+          path,
+          components_of_module(env, identity, path, md.md_type)
+        ], env.components, renv.components),
+    classes: env.classes,
+    cltypes: env.cltypes,
+    functor_args: env.functor_args,
+    summary: {
+      TAG: /* Env_module */3,
+      _0: env.summary,
+      _1: id,
+      _2: md
+    },
+    local_constraints: env.local_constraints,
+    gadt_instances: env.gadt_instances,
+    flags: env.flags
+  };
 }
 
 function check_value_name(name, loc) {
   if (bs_only.contents && name === "|.") {
     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-              MEL_EXN_ID: $$Error$2,
-              _1: {
-                TAG: /* Illegal_value_name */4,
-                _0: loc,
-                _1: name
-              }
-            });
+          MEL_EXN_ID: $$Error$2,
+          _1: {
+            TAG: /* Illegal_value_name */4,
+            _0: loc,
+            _1: name
+          }
+        });
   }
   if (!(name.length !== 0 && Caml_string.get(name, 0) === /* '#' */35)) {
     return ;
@@ -13969,13 +13969,13 @@ function check_value_name(name, loc) {
   for (let i = 1 ,i_finish = name.length; i < i_finish; ++i) {
     if (Caml_string.get(name, i) === /* '#' */35) {
       throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                MEL_EXN_ID: $$Error$2,
-                _1: {
-                  TAG: /* Illegal_value_name */4,
-                  _0: loc,
-                  _1: name
-                }
-              });
+            MEL_EXN_ID: $$Error$2,
+            _1: {
+              TAG: /* Illegal_value_name */4,
+              _0: loc,
+              _1: name
+            }
+          });
     }
     
   }
@@ -14001,11 +14001,11 @@ function check_usage(loc, id, warn, tbl) {
         }));
   if (!(name === "" || Caml_string.get(name, 0) === /* '_' */95 || Caml_string.get(name, 0) === /* '#' */35)) {
     return Curry._1(add_delayed_check_forward.contents, (function (param) {
-                  if (!used.contents) {
-                    return prerr_warning(loc, Curry._1(warn, name));
-                  }
-                  
-                }));
+            if (!used.contents) {
+              return prerr_warning(loc, Curry._1(warn, name));
+            }
+            
+          }));
   }
   
 }
@@ -14158,43 +14158,43 @@ function components_of_module_maker(param) {
                 }
               }), sg$1, match[0]);
         return {
-                TAG: /* Structure_comps */0,
-                _0: c
-              };
+          TAG: /* Structure_comps */0,
+          _0: c
+        };
     case /* Mty_functor */2 :
         return {
-                TAG: /* Functor_comps */1,
-                _0: {
-                  fcomp_param: sg._0,
-                  fcomp_arg: may_map((function (param) {
-                          return modtype(sub, param);
-                        }), sg._1),
-                  fcomp_res: sg._2,
-                  fcomp_env: env,
-                  fcomp_subst: sub,
-                  fcomp_cache: Stdlib__Hashtbl.create(undefined, 17),
-                  fcomp_subst_cache: Stdlib__Hashtbl.create(undefined, 17)
-                }
-              };
+          TAG: /* Functor_comps */1,
+          _0: {
+            fcomp_param: sg._0,
+            fcomp_arg: may_map((function (param) {
+                    return modtype(sub, param);
+                  }), sg._1),
+            fcomp_res: sg._2,
+            fcomp_env: env,
+            fcomp_subst: sub,
+            fcomp_cache: Stdlib__Hashtbl.create(undefined, 17),
+            fcomp_subst_cache: Stdlib__Hashtbl.create(undefined, 17)
+          }
+        };
     case /* Mty_ident */0 :
     case /* Mty_alias */3 :
         break;
     
   }
   return {
-          TAG: /* Structure_comps */0,
-          _0: {
-            comp_values: /* Empty */0,
-            comp_constrs: /* Empty */0,
-            comp_labels: /* Empty */0,
-            comp_types: /* Empty */0,
-            comp_modules: /* Empty */0,
-            comp_modtypes: /* Empty */0,
-            comp_components: /* Empty */0,
-            comp_classes: /* Empty */0,
-            comp_cltypes: /* Empty */0
-          }
-        };
+    TAG: /* Structure_comps */0,
+    _0: {
+      comp_values: /* Empty */0,
+      comp_constrs: /* Empty */0,
+      comp_labels: /* Empty */0,
+      comp_types: /* Empty */0,
+      comp_modules: /* Empty */0,
+      comp_modtypes: /* Empty */0,
+      comp_components: /* Empty */0,
+      comp_classes: /* Empty */0,
+      comp_cltypes: /* Empty */0
+    }
+  };
 }
 
 function store_value(check, slot, id, path, decl, env, renv) {
@@ -14203,29 +14203,29 @@ function store_value(check, slot, id, path, decl, env, renv) {
           check_usage(decl.val_loc, id, f, value_declarations);
         }), check);
   return {
-          values: add$6("value", slot, id, [
-                path,
-                decl
-              ], env.values, renv.values),
-          constrs: env.constrs,
-          labels: env.labels,
-          types: env.types,
-          modules: env.modules,
-          modtypes: env.modtypes,
-          components: env.components,
-          classes: env.classes,
-          cltypes: env.cltypes,
-          functor_args: env.functor_args,
-          summary: {
-            TAG: /* Env_value */0,
-            _0: env.summary,
-            _1: id,
-            _2: decl
-          },
-          local_constraints: env.local_constraints,
-          gadt_instances: env.gadt_instances,
-          flags: env.flags
-        };
+    values: add$6("value", slot, id, [
+          path,
+          decl
+        ], env.values, renv.values),
+    constrs: env.constrs,
+    labels: env.labels,
+    types: env.types,
+    modules: env.modules,
+    modtypes: env.modtypes,
+    components: env.components,
+    classes: env.classes,
+    cltypes: env.cltypes,
+    functor_args: env.functor_args,
+    summary: {
+      TAG: /* Env_value */0,
+      _0: env.summary,
+      _1: id,
+      _2: decl
+    },
+    local_constraints: env.local_constraints,
+    gadt_instances: env.gadt_instances,
+    flags: env.flags
+  };
 }
 
 function store_type(check, slot, id, path, info, env, renv) {
@@ -14233,9 +14233,9 @@ function store_type(check, slot, id, path, info, env, renv) {
   if (check) {
     check_usage(loc, id, (function (s) {
             return {
-                    TAG: /* Unused_type_declaration */18,
-                    _0: s
-                  };
+              TAG: /* Unused_type_declaration */18,
+              _0: s
+            };
           }), type_declarations);
   }
   const constructors = constructors_of_type(path, info);
@@ -14277,51 +14277,51 @@ function store_type(check, slot, id, path, info, env, renv) {
                   }));
             if (!(ty === "" || Caml_string.get(ty, 0) === /* '_' */95)) {
               return Curry._1(add_delayed_check_forward.contents, (function (param) {
-                            if (!is_in_signature(env) && !used.cu_positive) {
-                              return prerr_warning(loc, {
-                                          TAG: /* Unused_constructor */21,
-                                          _0: c,
-                                          _1: used.cu_pattern,
-                                          _2: used.cu_privatize
-                                        });
-                            }
-                            
-                          }));
+                      if (!is_in_signature(env) && !used.cu_positive) {
+                        return prerr_warning(loc, {
+                              TAG: /* Unused_constructor */21,
+                              _0: c,
+                              _1: used.cu_pattern,
+                              _2: used.cu_privatize
+                            });
+                      }
+                      
+                    }));
             }
             
           }), constructors);
   }
   return {
-          values: env.values,
-          constrs: Stdlib__List.fold_right((function (param, constrs) {
-                  return add$6("constructor", slot, param[0], param[1], constrs, renv.constrs);
-                }), constructors, env.constrs),
-          labels: Stdlib__List.fold_right((function (param, labels) {
-                  return add$6("label", slot, param[0], param[1], labels, renv.labels);
-                }), labels, env.labels),
-          types: add$6("type", slot, id, [
-                path,
-                [
-                  info,
-                  descrs
-                ]
-              ], env.types, renv.types),
-          modules: env.modules,
-          modtypes: env.modtypes,
-          components: env.components,
-          classes: env.classes,
-          cltypes: env.cltypes,
-          functor_args: env.functor_args,
-          summary: {
-            TAG: /* Env_type */1,
-            _0: env.summary,
-            _1: id,
-            _2: info
-          },
-          local_constraints: env.local_constraints,
-          gadt_instances: env.gadt_instances,
-          flags: env.flags
-        };
+    values: env.values,
+    constrs: Stdlib__List.fold_right((function (param, constrs) {
+            return add$6("constructor", slot, param[0], param[1], constrs, renv.constrs);
+          }), constructors, env.constrs),
+    labels: Stdlib__List.fold_right((function (param, labels) {
+            return add$6("label", slot, param[0], param[1], labels, renv.labels);
+          }), labels, env.labels),
+    types: add$6("type", slot, id, [
+          path,
+          [
+            info,
+            descrs
+          ]
+        ], env.types, renv.types),
+    modules: env.modules,
+    modtypes: env.modtypes,
+    components: env.components,
+    classes: env.classes,
+    cltypes: env.cltypes,
+    functor_args: env.functor_args,
+    summary: {
+      TAG: /* Env_type */1,
+      _0: env.summary,
+      _1: id,
+      _2: info
+    },
+    local_constraints: env.local_constraints,
+    gadt_instances: env.gadt_instances,
+    flags: env.flags
+  };
 }
 
 function store_extension(check, slot, id, path, ext, env, renv) {
@@ -14351,11 +14351,11 @@ function store_extension(check, slot, id, path, ext, env, renv) {
       Curry._1(add_delayed_check_forward.contents, (function (param) {
               if (!is_in_signature(env) && !used.cu_positive) {
                 return prerr_warning(loc, {
-                            TAG: /* Unused_extension */22,
-                            _0: n,
-                            _1: used.cu_pattern,
-                            _2: used.cu_privatize
-                          });
+                      TAG: /* Unused_extension */22,
+                      _0: n,
+                      _1: used.cu_pattern,
+                      _2: used.cu_privatize
+                    });
               }
               
             }));
@@ -14363,80 +14363,80 @@ function store_extension(check, slot, id, path, ext, env, renv) {
     
   }
   return {
-          values: env.values,
-          constrs: add$6("constructor", slot, id, extension_descr(path, ext), env.constrs, renv.constrs),
-          labels: env.labels,
-          types: env.types,
-          modules: env.modules,
-          modtypes: env.modtypes,
-          components: env.components,
-          classes: env.classes,
-          cltypes: env.cltypes,
-          functor_args: env.functor_args,
-          summary: {
-            TAG: /* Env_extension */2,
-            _0: env.summary,
-            _1: id,
-            _2: ext
-          },
-          local_constraints: env.local_constraints,
-          gadt_instances: env.gadt_instances,
-          flags: env.flags
-        };
+    values: env.values,
+    constrs: add$6("constructor", slot, id, extension_descr(path, ext), env.constrs, renv.constrs),
+    labels: env.labels,
+    types: env.types,
+    modules: env.modules,
+    modtypes: env.modtypes,
+    components: env.components,
+    classes: env.classes,
+    cltypes: env.cltypes,
+    functor_args: env.functor_args,
+    summary: {
+      TAG: /* Env_extension */2,
+      _0: env.summary,
+      _1: id,
+      _2: ext
+    },
+    local_constraints: env.local_constraints,
+    gadt_instances: env.gadt_instances,
+    flags: env.flags
+  };
 }
 
 function store_class(slot, id, path, desc, env, renv) {
   return {
-          values: env.values,
-          constrs: env.constrs,
-          labels: env.labels,
-          types: env.types,
-          modules: env.modules,
-          modtypes: env.modtypes,
-          components: env.components,
-          classes: add$6("class", slot, id, [
-                path,
-                desc
-              ], env.classes, renv.classes),
-          cltypes: env.cltypes,
-          functor_args: env.functor_args,
-          summary: {
-            TAG: /* Env_class */5,
-            _0: env.summary,
-            _1: id,
-            _2: desc
-          },
-          local_constraints: env.local_constraints,
-          gadt_instances: env.gadt_instances,
-          flags: env.flags
-        };
+    values: env.values,
+    constrs: env.constrs,
+    labels: env.labels,
+    types: env.types,
+    modules: env.modules,
+    modtypes: env.modtypes,
+    components: env.components,
+    classes: add$6("class", slot, id, [
+          path,
+          desc
+        ], env.classes, renv.classes),
+    cltypes: env.cltypes,
+    functor_args: env.functor_args,
+    summary: {
+      TAG: /* Env_class */5,
+      _0: env.summary,
+      _1: id,
+      _2: desc
+    },
+    local_constraints: env.local_constraints,
+    gadt_instances: env.gadt_instances,
+    flags: env.flags
+  };
 }
 
 function store_cltype(slot, id, path, desc, env, renv) {
   return {
-          values: env.values,
-          constrs: env.constrs,
-          labels: env.labels,
-          types: env.types,
-          modules: env.modules,
-          modtypes: env.modtypes,
-          components: env.components,
-          classes: env.classes,
-          cltypes: add$6("class type", slot, id, [
-                path,
-                desc
-              ], env.cltypes, renv.cltypes),
-          functor_args: env.functor_args,
-          summary: {
-            TAG: /* Env_cltype */6,
-            _0: env.summary,
-            _1: id,
-            _2: desc
-          },
-          local_constraints: env.local_constraints,
-          gadt_instances: env.gadt_instances,
-          flags: env.flags
-        };
+    values: env.values,
+    constrs: env.constrs,
+    labels: env.labels,
+    types: env.types,
+    modules: env.modules,
+    modtypes: env.modtypes,
+    components: env.components,
+    classes: env.classes,
+    cltypes: add$6("class type", slot, id, [
+          path,
+          desc
+        ], env.cltypes, renv.cltypes),
+    functor_args: env.functor_args,
+    summary: {
+      TAG: /* Env_cltype */6,
+      _0: env.summary,
+      _1: id,
+      _2: desc
+    },
+    local_constraints: env.local_constraints,
+    gadt_instances: env.gadt_instances,
+    flags: env.flags
+  };
 }
 
 function components_of_functor_appl(f, p1, p2) {
@@ -14468,23 +14468,23 @@ components_of_module_maker$p.contents = components_of_module_maker;
 
 function add_value(check, id, desc, env) {
   return store_value(check, undefined, id, {
-              TAG: /* Pident */0,
-              _0: id
-            }, desc, env, env);
+        TAG: /* Pident */0,
+        _0: id
+      }, desc, env, env);
 }
 
 function add_type$1(check, id, info, env) {
   return store_type(check, undefined, id, {
-              TAG: /* Pident */0,
-              _0: id
-            }, info, env, env);
+        TAG: /* Pident */0,
+        _0: id
+      }, info, env, env);
 }
 
 function add_extension(check, id, ext, env) {
   return store_extension(check, undefined, id, {
-              TAG: /* Pident */0,
-              _0: id
-            }, ext, env, env);
+        TAG: /* Pident */0,
+        _0: id
+      }, ext, env, env);
 }
 
 function add_module_declaration(arg, id, md, env) {
@@ -14496,25 +14496,25 @@ function add_module_declaration(arg, id, md, env) {
   const arg$1 = arg !== undefined ? arg : false;
   if (arg$1) {
     return {
-            values: env$1.values,
-            constrs: env$1.constrs,
-            labels: env$1.labels,
-            types: env$1.types,
-            modules: env$1.modules,
-            modtypes: env$1.modtypes,
-            components: env$1.components,
-            classes: env$1.classes,
-            cltypes: env$1.cltypes,
-            functor_args: add(id, undefined, env$1.functor_args),
-            summary: {
-              TAG: /* Env_functor_arg */8,
-              _0: env$1.summary,
-              _1: id
-            },
-            local_constraints: env$1.local_constraints,
-            gadt_instances: env$1.gadt_instances,
-            flags: env$1.flags
-          };
+      values: env$1.values,
+      constrs: env$1.constrs,
+      labels: env$1.labels,
+      types: env$1.types,
+      modules: env$1.modules,
+      modtypes: env$1.modtypes,
+      components: env$1.components,
+      classes: env$1.classes,
+      cltypes: env$1.cltypes,
+      functor_args: add(id, undefined, env$1.functor_args),
+      summary: {
+        TAG: /* Env_functor_arg */8,
+        _0: env$1.summary,
+        _1: id
+      },
+      local_constraints: env$1.local_constraints,
+      gadt_instances: env$1.gadt_instances,
+      flags: env$1.flags
+    };
   } else {
     return env$1;
   }
@@ -14522,31 +14522,31 @@ function add_module_declaration(arg, id, md, env) {
 
 function add_modtype$1(id, info, env) {
   return store_modtype(undefined, id, {
-              TAG: /* Pident */0,
-              _0: id
-            }, info, env, env);
+        TAG: /* Pident */0,
+        _0: id
+      }, info, env, env);
 }
 
 function add_class(id, ty, env) {
   return store_class(undefined, id, {
-              TAG: /* Pident */0,
-              _0: id
-            }, ty, env, env);
+        TAG: /* Pident */0,
+        _0: id
+      }, ty, env, env);
 }
 
 function add_cltype(id, ty, env) {
   return store_cltype(undefined, id, {
-              TAG: /* Pident */0,
-              _0: id
-            }, ty, env, env);
+        TAG: /* Pident */0,
+        _0: id
+      }, ty, env, env);
 }
 
 function add_module$1(arg, id, mty, env) {
   return add_module_declaration(arg, id, {
-              md_type: mty,
-              md_attributes: /* [] */0,
-              md_loc: none
-            }, env);
+        md_type: mty,
+        md_attributes: /* [] */0,
+        md_loc: none
+      }, env);
 }
 
 function add_local_constraint(id, info, elv, env) {
@@ -14568,72 +14568,72 @@ function add_local_constraint(id, info, elv, env) {
             type_attributes: info.type_attributes
           }, env);
       return {
-              values: env$1.values,
-              constrs: env$1.constrs,
-              labels: env$1.labels,
-              types: env$1.types,
-              modules: env$1.modules,
-              modtypes: env$1.modtypes,
-              components: env$1.components,
-              classes: env$1.classes,
-              cltypes: env$1.cltypes,
-              functor_args: env$1.functor_args,
-              summary: env$1.summary,
-              local_constraints: true,
-              gadt_instances: env$1.gadt_instances,
-              flags: env$1.flags
-            };
+        values: env$1.values,
+        constrs: env$1.constrs,
+        labels: env$1.labels,
+        types: env$1.types,
+        modules: env$1.modules,
+        modtypes: env$1.modtypes,
+        components: env$1.components,
+        classes: env$1.classes,
+        cltypes: env$1.cltypes,
+        functor_args: env$1.functor_args,
+        summary: env$1.summary,
+        local_constraints: true,
+        gadt_instances: env$1.gadt_instances,
+        flags: env$1.flags
+      };
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                11231,
-                9
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            11231,
+            9
+          ]
+        });
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              11231,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          11231,
+          9
+        ]
+      });
 }
 
 function enter(store_fun, name, data, env) {
   const id = create(name);
   return [
-          id,
-          Curry._6(store_fun, undefined, id, {
-                TAG: /* Pident */0,
-                _0: id
-              }, data, env, env)
-        ];
+    id,
+    Curry._6(store_fun, undefined, id, {
+          TAG: /* Pident */0,
+          _0: id
+        }, data, env, env)
+  ];
 }
 
 function enter_value(check) {
   return function (param, param$1, param$2) {
     return enter((function (param, param$1, param$2, param$3, param$4, param$5) {
-                  return store_value(check, param, param$1, param$2, param$3, param$4, param$5);
-                }), param, param$1, param$2);
+            return store_value(check, param, param$1, param$2, param$3, param$4, param$5);
+          }), param, param$1, param$2);
   };
 }
 
 function enter_type(param, param$1, param$2) {
   return enter((function (param, param$1, param$2, param$3, param$4, param$5) {
-                return store_type(true, param, param$1, param$2, param$3, param$4, param$5);
-              }), param, param$1, param$2);
+          return store_type(true, param, param$1, param$2, param$3, param$4, param$5);
+        }), param, param$1, param$2);
 }
 
 function enter_module_declaration(arg, name, md, env) {
   const id = create(name);
   return [
-          id,
-          add_module_declaration(arg, id, md, env)
-        ];
+    id,
+    add_module_declaration(arg, id, md, env)
+  ];
 }
 
 function enter_modtype(param, param$1, param$2) {
@@ -14642,10 +14642,10 @@ function enter_modtype(param, param$1, param$2) {
 
 function enter_module(arg, s, mty, env) {
   return enter_module_declaration(arg, s, {
-              md_type: mty,
-              md_attributes: /* [] */0,
-              md_loc: none
-            }, env);
+        md_type: mty,
+        md_attributes: /* [] */0,
+        md_loc: none
+      }, env);
 }
 
 function add_item(comp, env) {
@@ -14704,25 +14704,25 @@ function open_signature(slot, root, sg, env0) {
           }
         }), env0, sg$1, match[0]);
   return {
-          values: newenv.values,
-          constrs: newenv.constrs,
-          labels: newenv.labels,
-          types: newenv.types,
-          modules: newenv.modules,
-          modtypes: newenv.modtypes,
-          components: newenv.components,
-          classes: newenv.classes,
-          cltypes: newenv.cltypes,
-          functor_args: newenv.functor_args,
-          summary: {
-            TAG: /* Env_open */7,
-            _0: env0.summary,
-            _1: root
-          },
-          local_constraints: newenv.local_constraints,
-          gadt_instances: newenv.gadt_instances,
-          flags: newenv.flags
-        };
+    values: newenv.values,
+    constrs: newenv.constrs,
+    labels: newenv.labels,
+    types: newenv.types,
+    modules: newenv.modules,
+    modtypes: newenv.modtypes,
+    components: newenv.components,
+    classes: newenv.classes,
+    cltypes: newenv.cltypes,
+    functor_args: newenv.functor_args,
+    summary: {
+      TAG: /* Env_open */7,
+      _0: env0.summary,
+      _1: root
+    },
+    local_constraints: newenv.local_constraints,
+    gadt_instances: newenv.gadt_instances,
+    flags: newenv.flags
+  };
 }
 
 function open_signature$1(locOpt, toplevelOpt, ovf, root, sg, env) {
@@ -14748,9 +14748,9 @@ function open_signature$1(locOpt, toplevelOpt, ovf, root, sg, env) {
   Curry._1(add_delayed_check_forward.contents, (function (param) {
           if (!used.contents) {
             return prerr_warning(loc, {
-                        TAG: /* Unused_open */17,
-                        _0: name(undefined, root)
-                      });
+                  TAG: /* Unused_open */17,
+                  _0: name(undefined, root)
+                });
           }
           
         }));
@@ -14803,15 +14803,15 @@ function imports(param) {
   const dont_record_crc_unit$1 = dont_record_crc_unit.contents;
   if (dont_record_crc_unit$1 !== undefined) {
     return extract(Curry._3(fold$5, (function (m, acc) {
-                      if (m === dont_record_crc_unit$1) {
-                        return acc;
-                      } else {
-                        return {
-                                hd: m,
-                                tl: acc
-                              };
-                      }
-                    }), imported_units.contents, /* [] */0), crc_units);
+                if (m === dont_record_crc_unit$1) {
+                  return acc;
+                } else {
+                  return {
+                    hd: m,
+                    tl: acc
+                  };
+                }
+              }), imported_units.contents, /* [] */0), crc_units);
   } else {
     return extract(Curry._1(elements$2, imported_units.contents), crc_units);
   }
@@ -14825,9 +14825,9 @@ function save_signature(sg, modname, filename) {
   const oc = Stdlib.open_out_bin(filename);
   try {
     const cmi_cmi_flags = recursive_types.contents ? ({
-          hd: /* Rectypes */0,
-          tl: /* [] */0
-        }) : /* [] */0;
+        hd: /* Rectypes */0,
+        tl: /* [] */0
+      }) : /* [] */0;
     const cmi = {
       cmi_name: modname,
       cmi_sign: sg$1,
@@ -14877,21 +14877,21 @@ function save_signature(sg, modname, filename) {
 function find_all$1(proj1, proj2, f, lid, env, acc) {
   if (lid === undefined) {
     return fold_name(function (id, param, acc) {
-                  return Curry._4(f, id.name, param[0], param[1], acc);
-                })(Curry._1(proj1, env), acc);
+            return Curry._4(f, id.name, param[0], param[1], acc);
+          })(Curry._1(proj1, env), acc);
   }
   const match = lookup_module_descr(lid, env);
   const p = match[0];
   const c = force(components_of_module_maker, match[1]);
   if (c.TAG === /* Structure_comps */0) {
     return fold$4((function (s, param, acc) {
-                  return Curry._4(f, s, {
-                              TAG: /* Pdot */1,
-                              _0: p,
-                              _1: s,
-                              _2: param[1]
-                            }, param[0], acc);
-                }), Curry._1(proj2, c._0), acc);
+            return Curry._4(f, s, {
+                  TAG: /* Pdot */1,
+                  _0: p,
+                  _1: s,
+                  _2: param[1]
+                }, param[0], acc);
+          }), Curry._1(proj2, c._0), acc);
   } else {
     return acc;
   }
@@ -14900,19 +14900,19 @@ function find_all$1(proj1, proj2, f, lid, env, acc) {
 function find_all_simple_list(proj1, proj2, f, lid, env, acc) {
   if (lid === undefined) {
     return fold_name(function (id, data, acc) {
-                  return Curry._2(f, data, acc);
-                })(Curry._1(proj1, env), acc);
+            return Curry._2(f, data, acc);
+          })(Curry._1(proj1, env), acc);
   }
   const match = lookup_module_descr(lid, env);
   const c = force(components_of_module_maker, match[1]);
   if (c.TAG === /* Structure_comps */0) {
     return fold$4((function (s, comps, acc) {
-                  if (comps) {
-                    return Curry._2(f, comps.hd[0], acc);
-                  } else {
-                    return acc;
-                  }
-                }), Curry._1(proj2, c._0), acc);
+            if (comps) {
+              return Curry._2(f, comps.hd[0], acc);
+            } else {
+              return acc;
+            }
+          }), Curry._1(proj2, c._0), acc);
   } else {
     return acc;
   }
@@ -14925,18 +14925,18 @@ function fold_modules(f, lid, env, acc) {
     const c = force(components_of_module_maker, match[1]);
     if (c.TAG === /* Structure_comps */0) {
       return fold$4((function (s, param, acc) {
-                    const md_type = force(subst_modtype_maker, param[0]);
-                    return Curry._4(f, s, {
-                                TAG: /* Pdot */1,
-                                _0: p,
-                                _1: s,
-                                _2: param[1]
-                              }, {
-                                md_type: md_type,
-                                md_attributes: /* [] */0,
-                                md_loc: none
-                              }, acc);
-                  }), c._0.comp_modules, acc);
+              const md_type = force(subst_modtype_maker, param[0]);
+              return Curry._4(f, s, {
+                    TAG: /* Pdot */1,
+                    _0: p,
+                    _1: s,
+                    _2: param[1]
+                  }, {
+                    md_type: md_type,
+                    md_attributes: /* [] */0,
+                    md_loc: none
+                  }, acc);
+            }), c._0.comp_modules, acc);
     } else {
       return acc;
     }
@@ -14945,95 +14945,95 @@ function fold_modules(f, lid, env, acc) {
           return Curry._4(f, id.name, param[0], param[1], acc);
         })(env.modules, acc);
   return Stdlib__Hashtbl.fold((function (name, ps, acc) {
-                if (ps !== undefined) {
-                  return Curry._4(f, name, {
-                              TAG: /* Pident */0,
-                              _0: {
-                                stamp: 0,
-                                name: name,
-                                flags: 1
-                              }
-                            }, {
-                              md_type: {
-                                TAG: /* Mty_signature */1,
-                                _0: ps.ps_sig
-                              },
-                              md_attributes: /* [] */0,
-                              md_loc: none
-                            }, acc);
-                } else {
-                  return acc;
-                }
-              }), persistent_structures, acc$1);
+          if (ps !== undefined) {
+            return Curry._4(f, name, {
+                  TAG: /* Pident */0,
+                  _0: {
+                    stamp: 0,
+                    name: name,
+                    flags: 1
+                  }
+                }, {
+                  md_type: {
+                    TAG: /* Mty_signature */1,
+                    _0: ps.ps_sig
+                  },
+                  md_attributes: /* [] */0,
+                  md_loc: none
+                }, acc);
+          } else {
+            return acc;
+          }
+        }), persistent_structures, acc$1);
 }
 
 function fold_values(f) {
   return function (param, param$1, param$2) {
     return find_all$1((function (env) {
-                  return env.values;
-                }), (function (sc) {
-                  return sc.comp_values;
-                }), f, param, param$1, param$2);
+            return env.values;
+          }), (function (sc) {
+            return sc.comp_values;
+          }), f, param, param$1, param$2);
   };
 }
 
 function fold_constructors(f) {
   return function (param, param$1, param$2) {
     return find_all_simple_list((function (env) {
-                  return env.constrs;
-                }), (function (sc) {
-                  return sc.comp_constrs;
-                }), f, param, param$1, param$2);
+            return env.constrs;
+          }), (function (sc) {
+            return sc.comp_constrs;
+          }), f, param, param$1, param$2);
   };
 }
 
 function fold_labels(f) {
   return function (param, param$1, param$2) {
     return find_all_simple_list((function (env) {
-                  return env.labels;
-                }), (function (sc) {
-                  return sc.comp_labels;
-                }), f, param, param$1, param$2);
+            return env.labels;
+          }), (function (sc) {
+            return sc.comp_labels;
+          }), f, param, param$1, param$2);
   };
 }
 
 function fold_types(f) {
   return function (param, param$1, param$2) {
     return find_all$1((function (env) {
-                  return env.types;
-                }), (function (sc) {
-                  return sc.comp_types;
-                }), f, param, param$1, param$2);
+            return env.types;
+          }), (function (sc) {
+            return sc.comp_types;
+          }), f, param, param$1, param$2);
   };
 }
 
 function fold_modtypes(f) {
   return function (param, param$1, param$2) {
     return find_all$1((function (env) {
-                  return env.modtypes;
-                }), (function (sc) {
-                  return sc.comp_modtypes;
-                }), f, param, param$1, param$2);
+            return env.modtypes;
+          }), (function (sc) {
+            return sc.comp_modtypes;
+          }), f, param, param$1, param$2);
   };
 }
 
 function fold_classs(f) {
   return function (param, param$1, param$2) {
     return find_all$1((function (env) {
-                  return env.classes;
-                }), (function (sc) {
-                  return sc.comp_classes;
-                }), f, param, param$1, param$2);
+            return env.classes;
+          }), (function (sc) {
+            return sc.comp_classes;
+          }), f, param, param$1, param$2);
   };
 }
 
 function fold_cltypes(f) {
   return function (param, param$1, param$2) {
     return find_all$1((function (env) {
-                  return env.cltypes;
-                }), (function (sc) {
-                  return sc.comp_cltypes;
-                }), f, param, param$1, param$2);
+            return env.cltypes;
+          }), (function (sc) {
+            return sc.comp_cltypes;
+          }), f, param, param$1, param$2);
   };
 }
 
@@ -15085,75 +15085,88 @@ function report_error$1(ppf, param) {
   switch (param.TAG) {
     case /* Illegal_renaming */0 :
         return Curry._4(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Wrong file naming: ",
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: {
+                        TAG: /* Formatting_lit */17,
                         _0: {
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
+                        },
+                        _1: {
                           TAG: /* String_literal */11,
-                          _0: "Wrong file naming: ",
+                          _0: "contains the compiled interface for ",
                           _1: {
-                            TAG: /* Alpha */15,
+                            TAG: /* Formatting_lit */17,
                             _0: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
+                              TAG: /* Break */0,
+                              _0: "@ ",
+                              _1: 1,
+                              _2: 0
+                            },
+                            _1: {
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
                               _1: {
                                 TAG: /* String_literal */11,
-                                _0: "contains the compiled interface for ",
+                                _0: " when ",
                                 _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@ ",
-                                    _1: 1,
-                                    _2: 0
-                                  },
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
                                   _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: {
-                                      TAG: /* String_literal */11,
-                                      _0: " when ",
-                                      _1: {
-                                        TAG: /* String */2,
-                                        _0: /* No_padding */0,
-                                        _1: {
-                                          TAG: /* String_literal */11,
-                                          _0: " was expected",
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
+                                    TAG: /* String_literal */11,
+                                    _0: " was expected",
+                                    _1: /* End_of_format */0
                                   }
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "Wrong file naming: %a@ contains the compiled interface for @ %s when %s was expected"
-                      }), print_filename, param._2, param._0, param._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "Wrong file naming: %a@ contains the compiled interface for @ %s when %s was expected"
+                }), print_filename, param._2, param._0, param._1);
     case /* Inconsistent_import */1 :
         return Curry._5(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<hov>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hov>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "The files ",
+                      _1: {
+                        TAG: /* Alpha */15,
+                        _0: {
+                          TAG: /* Formatting_lit */17,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hov>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hov>"
-                            }
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
                           },
                           _1: {
                             TAG: /* String_literal */11,
-                            _0: "The files ",
+                            _0: "and ",
                             _1: {
                               TAG: /* Alpha */15,
                               _0: {
@@ -15166,41 +15179,25 @@ function report_error$1(ppf, param) {
                                 },
                                 _1: {
                                   TAG: /* String_literal */11,
-                                  _0: "and ",
+                                  _0: "make inconsistent assumptions",
                                   _1: {
-                                    TAG: /* Alpha */15,
+                                    TAG: /* Formatting_lit */17,
                                     _0: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
+                                      TAG: /* Break */0,
+                                      _0: "@ ",
+                                      _1: 1,
+                                      _2: 0
+                                    },
+                                    _1: {
+                                      TAG: /* String_literal */11,
+                                      _0: "over interface ",
                                       _1: {
-                                        TAG: /* String_literal */11,
-                                        _0: "make inconsistent assumptions",
+                                        TAG: /* String */2,
+                                        _0: /* No_padding */0,
                                         _1: {
                                           TAG: /* Formatting_lit */17,
-                                          _0: {
-                                            TAG: /* Break */0,
-                                            _0: "@ ",
-                                            _1: 1,
-                                            _2: 0
-                                          },
-                                          _1: {
-                                            TAG: /* String_literal */11,
-                                            _0: "over interface ",
-                                            _1: {
-                                              TAG: /* String */2,
-                                              _0: /* No_padding */0,
-                                              _1: {
-                                                TAG: /* Formatting_lit */17,
-                                                _0: /* Close_box */0,
-                                                _1: /* End_of_format */0
-                                              }
-                                            }
-                                          }
+                                          _0: /* Close_box */0,
+                                          _1: /* End_of_format */0
                                         }
                                       }
                                     }
@@ -15209,67 +15206,70 @@ function report_error$1(ppf, param) {
                               }
                             }
                           }
-                        },
-                        _1: "@[<hov>The files %a@ and %a@ make inconsistent assumptions@ over interface %s@]"
-                      }), print_filename, param._1, print_filename, param._2, param._0);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hov>The files %a@ and %a@ make inconsistent assumptions@ over interface %s@]"
+                }), print_filename, param._1, print_filename, param._2, param._0);
     case /* Need_recursive_types */2 :
         return Curry._3(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hov>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hov>"
-                            }
-                          },
+                          TAG: /* String_literal */11,
+                          _0: "<hov>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hov>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Unit ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " imports from ",
                           _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Unit ",
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                              TAG: /* String_literal */11,
+                              _0: ", which uses recursive types.",
                               _1: {
-                                TAG: /* String_literal */11,
-                                _0: " imports from ",
+                                TAG: /* Formatting_lit */17,
+                                _0: {
+                                  TAG: /* Break */0,
+                                  _0: "@ ",
+                                  _1: 1,
+                                  _2: 0
+                                },
                                 _1: {
                                   TAG: /* String */2,
                                   _0: /* No_padding */0,
                                   _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: ", which uses recursive types.",
-                                    _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
-                                      _1: {
-                                        TAG: /* String */2,
-                                        _0: /* No_padding */0,
-                                        _1: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: /* Close_box */0,
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
+                                    TAG: /* Formatting_lit */17,
+                                    _0: /* Close_box */0,
+                                    _1: /* End_of_format */0
                                   }
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[<hov>Unit %s imports from %s, which uses recursive types.@ %s@]"
-                      }), param._1, param._0, "The compilation flag -rectypes is required");
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hov>Unit %s imports from %s, which uses recursive types.@ %s@]"
+                }), param._1, param._0, "The compilation flag -rectypes is required");
     case /* Missing_module */3 :
         const path2 = param._2;
         const path1 = param._1;
@@ -15404,10 +15404,31 @@ function report_error$1(ppf, param) {
                   }), name(undefined, path1), name(undefined, path2));
         }
         return Curry._3(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_lit */17,
+                    _0: /* Close_box */0,
+                    _1: {
+                      TAG: /* Formatting_lit */17,
+                      _0: {
+                        TAG: /* Break */0,
+                        _0: "@ ",
+                        _1: 1,
+                        _2: 0
+                      },
+                      _1: {
+                        TAG: /* Formatting_gen */18,
                         _0: {
-                          TAG: /* Formatting_lit */17,
-                          _0: /* Close_box */0,
+                          TAG: /* Open_box */1,
+                          _0: {
+                            TAG: /* Format */0,
+                            _0: /* End_of_format */0,
+                            _1: ""
+                          }
+                        },
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
                           _1: {
                             TAG: /* Formatting_lit */17,
                             _0: {
@@ -15417,53 +15438,29 @@ function report_error$1(ppf, param) {
                               _2: 0
                             },
                             _1: {
-                              TAG: /* Formatting_gen */18,
-                              _0: {
-                                TAG: /* Open_box */1,
-                                _0: {
-                                  TAG: /* Format */0,
-                                  _0: /* End_of_format */0,
-                                  _1: ""
-                                }
-                              },
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
                               _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
+                                TAG: /* Formatting_lit */17,
+                                _0: {
+                                  TAG: /* Break */0,
+                                  _0: "@ ",
+                                  _1: 1,
+                                  _2: 0
+                                },
                                 _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@ ",
-                                    _1: 1,
-                                    _2: 0
-                                  },
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
                                   _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
+                                    TAG: /* Char_literal */12,
+                                    _0: /* '.' */46,
                                     _1: {
                                       TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
+                                      _0: /* Close_box */0,
                                       _1: {
-                                        TAG: /* String */2,
-                                        _0: /* No_padding */0,
-                                        _1: {
-                                          TAG: /* Char_literal */12,
-                                          _0: /* '.' */46,
-                                          _1: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: /* Close_box */0,
-                                            _1: {
-                                              TAG: /* Formatting_lit */17,
-                                              _0: /* Close_box */0,
-                                              _1: /* End_of_format */0
-                                            }
-                                          }
-                                        }
+                                        TAG: /* Formatting_lit */17,
+                                        _0: /* Close_box */0,
+                                        _1: /* End_of_format */0
                                       }
                                     }
                                   }
@@ -15471,27 +15468,30 @@ function report_error$1(ppf, param) {
                               }
                             }
                           }
-                        },
-                        _1: "@]@ @[%s@ %s@ %s.@]@]"
-                      }), "The compiled interface for module", head(path2).name, "was not found");
+                        }
+                      }
+                    }
+                  },
+                  _1: "@]@ @[%s@ %s@ %s.@]@]"
+                }), "The compiled interface for module", head(path2).name, "was not found");
     case /* Illegal_value_name */4 :
         return Curry._1(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '\'' */39,
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: "' is not a valid value identifier.",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "'%s' is not a valid value identifier."
-                      }), param._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '\'' */39,
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "' is not a valid value identifier.",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "'%s' is not a valid value identifier."
+                }), param._1);
     
   }
 }
@@ -15548,54 +15548,54 @@ function from_pair_suites(name, suites) {
     if (is_mocha(undefined)) {
       describe(name, (function () {
               return Stdlib__List.iter((function (param) {
-                            const code = param[1];
-                            it(param[0], (function () {
-                                    let spec = Curry._1(code, undefined);
-                                    switch (spec.TAG) {
-                                      case /* Eq */0 :
-                                          Assert.deepEqual(spec._0, spec._1);
-                                          return ;
-                                      case /* Neq */1 :
-                                          Assert.notDeepEqual(spec._0, spec._1);
-                                          return ;
-                                      case /* StrictEq */2 :
-                                          Assert.strictEqual(spec._0, spec._1);
-                                          return ;
-                                      case /* StrictNeq */3 :
-                                          Assert.notStrictEqual(spec._0, spec._1);
-                                          return ;
-                                      case /* Ok */4 :
-                                          Assert.ok(spec._0);
-                                          return ;
-                                      case /* Approx */5 :
-                                          const b = spec._1;
-                                          const a = spec._0;
-                                          if (!close_enough(undefined, a, b)) {
-                                            Assert.deepEqual(a, b);
-                                            return ;
-                                          } else {
-                                            return ;
-                                          }
-                                      case /* ApproxThreshold */6 :
-                                          const b$1 = spec._2;
-                                          const a$1 = spec._1;
-                                          if (!close_enough(spec._0, a$1, b$1)) {
-                                            Assert.deepEqual(a$1, b$1);
-                                            return ;
-                                          } else {
-                                            return ;
-                                          }
-                                      case /* ThrowAny */7 :
-                                          Assert.throws(spec._0);
-                                          return ;
-                                      case /* Fail */8 :
-                                          return assert_fail("failed");
-                                      case /* FailWith */9 :
-                                          return assert_fail(spec._0);
-                                      
+                      const code = param[1];
+                      it(param[0], (function () {
+                              let spec = Curry._1(code, undefined);
+                              switch (spec.TAG) {
+                                case /* Eq */0 :
+                                    Assert.deepEqual(spec._0, spec._1);
+                                    return ;
+                                case /* Neq */1 :
+                                    Assert.notDeepEqual(spec._0, spec._1);
+                                    return ;
+                                case /* StrictEq */2 :
+                                    Assert.strictEqual(spec._0, spec._1);
+                                    return ;
+                                case /* StrictNeq */3 :
+                                    Assert.notStrictEqual(spec._0, spec._1);
+                                    return ;
+                                case /* Ok */4 :
+                                    Assert.ok(spec._0);
+                                    return ;
+                                case /* Approx */5 :
+                                    const b = spec._1;
+                                    const a = spec._0;
+                                    if (!close_enough(undefined, a, b)) {
+                                      Assert.deepEqual(a, b);
+                                      return ;
+                                    } else {
+                                      return ;
                                     }
-                                  }));
-                          }), suites);
+                                case /* ApproxThreshold */6 :
+                                    const b$1 = spec._2;
+                                    const a$1 = spec._1;
+                                    if (!close_enough(spec._0, a$1, b$1)) {
+                                      Assert.deepEqual(a$1, b$1);
+                                      return ;
+                                    } else {
+                                      return ;
+                                    }
+                                case /* ThrowAny */7 :
+                                    Assert.throws(spec._0);
+                                    return ;
+                                case /* Fail */8 :
+                                    return assert_fail("failed");
+                                case /* FailWith */9 :
+                                    return assert_fail(spec._0);
+                                
+                              }
+                            }));
+                    }), suites);
             }));
       return ;
     } else {
@@ -15604,78 +15604,78 @@ function from_pair_suites(name, suites) {
             "testing"
           ]);
       return Stdlib__List.iter((function (param) {
-                    const name = param[0];
-                    const fn = Curry._1(param[1], undefined);
-                    switch (fn.TAG) {
-                      case /* Eq */0 :
-                          console.log([
-                                name,
-                                fn._0,
-                                "eq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case /* Neq */1 :
-                          console.log([
-                                name,
-                                fn._0,
-                                "neq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case /* StrictEq */2 :
-                          console.log([
-                                name,
-                                fn._0,
-                                "strict_eq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case /* StrictNeq */3 :
-                          console.log([
-                                name,
-                                fn._0,
-                                "strict_neq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case /* Ok */4 :
-                          console.log([
-                                name,
-                                fn._0,
-                                "ok?"
-                              ]);
-                          return ;
-                      case /* Approx */5 :
-                          console.log([
-                                name,
-                                fn._0,
-                                "~",
-                                fn._1
-                              ]);
-                          return ;
-                      case /* ApproxThreshold */6 :
-                          console.log([
-                                name,
-                                fn._1,
-                                "~",
-                                fn._2,
-                                " (",
-                                fn._0,
-                                ")"
-                              ]);
-                          return ;
-                      case /* ThrowAny */7 :
-                          return ;
-                      case /* Fail */8 :
-                          console.log("failed");
-                          return ;
-                      case /* FailWith */9 :
-                          console.log("failed: " + fn._0);
-                          return ;
-                      
-                    }
-                  }), suites);
+              const name = param[0];
+              const fn = Curry._1(param[1], undefined);
+              switch (fn.TAG) {
+                case /* Eq */0 :
+                    console.log([
+                          name,
+                          fn._0,
+                          "eq?",
+                          fn._1
+                        ]);
+                    return ;
+                case /* Neq */1 :
+                    console.log([
+                          name,
+                          fn._0,
+                          "neq?",
+                          fn._1
+                        ]);
+                    return ;
+                case /* StrictEq */2 :
+                    console.log([
+                          name,
+                          fn._0,
+                          "strict_eq?",
+                          fn._1
+                        ]);
+                    return ;
+                case /* StrictNeq */3 :
+                    console.log([
+                          name,
+                          fn._0,
+                          "strict_neq?",
+                          fn._1
+                        ]);
+                    return ;
+                case /* Ok */4 :
+                    console.log([
+                          name,
+                          fn._0,
+                          "ok?"
+                        ]);
+                    return ;
+                case /* Approx */5 :
+                    console.log([
+                          name,
+                          fn._0,
+                          "~",
+                          fn._1
+                        ]);
+                    return ;
+                case /* ApproxThreshold */6 :
+                    console.log([
+                          name,
+                          fn._1,
+                          "~",
+                          fn._2,
+                          " (",
+                          fn._0,
+                          ")"
+                        ]);
+                    return ;
+                case /* ThrowAny */7 :
+                    return ;
+                case /* Fail */8 :
+                    console.log("failed");
+                    return ;
+                case /* FailWith */9 :
+                    console.log("failed: " + fn._0);
+                    return ;
+                
+              }
+            }), suites);
     }
   }
   
@@ -15693,162 +15693,162 @@ function prepare_error(loc) {
         const closing = loc._3;
         const opening = loc._1;
         return Curry._1(errorf(loc._2, {
-                        hd: Curry._1(errorf(loc._0, undefined, undefined, {
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* String_literal */11,
-                                    _0: "This '",
-                                    _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: {
-                                        TAG: /* String_literal */11,
-                                        _0: "' might be unmatched",
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  },
-                                  _1: "This '%s' might be unmatched"
-                                }), opening),
-                        tl: /* [] */0
-                      }, Curry._2(Stdlib__Printf.sprintf({
-                                TAG: /* Format */0,
-                                _0: {
+                  hd: Curry._1(errorf(loc._0, undefined, undefined, {
+                            TAG: /* Format */0,
+                            _0: {
+                              TAG: /* String_literal */11,
+                              _0: "This '",
+                              _1: {
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
+                                _1: {
                                   TAG: /* String_literal */11,
-                                  _0: "Syntax error: '",
+                                  _0: "' might be unmatched",
+                                  _1: /* End_of_format */0
+                                }
+                              }
+                            },
+                            _1: "This '%s' might be unmatched"
+                          }), opening),
+                  tl: /* [] */0
+                }, Curry._2(Stdlib__Printf.sprintf({
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* String_literal */11,
+                            _0: "Syntax error: '",
+                            _1: {
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
+                              _1: {
+                                TAG: /* String_literal */11,
+                                _0: "' expected, the highlighted '",
+                                _1: {
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
                                   _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: {
-                                      TAG: /* String_literal */11,
-                                      _0: "' expected, the highlighted '",
-                                      _1: {
-                                        TAG: /* String */2,
-                                        _0: /* No_padding */0,
-                                        _1: {
-                                          TAG: /* String_literal */11,
-                                          _0: "' might be unmatched",
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
+                                    TAG: /* String_literal */11,
+                                    _0: "' might be unmatched",
+                                    _1: /* End_of_format */0
                                   }
-                                },
-                                _1: "Syntax error: '%s' expected, the highlighted '%s' might be unmatched"
-                              }), closing, opening), {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Syntax error: '",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: "' expected",
-                              _1: /* End_of_format */0
+                                }
+                              }
                             }
-                          }
-                        },
-                        _1: "Syntax error: '%s' expected"
-                      }), closing);
+                          },
+                          _1: "Syntax error: '%s' expected, the highlighted '%s' might be unmatched"
+                        }), closing, opening), {
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Syntax error: '",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "' expected",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Syntax error: '%s' expected"
+                }), closing);
     case /* Expecting */1 :
         return Curry._1(errorf(loc._0, undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Syntax error: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: " expected.",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "Syntax error: %s expected."
-                      }), loc._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Syntax error: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " expected.",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Syntax error: %s expected."
+                }), loc._1);
     case /* Not_expecting */2 :
         return Curry._1(errorf(loc._0, undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Syntax error: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: " not expected.",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "Syntax error: %s not expected."
-                      }), loc._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Syntax error: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " not expected.",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Syntax error: %s not expected."
+                }), loc._1);
     case /* Applicative_path */3 :
         return errorf(loc._0, undefined, undefined, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "Syntax error: applicative paths of the form F(X).t are not supported when the option -no-app-func is set.",
-                      _1: /* End_of_format */0
-                    },
-                    _1: "Syntax error: applicative paths of the form F(X).t are not supported when the option -no-app-func is set."
-                  });
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "Syntax error: applicative paths of the form F(X).t are not supported when the option -no-app-func is set.",
+                _1: /* End_of_format */0
+              },
+              _1: "Syntax error: applicative paths of the form F(X).t are not supported when the option -no-app-func is set."
+            });
     case /* Variable_in_scope */4 :
         const $$var = loc._1;
         return Curry._2(errorf(loc._0, undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "In this scoped type, variable '",
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "In this scoped type, variable '",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " is reserved for the local type ",
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
                           _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: " is reserved for the local type ",
-                              _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* '.' */46,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Char_literal */12,
+                            _0: /* '.' */46,
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "In this scoped type, variable '%s is reserved for the local type %s."
-                      }), $$var, $$var);
+                        }
+                      }
+                    }
+                  },
+                  _1: "In this scoped type, variable '%s is reserved for the local type %s."
+                }), $$var, $$var);
     case /* Other */5 :
         return errorf(loc._0, undefined, undefined, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "Syntax error",
-                      _1: /* End_of_format */0
-                    },
-                    _1: "Syntax error"
-                  });
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "Syntax error",
+                _1: /* End_of_format */0
+              },
+              _1: "Syntax error"
+            });
     case /* Ill_formed_ast */6 :
         return Curry._1(errorf(loc._0, undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "broken invariant in parsetree: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "broken invariant in parsetree: %s"
-                      }), loc._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "broken invariant in parsetree: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "broken invariant in parsetree: %s"
+                }), loc._1);
     
   }
 }
@@ -15862,13 +15862,13 @@ register_error_of_exn(function (err) {
 
 function ill_formed_ast(loc, s) {
   throw new Caml_js_exceptions.MelangeError($$Error$3, {
-            MEL_EXN_ID: $$Error$3,
-            _1: {
-              TAG: /* Ill_formed_ast */6,
-              _0: loc,
-              _1: s
-            }
-          });
+        MEL_EXN_ID: $$Error$3,
+        _1: {
+          TAG: /* Ill_formed_ast */6,
+          _0: loc,
+          _1: s
+        }
+      });
 }
 
 function mktyp(d) {
@@ -15925,63 +15925,63 @@ function mkoption(d) {
     loc_ghost: true
   };
   return mk(loc, undefined, {
-              TAG: /* Ptyp_constr */3,
-              _0: {
-                txt: {
-                  TAG: /* Ldot */1,
-                  _0: {
-                    TAG: /* Lident */0,
-                    _0: "*predef*"
-                  },
-                  _1: "option"
-                },
-                loc: loc
-              },
-              _1: {
-                hd: d,
-                tl: /* [] */0
-              }
-            });
+        TAG: /* Ptyp_constr */3,
+        _0: {
+          txt: {
+            TAG: /* Ldot */1,
+            _0: {
+              TAG: /* Lident */0,
+              _0: "*predef*"
+            },
+            _1: "option"
+          },
+          loc: loc
+        },
+        _1: {
+          hd: d,
+          tl: /* [] */0
+        }
+      });
 }
 
 function reloc_pat(x) {
   return {
-          ppat_desc: x.ppat_desc,
-          ppat_loc: symbol_rloc(undefined),
-          ppat_attributes: x.ppat_attributes
-        };
+    ppat_desc: x.ppat_desc,
+    ppat_loc: symbol_rloc(undefined),
+    ppat_attributes: x.ppat_attributes
+  };
 }
 
 function reloc_exp(x) {
   return {
-          pexp_desc: x.pexp_desc,
-          pexp_loc: symbol_rloc(undefined),
-          pexp_attributes: x.pexp_attributes
-        };
+    pexp_desc: x.pexp_desc,
+    pexp_loc: symbol_rloc(undefined),
+    pexp_attributes: x.pexp_attributes
+  };
 }
 
 function mkoperator(name, pos) {
   const loc = rhs_loc(pos);
   return Curry._3(Ast_helper_Exp.mk, loc, undefined, {
-              TAG: /* Pexp_ident */0,
-              _0: {
-                txt: {
-                  TAG: /* Lident */0,
-                  _0: name
-                },
-                loc: loc
-              }
-            });
+        TAG: /* Pexp_ident */0,
+        _0: {
+          txt: {
+            TAG: /* Lident */0,
+            _0: name
+          },
+          loc: loc
+        }
+      });
 }
 
 function mkpatvar(name, pos) {
   return mk$1(rhs_loc(pos), undefined, {
-              TAG: /* Ppat_var */0,
-              _0: {
-                txt: name,
-                loc: rhs_loc(pos)
-              }
-            });
+        TAG: /* Ppat_var */0,
+        _0: {
+          txt: name,
+          loc: rhs_loc(pos)
+        }
+      });
 }
 
 function ghexp(d) {
@@ -15998,22 +15998,22 @@ function ghtyp(d) {
 
 function mkinfix(arg1, name, arg2) {
   return mkexp({
-              TAG: /* Pexp_apply */5,
-              _0: mkoperator(name, 2),
-              _1: {
-                hd: [
-                  "",
-                  arg1
-                ],
-                tl: {
-                  hd: [
-                    "",
-                    arg2
-                  ],
-                  tl: /* [] */0
-                }
-              }
-            });
+        TAG: /* Pexp_apply */5,
+        _0: mkoperator(name, 2),
+        _1: {
+          hd: [
+            "",
+            arg1
+          ],
+          tl: {
+            hd: [
+              "",
+              arg2
+            ],
+            tl: /* [] */0
+          }
+        }
+      });
 }
 
 function neg_float_string(f) {
@@ -16026,30 +16026,30 @@ function neg_float_string(f) {
 
 function mkexp_cons(consloc, args, loc) {
   return Curry._3(Ast_helper_Exp.mk, loc, undefined, {
-              TAG: /* Pexp_construct */9,
-              _0: {
-                txt: {
-                  TAG: /* Lident */0,
-                  _0: "::"
-                },
-                loc: consloc
-              },
-              _1: args
-            });
+        TAG: /* Pexp_construct */9,
+        _0: {
+          txt: {
+            TAG: /* Lident */0,
+            _0: "::"
+          },
+          loc: consloc
+        },
+        _1: args
+      });
 }
 
 function mkpat_cons(consloc, args, loc) {
   return mk$1(loc, undefined, {
-              TAG: /* Ppat_construct */5,
-              _0: {
-                txt: {
-                  TAG: /* Lident */0,
-                  _0: "::"
-                },
-                loc: consloc
-              },
-              _1: args
-            });
+        TAG: /* Ppat_construct */5,
+        _0: {
+          txt: {
+            TAG: /* Lident */0,
+            _0: "::"
+          },
+          loc: consloc
+        },
+        _1: args
+      });
 }
 
 function mktailexp(nilloc, param) {
@@ -16074,10 +16074,10 @@ function mktailexp(nilloc, param) {
           }
         });
     return mkexp_cons({
-                loc_start: loc_loc_start,
-                loc_end: loc_loc_end,
-                loc_ghost: true
-              }, arg, loc);
+          loc_start: loc_loc_start,
+          loc_end: loc_loc_end,
+          loc_ghost: true
+        }, arg, loc);
   }
   const loc_loc_start$1 = nilloc.loc_start;
   const loc_loc_end$1 = nilloc.loc_end;
@@ -16095,10 +16095,10 @@ function mktailexp(nilloc, param) {
     loc: loc$1
   };
   return Curry._3(Ast_helper_Exp.mk, loc$1, undefined, {
-              TAG: /* Pexp_construct */9,
-              _0: nil,
-              _1: undefined
-            });
+        TAG: /* Pexp_construct */9,
+        _0: nil,
+        _1: undefined
+      });
 }
 
 function mktailpat(nilloc, param) {
@@ -16123,10 +16123,10 @@ function mktailpat(nilloc, param) {
           }
         });
     return mkpat_cons({
-                loc_start: loc_loc_start,
-                loc_end: loc_loc_end,
-                loc_ghost: true
-              }, arg, loc);
+          loc_start: loc_loc_start,
+          loc_end: loc_loc_end,
+          loc_ghost: true
+        }, arg, loc);
   }
   const loc_loc_start$1 = nilloc.loc_start;
   const loc_loc_end$1 = nilloc.loc_end;
@@ -16144,21 +16144,21 @@ function mktailpat(nilloc, param) {
     loc: loc$1
   };
   return mk$1(loc$1, undefined, {
-              TAG: /* Ppat_construct */5,
-              _0: nil,
-              _1: undefined
-            });
+        TAG: /* Ppat_construct */5,
+        _0: nil,
+        _1: undefined
+      });
 }
 
 function mkstrexp(e, attrs) {
   return {
-          pstr_desc: {
-            TAG: /* Pstr_eval */0,
-            _0: e,
-            _1: attrs
-          },
-          pstr_loc: e.pexp_loc
-        };
+    pstr_desc: {
+      TAG: /* Pstr_eval */0,
+      _0: e,
+      _1: attrs
+    },
+    pstr_loc: e.pexp_loc
+  };
 }
 
 function mkexp_constraint(e, param) {
@@ -16167,102 +16167,102 @@ function mkexp_constraint(e, param) {
   if (t1 !== undefined) {
     if (t2 !== undefined) {
       return ghexp({
-                  TAG: /* Pexp_coerce */20,
-                  _0: e,
-                  _1: t1,
-                  _2: t2
-                });
+            TAG: /* Pexp_coerce */20,
+            _0: e,
+            _1: t1,
+            _2: t2
+          });
     } else {
       return ghexp({
-                  TAG: /* Pexp_constraint */19,
-                  _0: e,
-                  _1: t1
-                });
+            TAG: /* Pexp_constraint */19,
+            _0: e,
+            _1: t1
+          });
     }
   }
   if (t2 !== undefined) {
     return ghexp({
-                TAG: /* Pexp_coerce */20,
-                _0: e,
-                _1: t1,
-                _2: t2
-              });
+          TAG: /* Pexp_coerce */20,
+          _0: e,
+          _1: t1,
+          _2: t2
+        });
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              12327,
-              18
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          12327,
+          18
+        ]
+      });
 }
 
 function array_function(str, name) {
   return {
-          txt: {
-            TAG: /* Ldot */1,
-            _0: {
-              TAG: /* Lident */0,
-              _0: str
-            },
-            _1: fast.contents ? "unsafe_" + name : name
-          },
-          loc: symbol_gloc(undefined)
-        };
+    txt: {
+      TAG: /* Ldot */1,
+      _0: {
+        TAG: /* Lident */0,
+        _0: str
+      },
+      _1: fast.contents ? "unsafe_" + name : name
+    },
+    loc: symbol_gloc(undefined)
+  };
 }
 
 function unclosed(opening_name, opening_num, closing_name, closing_num) {
   throw new Caml_js_exceptions.MelangeError($$Error$3, {
-            MEL_EXN_ID: $$Error$3,
-            _1: {
-              TAG: /* Unclosed */0,
-              _0: rhs_loc(opening_num),
-              _1: opening_name,
-              _2: rhs_loc(closing_num),
-              _3: closing_name
-            }
-          });
+        MEL_EXN_ID: $$Error$3,
+        _1: {
+          TAG: /* Unclosed */0,
+          _0: rhs_loc(opening_num),
+          _1: opening_name,
+          _2: rhs_loc(closing_num),
+          _3: closing_name
+        }
+      });
 }
 
 function expecting(pos, nonterm) {
   throw new Caml_js_exceptions.MelangeError($$Error$3, {
-            MEL_EXN_ID: $$Error$3,
-            _1: {
-              TAG: /* Expecting */1,
-              _0: rhs_loc(pos),
-              _1: nonterm
-            }
-          });
+        MEL_EXN_ID: $$Error$3,
+        _1: {
+          TAG: /* Expecting */1,
+          _0: rhs_loc(pos),
+          _1: nonterm
+        }
+      });
 }
 
 function not_expecting(pos, nonterm) {
   throw new Caml_js_exceptions.MelangeError($$Error$3, {
-            MEL_EXN_ID: $$Error$3,
-            _1: {
-              TAG: /* Not_expecting */2,
-              _0: rhs_loc(pos),
-              _1: nonterm
-            }
-          });
+        MEL_EXN_ID: $$Error$3,
+        _1: {
+          TAG: /* Not_expecting */2,
+          _0: rhs_loc(pos),
+          _1: nonterm
+        }
+      });
 }
 
 function bigarray_function(str, name) {
   return {
-          txt: {
-            TAG: /* Ldot */1,
-            _0: {
-              TAG: /* Ldot */1,
-              _0: {
-                TAG: /* Lident */0,
-                _0: "Bigarray"
-              },
-              _1: str
-            },
-            _1: name
-          },
-          loc: symbol_gloc(undefined)
-        };
+    txt: {
+      TAG: /* Ldot */1,
+      _0: {
+        TAG: /* Ldot */1,
+        _0: {
+          TAG: /* Lident */0,
+          _0: "Bigarray"
+        },
+        _1: str
+      },
+      _1: name
+    },
+    loc: symbol_gloc(undefined)
+  };
 }
 
 function bigarray_untuplify(exp) {
@@ -16271,9 +16271,9 @@ function bigarray_untuplify(exp) {
     return explist._0;
   } else {
     return {
-            hd: exp,
-            tl: /* [] */0
-          };
+      hd: exp,
+      tl: /* [] */0
+    };
   }
 }
 
@@ -16283,23 +16283,23 @@ function exp_of_label(lbl, pos) {
     _0: last$1(lbl)
   };
   return mkexp({
-              TAG: /* Pexp_ident */0,
-              _0: {
-                txt: rhs,
-                loc: rhs_loc(pos)
-              }
-            });
+        TAG: /* Pexp_ident */0,
+        _0: {
+          txt: rhs,
+          loc: rhs_loc(pos)
+        }
+      });
 }
 
 function pat_of_label(lbl, pos) {
   const rhs = last$1(lbl);
   return mkpat({
-              TAG: /* Ppat_var */0,
-              _0: {
-                txt: rhs,
-                loc: rhs_loc(pos)
-              }
-            });
+        TAG: /* Ppat_var */0,
+        _0: {
+          txt: rhs,
+          loc: rhs_loc(pos)
+        }
+      });
 }
 
 function check_variable(vl, loc, v) {
@@ -16307,13 +16307,13 @@ function check_variable(vl, loc, v) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError($$Error$3, {
-            MEL_EXN_ID: $$Error$3,
-            _1: {
-              TAG: /* Variable_in_scope */4,
-              _0: loc,
-              _1: v
-            }
-          });
+        MEL_EXN_ID: $$Error$3,
+        _1: {
+          TAG: /* Variable_in_scope */4,
+          _0: loc,
+          _1: v
+        }
+      });
 }
 
 function varify_constructors(var_names, t) {
@@ -16385,10 +16385,10 @@ function varify_constructors(var_names, t) {
               TAG: /* Ptyp_object */4,
               _0: Stdlib__List.map((function (param) {
                       return [
-                              param[0],
-                              param[1],
-                              loop(param[2])
-                            ];
+                        param[0],
+                        param[1],
+                        loop(param[2])
+                      ];
                     }), x._0),
               _1: x._1
             };
@@ -16437,9 +16437,9 @@ function varify_constructors(var_names, t) {
                 match[0],
                 Stdlib__List.map((function (param) {
                         return [
-                                param[0],
-                                loop(param[1])
-                              ];
+                          param[0],
+                          loop(param[1])
+                        ];
                       }), match[1])
               ]
             };
@@ -16458,25 +16458,25 @@ function varify_constructors(var_names, t) {
       }
     }
     return {
-            ptyp_desc: desc,
-            ptyp_loc: t.ptyp_loc,
-            ptyp_attributes: t.ptyp_attributes
-          };
+      ptyp_desc: desc,
+      ptyp_loc: t.ptyp_loc,
+      ptyp_attributes: t.ptyp_attributes
+    };
   };
   const loop_row_field = function (t) {
     if (t.TAG === /* Rtag */0) {
       return {
-              TAG: /* Rtag */0,
-              _0: t._0,
-              _1: t._1,
-              _2: t._2,
-              _3: Stdlib__List.map(loop, t._3)
-            };
+        TAG: /* Rtag */0,
+        _0: t._0,
+        _1: t._1,
+        _2: t._2,
+        _3: Stdlib__List.map(loop, t._3)
+      };
     } else {
       return {
-              TAG: /* Rinherit */1,
-              _0: loop(t._0)
-            };
+        TAG: /* Rinherit */1,
+        _0: loop(t._0)
+      };
     }
   };
   return loop(t);
@@ -16490,19 +16490,19 @@ function wrap_type_annotation(newtypes, core_type, body) {
       });
   const exp$1 = Stdlib__List.fold_right((function (newtype, exp) {
           return mkexp({
-                      TAG: /* Pexp_newtype */30,
-                      _0: newtype,
-                      _1: exp
-                    });
+                TAG: /* Pexp_newtype */30,
+                _0: newtype,
+                _1: exp
+              });
         }), newtypes, exp);
   return [
-          exp$1,
-          ghtyp({
-                TAG: /* Ptyp_poly */8,
-                _0: newtypes,
-                _1: varify_constructors(newtypes, core_type)
-              })
-        ];
+    exp$1,
+    ghtyp({
+          TAG: /* Ptyp_poly */8,
+          _0: newtypes,
+          _1: varify_constructors(newtypes, core_type)
+        })
+  ];
 }
 
 function wrap_exp_attrs(body, param) {
@@ -16517,18 +16517,18 @@ function wrap_exp_attrs(body, param) {
   };
   if (ext !== undefined) {
     return ghexp({
-                TAG: /* Pexp_extension */33,
-                _0: [
-                  ext,
-                  {
-                    TAG: /* PStr */0,
-                    _0: {
-                      hd: mkstrexp(body$1, /* [] */0),
-                      tl: /* [] */0
-                    }
-                  }
-                ]
-              });
+          TAG: /* Pexp_extension */33,
+          _0: [
+            ext,
+            {
+              TAG: /* PStr */0,
+              _0: {
+                hd: mkstrexp(body$1, /* [] */0),
+                tl: /* [] */0
+              }
+            }
+          ]
+        });
   } else {
     return body$1;
   }
@@ -16536,12 +16536,12 @@ function wrap_exp_attrs(body, param) {
 
 function text_def(pos) {
   return {
-          hd: {
-            TAG: /* Ptop_def */0,
-            _0: text$1(get_text(Stdlib__Parsing.rhs_start_pos(pos)))
-          },
-          tl: /* [] */0
-        };
+    hd: {
+      TAG: /* Ptop_def */0,
+      _0: text$1(get_text(Stdlib__Parsing.rhs_start_pos(pos)))
+    },
+    tl: /* [] */0
+  };
 }
 
 function extra_text(text, pos, items) {
@@ -16568,26 +16568,26 @@ function add_nonrec(rf, attrs, pos) {
     loc: name_loc
   };
   return {
-          hd: [
-            name,
-            {
-              TAG: /* PStr */0,
-              _0: /* [] */0
-            }
-          ],
-          tl: attrs
-        };
+    hd: [
+      name,
+      {
+        TAG: /* PStr */0,
+        _0: /* [] */0
+      }
+    ],
+    tl: attrs
+  };
 }
 
 function mklb(param, attrs) {
   return {
-          lb_pattern: param[0],
-          lb_expression: param[1],
-          lb_attributes: attrs,
-          lb_docs: symbol_docs_lazy(undefined),
-          lb_text: symbol_text_lazy(undefined),
-          lb_loc: symbol_rloc(undefined)
-        };
+    lb_pattern: param[0],
+    lb_expression: param[1],
+    lb_attributes: attrs,
+    lb_docs: symbol_docs_lazy(undefined),
+    lb_text: symbol_text_lazy(undefined),
+    lb_loc: symbol_rloc(undefined)
+  };
 }
 
 const yytransl_const = [
@@ -16722,9 +16722,9 @@ const yytransl_block = [
 const yyact = [
   (function (param) {
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: "parser"
-              });
+            MEL_EXN_ID: "Failure",
+            _1: "parser"
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -16737,25 +16737,25 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return {
-              TAG: /* Ptop_def */0,
-              _0: extra_text(text$1, 1, _1)
-            };
+        TAG: /* Ptop_def */0,
+        _0: extra_text(text$1, 1, _1)
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib.End_of_file, {
-                MEL_EXN_ID: Stdlib.End_of_file
-              });
+            MEL_EXN_ID: Stdlib.End_of_file
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text$1(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: mkstrexp(_1, _2),
-                  tl: /* [] */0
-                });
+            hd: mkstrexp(_1, _2),
+            tl: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -16767,22 +16767,22 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text$1(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: _1,
-                  tl: _2
-                });
+            hd: _1,
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       let pos = 1;
       return extra_text((function (txt) {
-                    return {
-                            hd: {
-                              TAG: /* Ptop_def */0,
-                              _0: text$1(txt)
-                            },
-                            tl: /* [] */0
-                          };
-                  }), pos, _1);
+              return {
+                hd: {
+                  TAG: /* Ptop_def */0,
+                  _0: text$1(txt)
+                },
+                tl: /* [] */0
+              };
+            }), pos, _1);
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -16792,15 +16792,15 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text_def(1), {
-                  hd: {
-                    TAG: /* Ptop_def */0,
-                    _0: {
-                      hd: mkstrexp(_1, _2),
-                      tl: /* [] */0
-                    }
-                  },
-                  tl: _3
-                });
+            hd: {
+              TAG: /* Ptop_def */0,
+              _0: {
+                hd: mkstrexp(_1, _2),
+                tl: /* [] */0
+              }
+            },
+            tl: _3
+          });
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -16814,61 +16814,61 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_rhs_docs(2, 3);
       return Stdlib.$at(text_def(1), Stdlib.$at(text_def(2), {
-                      hd: {
-                        TAG: /* Ptop_def */0,
-                        _0: {
-                          hd: mkstrexp(_2, _3),
-                          tl: /* [] */0
-                        }
-                      },
-                      tl: _4
-                    }));
+                hd: {
+                  TAG: /* Ptop_def */0,
+                  _0: {
+                    hd: mkstrexp(_2, _3),
+                    tl: /* [] */0
+                  }
+                },
+                tl: _4
+              }));
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text_def(1), Stdlib.$at(text_def(2), {
-                      hd: {
-                        TAG: /* Ptop_def */0,
-                        _0: {
-                          hd: _2,
-                          tl: /* [] */0
-                        }
-                      },
-                      tl: _3
-                    }));
+                hd: {
+                  TAG: /* Ptop_def */0,
+                  _0: {
+                    hd: _2,
+                    tl: /* [] */0
+                  }
+                },
+                tl: _3
+              }));
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_rhs_docs(2, 3);
       return Stdlib.$at(text_def(1), Stdlib.$at(text_def(2), {
-                      hd: _2,
-                      tl: _3
-                    }));
+                hd: _2,
+                tl: _3
+              }));
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text_def(1), {
-                  hd: {
-                    TAG: /* Ptop_def */0,
-                    _0: {
-                      hd: _1,
-                      tl: /* [] */0
-                    }
-                  },
-                  tl: _2
-                });
+            hd: {
+              TAG: /* Ptop_def */0,
+              _0: {
+                hd: _1,
+                tl: /* [] */0
+              }
+            },
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_rhs_docs(1, 1);
       return Stdlib.$at(text_def(1), {
-                  hd: _1,
-                  tl: _2
-                });
+            hd: _1,
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -16881,23 +16881,23 @@ const yyact = [
     }),
   (function (__caml_parser_env) {
       return [
-              {
-                txt: "*",
-                loc: rhs_loc(2)
-              },
-              undefined
-            ];
+        {
+          txt: "*",
+          loc: rhs_loc(2)
+        },
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              {
-                txt: _2,
-                loc: rhs_loc(2)
-              },
-              _4
-            ];
+        {
+          txt: _2,
+          loc: rhs_loc(2)
+        },
+        _4
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -16909,33 +16909,33 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmod({
-                  TAG: /* Pmod_ident */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Pmod_ident */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_structure */1,
-                  _0: extra_text(text$1, 2, _2)
-                });
+            TAG: /* Pmod_structure */1,
+            _0: extra_text(text$1, 2, _2)
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -16945,33 +16945,33 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib__List.fold_left((function (acc, param) {
-                    return mkmod({
-                                TAG: /* Pmod_functor */2,
-                                _0: param[0],
-                                _1: param[1],
-                                _2: acc
-                              });
-                  }), _4, _2);
+              return mkmod({
+                    TAG: /* Pmod_functor */2,
+                    _0: param[0],
+                    _1: param[1],
+                    _2: acc
+                  });
+            }), _4, _2);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_apply */3,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Pmod_apply */3,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       return mkmod({
-                  TAG: /* Pmod_apply */3,
-                  _0: _1,
-                  _1: mkmod({
-                        TAG: /* Pmod_structure */1,
-                        _0: /* [] */0
-                      })
-                });
+            TAG: /* Pmod_apply */3,
+            _0: _1,
+            _1: mkmod({
+                  TAG: /* Pmod_structure */1,
+                  _0: /* [] */0
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -16982,10 +16982,10 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_constraint */4,
-                  _0: _2,
-                  _1: _4
-                });
+            TAG: /* Pmod_constraint */4,
+            _0: _2,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -17002,60 +17002,60 @@ const yyact = [
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_unpack */5,
-                  _0: _3
-                });
+            TAG: /* Pmod_unpack */5,
+            _0: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_unpack */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_constraint */19,
-                        _0: _3,
-                        _1: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _5
-                            })
+            TAG: /* Pmod_unpack */5,
+            _0: ghexp({
+                  TAG: /* Pexp_constraint */19,
+                  _0: _3,
+                  _1: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _5
                       })
-                });
+                })
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_unpack */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_coerce */20,
-                        _0: _3,
-                        _1: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _5
-                            }),
-                        _2: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _7
-                            })
+            TAG: /* Pmod_unpack */5,
+            _0: ghexp({
+                  TAG: /* Pexp_coerce */20,
+                  _0: _3,
+                  _1: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _5
+                      }),
+                  _2: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _7
                       })
-                });
+                })
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_unpack */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_coerce */20,
-                        _0: _3,
-                        _1: undefined,
-                        _2: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _5
-                            })
+            TAG: /* Pmod_unpack */5,
+            _0: ghexp({
+                  TAG: /* Pexp_coerce */20,
+                  _0: _3,
+                  _1: undefined,
+                  _2: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _5
                       })
-                });
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -17077,9 +17077,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmod({
-                  TAG: /* Pmod_extension */6,
-                  _0: _1
-                });
+            TAG: /* Pmod_extension */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -17087,9 +17087,9 @@ const yyact = [
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_rhs_docs(1, 2);
       return Stdlib.$at(text$1(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: mkstrexp(_1, _2),
-                  tl: _3
-                });
+            hd: mkstrexp(_1, _2),
+            tl: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -17105,9 +17105,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text$1(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: _1,
-                  tl: _2
-                });
+            hd: _1,
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       let lbs = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -17136,13 +17136,13 @@ const yyact = [
       if (exit === 1) {
         if (Caml_obj.caml_notequal(lbs.lbs_attributes, /* [] */0)) {
           throw new Caml_js_exceptions.MelangeError($$Error$3, {
-                    MEL_EXN_ID: $$Error$3,
-                    _1: {
-                      TAG: /* Not_expecting */2,
-                      _0: lbs.lbs_loc,
-                      _1: "attributes"
-                    }
-                  });
+                MEL_EXN_ID: $$Error$3,
+                _1: {
+                  TAG: /* Not_expecting */2,
+                  _0: lbs.lbs_loc,
+                  _1: "attributes"
+                }
+              });
         }
         const bindings$1 = Stdlib__List.map((function (lb) {
                 return mk$17(lb.lb_loc, lb.lb_attributes, CamlinternalLazy.force(lb.lb_docs), CamlinternalLazy.force(lb.lb_text), lb.lb_pattern, lb.lb_expression);
@@ -17177,96 +17177,96 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_primitive */2,
-                  _0: _1
-                });
+            TAG: /* Pstr_primitive */2,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_type */3,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pstr_type */3,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_typext */4,
-                  _0: _1
-                });
+            TAG: /* Pstr_typext */4,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_exception */5,
-                  _0: _1
-                });
+            TAG: /* Pstr_exception */5,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_module */6,
-                  _0: _1
-                });
+            TAG: /* Pstr_module */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_recmodule */7,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pstr_recmodule */7,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_modtype */8,
-                  _0: _1
-                });
+            TAG: /* Pstr_modtype */8,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_open */9,
-                  _0: _1
-                });
+            TAG: /* Pstr_open */9,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_class */10,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pstr_class */10,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_class_type */11,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pstr_class_type */11,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_include */12,
-                  _0: _1
-                });
+            TAG: /* Pstr_include */12,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_extension */14,
-                  _0: _1,
-                  _1: add_docs_attrs(symbol_docs(undefined), _2)
-                });
+            TAG: /* Pstr_extension */14,
+            _0: _1,
+            _1: add_docs_attrs(symbol_docs(undefined), _2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_symbol_docs(undefined);
       return mkstr({
-                  TAG: /* Pstr_attribute */13,
-                  _0: _1
-                });
+            TAG: /* Pstr_attribute */13,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -17280,79 +17280,79 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmod({
-                  TAG: /* Pmod_constraint */4,
-                  _0: _4,
-                  _1: _2
-                });
+            TAG: /* Pmod_constraint */4,
+            _0: _4,
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmod({
-                  TAG: /* Pmod_functor */2,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _2
-                });
+            TAG: /* Pmod_functor */2,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$14(symbol_rloc(undefined), _4, symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _3);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _3);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$14(symbol_rloc(undefined), _5, symbol_docs(undefined), undefined, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                }, _4);
+            txt: _3,
+            loc: rhs_loc(3)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$14(symbol_rloc(undefined), _4, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _3);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _3);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_ident */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Pmty_ident */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmty({
-                  TAG: /* Pmty_signature */1,
-                  _0: extra_text(text, 2, _2)
-                });
+            TAG: /* Pmty_signature */1,
+            _0: extra_text(text, 2, _2)
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -17362,29 +17362,29 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib__List.fold_left((function (acc, param) {
-                    return mkmty({
-                                TAG: /* Pmty_functor */2,
-                                _0: param[0],
-                                _1: param[1],
-                                _2: acc
-                              });
-                  }), _4, _2);
+              return mkmty({
+                    TAG: /* Pmty_functor */2,
+                    _0: param[0],
+                    _1: param[1],
+                    _2: acc
+                  });
+            }), _4, _2);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_with */3,
-                  _0: _1,
-                  _1: Stdlib__List.rev(_3)
-                });
+            TAG: /* Pmty_with */3,
+            _0: _1,
+            _1: Stdlib__List.rev(_3)
+          });
     }),
   (function (__caml_parser_env) {
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_typeof */4,
-                  _0: _4
-                });
+            TAG: /* Pmty_typeof */4,
+            _0: _4
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -17396,9 +17396,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_extension */5,
-                  _0: _1
-                });
+            TAG: /* Pmty_extension */5,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -17416,126 +17416,126 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: _1,
-                  tl: _2
-                });
+            hd: _1,
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_value */0,
-                  _0: _1
-                });
+            TAG: /* Psig_value */0,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_value */0,
-                  _0: _1
-                });
+            TAG: /* Psig_value */0,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_type */1,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Psig_type */1,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_typext */2,
-                  _0: _1
-                });
+            TAG: /* Psig_typext */2,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_exception */3,
-                  _0: _1
-                });
+            TAG: /* Psig_exception */3,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_module */4,
-                  _0: _1
-                });
+            TAG: /* Psig_module */4,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_module */4,
-                  _0: _1
-                });
+            TAG: /* Psig_module */4,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_recmodule */5,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Psig_recmodule */5,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_modtype */6,
-                  _0: _1
-                });
+            TAG: /* Psig_modtype */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_open */7,
-                  _0: _1
-                });
+            TAG: /* Psig_open */7,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_include */8,
-                  _0: _1
-                });
+            TAG: /* Psig_include */8,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_class */9,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Psig_class */9,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_class_type */10,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Psig_class_type */10,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_extension */12,
-                  _0: _1,
-                  _1: add_docs_attrs(symbol_docs(undefined), _2)
-                });
+            TAG: /* Psig_extension */12,
+            _0: _1,
+            _1: add_docs_attrs(symbol_docs(undefined), _2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_symbol_docs(undefined);
       return mksig({
-                  TAG: /* Psig_attribute */11,
-                  _0: _1
-                });
+            TAG: /* Psig_attribute */11,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$15(symbol_rloc(undefined), _4, symbol_docs(undefined), _2, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                });
+            txt: _3,
+            loc: rhs_loc(3)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -17550,80 +17550,80 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_functor */2,
-                  _0: {
-                    txt: _2,
-                    loc: rhs_loc(2)
-                  },
-                  _1: _4,
-                  _2: _6
-                });
+            TAG: /* Pmty_functor */2,
+            _0: {
+              txt: _2,
+              loc: rhs_loc(2)
+            },
+            _1: _4,
+            _2: _6
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_functor */2,
-                  _0: {
-                    txt: "*",
-                    loc: rhs_loc(1)
-                  },
-                  _1: undefined,
-                  _2: _3
-                });
+            TAG: /* Pmty_functor */2,
+            _0: {
+              txt: "*",
+              loc: rhs_loc(1)
+            },
+            _1: undefined,
+            _2: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$12(symbol_rloc(undefined), _4, symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _3);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _3);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$12(symbol_rloc(undefined), _5, symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, alias$2(rhs_loc(4), undefined, {
-                      txt: _4,
-                      loc: rhs_loc(4)
-                    }));
+            txt: _2,
+            loc: rhs_loc(2)
+          }, alias$2(rhs_loc(4), undefined, {
+                txt: _4,
+                loc: rhs_loc(4)
+              }));
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$12(symbol_rloc(undefined), _6, symbol_docs(undefined), undefined, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                }, _5);
+            txt: _3,
+            loc: rhs_loc(3)
+          }, _5);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$12(symbol_rloc(undefined), _5, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       
@@ -17636,24 +17636,24 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$13(symbol_rloc(undefined), _5, symbol_docs(undefined), undefined, _4, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                });
+            txt: _3,
+            loc: rhs_loc(3)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -17662,9 +17662,9 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _6, symbol_docs(undefined), undefined, _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _5);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _5);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -17673,9 +17673,9 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _6, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _5);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _5);
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -17684,21 +17684,21 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_constraint */5,
-                  _0: _4,
-                  _1: _2
-                });
+            TAG: /* Pcl_constraint */5,
+            _0: _4,
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_fun */2,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _2
-                });
+            TAG: /* Pcl_fun */2,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _2
+          });
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -17710,23 +17710,23 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_fun */2,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _3
-                });
+            TAG: /* Pcl_fun */2,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_fun */2,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _2
-                });
+            TAG: /* Pcl_fun */2,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _2
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -17738,10 +17738,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_apply */3,
-                  _0: _1,
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pcl_apply */3,
+            _0: _1,
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -17749,42 +17749,42 @@ const yyact = [
       const bindings = Stdlib__List.map((function (lb) {
               if (Caml_obj.caml_notequal(lb.lb_attributes, /* [] */0)) {
                 throw new Caml_js_exceptions.MelangeError($$Error$3, {
-                          MEL_EXN_ID: $$Error$3,
-                          _1: {
-                            TAG: /* Not_expecting */2,
-                            _0: lb.lb_loc,
-                            _1: "item attribute"
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$3,
+                      _1: {
+                        TAG: /* Not_expecting */2,
+                        _0: lb.lb_loc,
+                        _1: "item attribute"
+                      }
+                    });
               }
               return mk$17(lb.lb_loc, undefined, undefined, undefined, lb.lb_pattern, lb.lb_expression);
             }), _1.lbs_bindings);
       if (_1.lbs_extension !== undefined) {
         throw new Caml_js_exceptions.MelangeError($$Error$3, {
-                  MEL_EXN_ID: $$Error$3,
-                  _1: {
-                    TAG: /* Not_expecting */2,
-                    _0: _1.lbs_loc,
-                    _1: "extension"
-                  }
-                });
+              MEL_EXN_ID: $$Error$3,
+              _1: {
+                TAG: /* Not_expecting */2,
+                _0: _1.lbs_loc,
+                _1: "extension"
+              }
+            });
       }
       if (Caml_obj.caml_notequal(_1.lbs_attributes, /* [] */0)) {
         throw new Caml_js_exceptions.MelangeError($$Error$3, {
-                  MEL_EXN_ID: $$Error$3,
-                  _1: {
-                    TAG: /* Not_expecting */2,
-                    _0: _1.lbs_loc,
-                    _1: "attributes"
-                  }
-                });
+              MEL_EXN_ID: $$Error$3,
+              _1: {
+                TAG: /* Not_expecting */2,
+                _0: _1.lbs_loc,
+                _1: "attributes"
+              }
+            });
       }
       return mkclass({
-                  TAG: /* Pcl_let */4,
-                  _0: _1.lbs_rec,
-                  _1: Stdlib__List.rev(bindings),
-                  _2: _3
-                });
+            TAG: /* Pcl_let */4,
+            _0: _1.lbs_rec,
+            _1: Stdlib__List.rev(bindings),
+            _2: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -17794,39 +17794,39 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_extension */6,
-                  _0: _1
-                });
+            TAG: /* Pcl_extension */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_constr */0,
-                  _0: {
-                    txt: _4,
-                    loc: rhs_loc(4)
-                  },
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pcl_constr */0,
+            _0: {
+              txt: _4,
+              loc: rhs_loc(4)
+            },
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_constr */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: /* [] */0
-                });
+            TAG: /* Pcl_constr */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkclass({
-                  TAG: /* Pcl_structure */1,
-                  _0: _2
-                });
+            TAG: /* Pcl_structure */1,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -17836,10 +17836,10 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkclass({
-                  TAG: /* Pcl_constraint */5,
-                  _0: _2,
-                  _1: _4
-                });
+            TAG: /* Pcl_constraint */5,
+            _0: _2,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -17857,9 +17857,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              pcstr_self: _1,
-              pcstr_fields: extra_cstr(2, Stdlib__List.rev(_2))
-            };
+        pcstr_self: _1,
+        pcstr_fields: extra_cstr(2, Stdlib__List.rev(_2))
+      };
     }),
   (function (__caml_parser_env) {
       return reloc_pat(Stdlib__Parsing.peek_val(__caml_parser_env, 1));
@@ -17868,10 +17868,10 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_constraint */10,
-                  _0: _2,
-                  _1: _4
-                });
+            TAG: /* Ppat_constraint */10,
+            _0: _2,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       return ghpat(/* Ppat_any */0);
@@ -17883,9 +17883,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at({
-                  hd: _2,
-                  tl: Curry._1(Ast_helper_Cf.text, get_text(Stdlib__Parsing.rhs_start_pos(2)))
-                }, _1);
+            hd: _2,
+            tl: Curry._1(Ast_helper_Cf.text, get_text(Stdlib__Parsing.rhs_start_pos(2)))
+          }, _1);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -17893,59 +17893,59 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_5, symbol_docs(undefined), {
-                  TAG: /* Pcf_inherit */0,
-                  _0: _2,
-                  _1: _3,
-                  _2: _4
-                });
+            TAG: /* Pcf_inherit */0,
+            _0: _2,
+            _1: _3,
+            _2: _4
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_3, symbol_docs(undefined), {
-                  TAG: /* Pcf_val */1,
-                  _0: _2
-                });
+            TAG: /* Pcf_val */1,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_3, symbol_docs(undefined), {
-                  TAG: /* Pcf_method */2,
-                  _0: _2
-                });
+            TAG: /* Pcf_method */2,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_3, symbol_docs(undefined), {
-                  TAG: /* Pcf_constraint */3,
-                  _0: _2
-                });
+            TAG: /* Pcf_constraint */3,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_3, symbol_docs(undefined), {
-                  TAG: /* Pcf_initializer */4,
-                  _0: _2
-                });
+            TAG: /* Pcf_initializer */4,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_2, symbol_docs(undefined), {
-                  TAG: /* Pcf_extension */6,
-                  _0: _1
-                });
+            TAG: /* Pcf_extension */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_symbol_docs(undefined);
       return mkcf(undefined, undefined, {
-                  TAG: /* Pcf_attribute */5,
-                  _0: _1
-                });
+            TAG: /* Pcf_attribute */5,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -17959,36 +17959,36 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       if (_1 === /* Override */0) {
         throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                  MEL_EXN_ID: Escape_error
-                });
+              MEL_EXN_ID: Escape_error
+            });
       }
       return [
-              {
-                txt: _4,
-                loc: rhs_loc(4)
-              },
-              /* Mutable */1,
-              {
-                TAG: /* Cfk_virtual */0,
-                _0: _6
-              }
-            ];
+        {
+          txt: _4,
+          loc: rhs_loc(4)
+        },
+        /* Mutable */1,
+        {
+          TAG: /* Cfk_virtual */0,
+          _0: _6
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_virtual */0,
-                _0: _5
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_virtual */0,
+          _0: _5
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -17996,17 +17996,17 @@ const yyact = [
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: _5
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: _5
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -18016,17 +18016,17 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       const e = mkexp_constraint(_6, _4);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: e
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: e
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -18034,20 +18034,20 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       if (_1 === /* Override */0) {
         throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                  MEL_EXN_ID: Escape_error
-                });
+              MEL_EXN_ID: Escape_error
+            });
       }
       return [
-              {
-                txt: _4,
-                loc: rhs_loc(4)
-              },
-              /* Private */0,
-              {
-                TAG: /* Cfk_virtual */0,
-                _0: _6
-              }
-            ];
+        {
+          txt: _4,
+          loc: rhs_loc(4)
+        },
+        /* Private */0,
+        {
+          TAG: /* Cfk_virtual */0,
+          _0: _6
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -18056,20 +18056,20 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       if (_1 === /* Override */0) {
         throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                  MEL_EXN_ID: Escape_error
-                });
+              MEL_EXN_ID: Escape_error
+            });
       }
       return [
-              {
-                txt: _4,
-                loc: rhs_loc(4)
-              },
-              _3,
-              {
-                TAG: /* Cfk_virtual */0,
-                _0: _6
-              }
-            ];
+        {
+          txt: _4,
+          loc: rhs_loc(4)
+        },
+        _3,
+        {
+          TAG: /* Cfk_virtual */0,
+          _0: _6
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -18077,21 +18077,21 @@ const yyact = [
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: ghexp({
-                      TAG: /* Pexp_poly */28,
-                      _0: _4,
-                      _1: undefined
-                    })
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: ghexp({
+                TAG: /* Pexp_poly */28,
+                _0: _4,
+                _1: undefined
+              })
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -18100,21 +18100,21 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: ghexp({
-                      TAG: /* Pexp_poly */28,
-                      _0: _7,
-                      _1: _5
-                    })
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: ghexp({
+                TAG: /* Pexp_poly */28,
+                _0: _7,
+                _1: _5
+              })
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 9);
@@ -18125,21 +18125,21 @@ const yyact = [
       const _10 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       const match = wrap_type_annotation(_6, _8, _10);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: ghexp({
-                      TAG: /* Pexp_poly */28,
-                      _0: match[0],
-                      _1: match[1]
-                    })
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: ghexp({
+                TAG: /* Pexp_poly */28,
+                _0: match[0],
+                _1: match[1]
+              })
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -18149,73 +18149,73 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_arrow */2,
-                  _0: "?" + _2,
-                  _1: mkoption(_4),
-                  _2: _6
-                });
+            TAG: /* Pcty_arrow */2,
+            _0: "?" + _2,
+            _1: mkoption(_4),
+            _2: _6
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_arrow */2,
-                  _0: "?" + _1,
-                  _1: mkoption(_2),
-                  _2: _4
-                });
+            TAG: /* Pcty_arrow */2,
+            _0: "?" + _1,
+            _1: mkoption(_2),
+            _2: _4
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_arrow */2,
-                  _0: _1,
-                  _1: _3,
-                  _2: _5
-                });
+            TAG: /* Pcty_arrow */2,
+            _0: _1,
+            _1: _3,
+            _2: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_arrow */2,
-                  _0: "",
-                  _1: _1,
-                  _2: _3
-                });
+            TAG: /* Pcty_arrow */2,
+            _0: "",
+            _1: _1,
+            _2: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_constr */0,
-                  _0: {
-                    txt: _4,
-                    loc: rhs_loc(4)
-                  },
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pcty_constr */0,
+            _0: {
+              txt: _4,
+              loc: rhs_loc(4)
+            },
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_constr */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: /* [] */0
-                });
+            TAG: /* Pcty_constr */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkcty({
-                  TAG: /* Pcty_signature */1,
-                  _0: _2
-                });
+            TAG: /* Pcty_signature */1,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -18229,17 +18229,17 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_extension */3,
-                  _0: _1
-                });
+            TAG: /* Pcty_extension */3,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              pcsig_self: _1,
-              pcsig_fields: extra_csig(2, Stdlib__List.rev(_2))
-            };
+        pcsig_self: _1,
+        pcsig_fields: extra_csig(2, Stdlib__List.rev(_2))
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -18254,25 +18254,25 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at({
-                  hd: _2,
-                  tl: Curry._1(Ast_helper_Ctf.text, get_text(Stdlib__Parsing.rhs_start_pos(2)))
-                }, _1);
+            hd: _2,
+            tl: Curry._1(Ast_helper_Ctf.text, get_text(Stdlib__Parsing.rhs_start_pos(2)))
+          }, _1);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_3, symbol_docs(undefined), {
-                  TAG: /* Pctf_inherit */0,
-                  _0: _2
-                });
+            TAG: /* Pctf_inherit */0,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_3, symbol_docs(undefined), {
-                  TAG: /* Pctf_val */1,
-                  _0: _2
-                });
+            TAG: /* Pctf_val */1,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -18280,102 +18280,102 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_6, symbol_docs(undefined), {
-                  TAG: /* Pctf_method */2,
-                  _0: [
-                    _3,
-                    _2[0],
-                    _2[1],
-                    _5
-                  ]
-                });
+            TAG: /* Pctf_method */2,
+            _0: [
+              _3,
+              _2[0],
+              _2[1],
+              _5
+            ]
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_3, symbol_docs(undefined), {
-                  TAG: /* Pctf_constraint */3,
-                  _0: _2
-                });
+            TAG: /* Pctf_constraint */3,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_2, symbol_docs(undefined), {
-                  TAG: /* Pctf_extension */5,
-                  _0: _1
-                });
+            TAG: /* Pctf_extension */5,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_symbol_docs(undefined);
       return mkctf(undefined, undefined, {
-                  TAG: /* Pctf_attribute */4,
-                  _0: _1
-                });
+            TAG: /* Pctf_attribute */4,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _3,
-              _2,
-              /* Virtual */0,
-              _5
-            ];
+        _3,
+        _2,
+        /* Virtual */0,
+        _5
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _3,
-              /* Mutable */1,
-              _2,
-              _5
-            ];
+        _3,
+        /* Mutable */1,
+        _2,
+        _5
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              /* Immutable */0,
-              /* Concrete */1,
-              _3
-            ];
+        _1,
+        /* Immutable */0,
+        /* Concrete */1,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _3,
-              symbol_rloc(undefined)
-            ];
+        _1,
+        _3,
+        symbol_rloc(undefined)
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _3
-            ];
+        _1,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -18384,9 +18384,9 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _7, symbol_docs(undefined), undefined, _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _6);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _6);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -18395,24 +18395,24 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _7, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _6);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _6);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -18421,9 +18421,9 @@ const yyact = [
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _8 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _8, symbol_docs(undefined), undefined, _3, _4, {
-                  txt: _5,
-                  loc: rhs_loc(5)
-                }, _7);
+            txt: _5,
+            loc: rhs_loc(5)
+          }, _7);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -18432,9 +18432,9 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _7, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _6);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _6);
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -18446,89 +18446,89 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_sequence */16,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Pexp_sequence */16,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              "?" + _3[0],
-              _4,
-              _3[1]
-            ];
+        "?" + _3[0],
+        _4,
+        _3[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "?" + _2[0],
-              undefined,
-              _2[1]
-            ];
+        "?" + _2[0],
+        undefined,
+        _2[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              "?" + _1,
-              _4,
-              _3
-            ];
+        "?" + _1,
+        _4,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "?" + _1,
-              undefined,
-              _2
-            ];
+        "?" + _1,
+        undefined,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _3[0],
-              undefined,
-              _3[1]
-            ];
+        _3[0],
+        undefined,
+        _3[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2[0],
-              undefined,
-              _2[1]
-            ];
+        _2[0],
+        undefined,
+        _2[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              undefined,
-              _2
-            ];
+        _1,
+        undefined,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "",
-              undefined,
-              _1
-            ];
+        "",
+        undefined,
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_var */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Ppat_var */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       return mkpat(/* Ppat_any */0);
@@ -18546,26 +18546,26 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1[0],
-              mkpat({
-                    TAG: /* Ppat_constraint */10,
-                    _0: _1[1],
-                    _1: _3
-                  })
-            ];
+        _1[0],
+        mkpat({
+              TAG: /* Ppat_constraint */10,
+              _0: _1[1],
+              _1: _3
+            })
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              mkpat({
-                    TAG: /* Ppat_var */0,
-                    _0: {
-                      txt: _1,
-                      loc: rhs_loc(1)
-                    }
-                  })
-            ];
+        _1,
+        mkpat({
+              TAG: /* Ppat_var */0,
+              _0: {
+                txt: _1,
+                loc: rhs_loc(1)
+              }
+            })
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -18574,10 +18574,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_constraint */10,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Ppat_constraint */10,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -18586,10 +18586,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: _1,
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pexp_apply */5,
+            _0: _1,
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -18597,13 +18597,13 @@ const yyact = [
       const bindings = Stdlib__List.map((function (lb) {
               if (Caml_obj.caml_notequal(lb.lb_attributes, /* [] */0)) {
                 throw new Caml_js_exceptions.MelangeError($$Error$3, {
-                          MEL_EXN_ID: $$Error$3,
-                          _1: {
-                            TAG: /* Not_expecting */2,
-                            _0: lb.lb_loc,
-                            _1: "item attribute"
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$3,
+                      _1: {
+                        TAG: /* Not_expecting */2,
+                        _0: lb.lb_loc,
+                        _1: "item attribute"
+                      }
+                    });
               }
               return mk$17(lb.lb_loc, undefined, undefined, undefined, lb.lb_pattern, lb.lb_expression);
             }), _1.lbs_bindings);
@@ -18616,9 +18616,9 @@ const yyact = [
         _2: _3
       };
       return wrap_exp_attrs(mkexp(d), [
-                  _1.lbs_extension,
-                  _1.lbs_attributes
-                ]);
+            _1.lbs_extension,
+            _1.lbs_attributes
+          ]);
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -18669,22 +18669,22 @@ const yyact = [
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_fun */4,
-                      _0: _3[0],
-                      _1: _3[1],
-                      _2: _3[2],
-                      _3: _4
-                    }), _2);
+                TAG: /* Pexp_fun */4,
+                _0: _3[0],
+                _1: _3[1],
+                _2: _3[2],
+                _3: _4
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_newtype */30,
-                      _0: _5,
-                      _1: _7
-                    }), _2);
+                TAG: /* Pexp_newtype */30,
+                _0: _5,
+                _1: _7
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -18716,36 +18716,36 @@ const yyact = [
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                MEL_EXN_ID: Escape_error
-              });
+            MEL_EXN_ID: Escape_error
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_tuple */8,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pexp_tuple */8,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_construct */9,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: _2
-                });
+            TAG: /* Pexp_construct */9,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_variant */10,
-                  _0: _1,
-                  _1: _2
-                });
+            TAG: /* Pexp_variant */10,
+            _0: _1,
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -18753,32 +18753,32 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_ifthenelse */15,
-                      _0: _3,
-                      _1: _5,
-                      _2: _7
-                    }), _2);
+                TAG: /* Pexp_ifthenelse */15,
+                _0: _3,
+                _1: _5,
+                _2: _7
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_ifthenelse */15,
-                      _0: _3,
-                      _1: _5,
-                      _2: undefined
-                    }), _2);
+                TAG: /* Pexp_ifthenelse */15,
+                _0: _3,
+                _1: _5,
+                _2: undefined
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_while */17,
-                      _0: _3,
-                      _1: _5
-                    }), _2);
+                TAG: /* Pexp_while */17,
+                _0: _3,
+                _1: _5
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 8);
@@ -18788,41 +18788,41 @@ const yyact = [
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _9 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_for */18,
-                      _0: _3,
-                      _1: _5,
-                      _2: _7,
-                      _3: _6,
-                      _4: _9
-                    }), _2);
+                TAG: /* Pexp_for */18,
+                _0: _3,
+                _1: _5,
+                _2: _7,
+                _3: _6,
+                _4: _9
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp_cons(rhs_loc(2), ghexp({
-                      TAG: /* Pexp_tuple */8,
-                      _0: {
-                        hd: _1,
-                        tl: {
-                          hd: _3,
-                          tl: /* [] */0
-                        }
-                      }
-                    }), symbol_rloc(undefined));
+                TAG: /* Pexp_tuple */8,
+                _0: {
+                  hd: _1,
+                  tl: {
+                    hd: _3,
+                    tl: /* [] */0
+                  }
+                }
+              }), symbol_rloc(undefined));
     }),
   (function (__caml_parser_env) {
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp_cons(rhs_loc(2), ghexp({
-                      TAG: /* Pexp_tuple */8,
-                      _0: {
-                        hd: _5,
-                        tl: {
-                          hd: _7,
-                          tl: /* [] */0
-                        }
-                      }
-                    }), symbol_rloc(undefined));
+                TAG: /* Pexp_tuple */8,
+                _0: {
+                  hd: _5,
+                  tl: {
+                    hd: _7,
+                    tl: /* [] */0
+                  }
+                }
+              }), symbol_rloc(undefined));
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -18941,36 +18941,36 @@ const yyact = [
               switch (n.TAG) {
                 case /* Const_int */0 :
                     return mkexp({
-                                TAG: /* Pexp_constant */1,
-                                _0: {
-                                  TAG: /* Const_int */0,
-                                  _0: -n._0 | 0
-                                }
-                              });
+                          TAG: /* Pexp_constant */1,
+                          _0: {
+                            TAG: /* Const_int */0,
+                            _0: -n._0 | 0
+                          }
+                        });
                 case /* Const_int32 */4 :
                     return mkexp({
-                                TAG: /* Pexp_constant */1,
-                                _0: {
-                                  TAG: /* Const_int32 */4,
-                                  _0: -n._0 | 0
-                                }
-                              });
+                          TAG: /* Pexp_constant */1,
+                          _0: {
+                            TAG: /* Const_int32 */4,
+                            _0: -n._0 | 0
+                          }
+                        });
                 case /* Const_int64 */5 :
                     return mkexp({
-                                TAG: /* Pexp_constant */1,
-                                _0: {
-                                  TAG: /* Const_int64 */5,
-                                  _0: Caml_int64.neg(n._0)
-                                }
-                              });
+                          TAG: /* Pexp_constant */1,
+                          _0: {
+                            TAG: /* Const_int64 */5,
+                            _0: Caml_int64.neg(n._0)
+                          }
+                        });
                 case /* Const_nativeint */6 :
                     return mkexp({
-                                TAG: /* Pexp_constant */1,
-                                _0: {
-                                  TAG: /* Const_nativeint */6,
-                                  _0: Caml_external_polyfill.resolve("nativeint_neg")(n._0)
-                                }
-                              });
+                          TAG: /* Pexp_constant */1,
+                          _0: {
+                            TAG: /* Const_nativeint */6,
+                            _0: Caml_external_polyfill.resolve("nativeint_neg")(n._0)
+                          }
+                        });
                 default:
                   exit = 2;
               }
@@ -18988,26 +18988,26 @@ const yyact = [
         const f = match._0;
         if (f.TAG === /* Const_float */3) {
           return mkexp({
-                      TAG: /* Pexp_constant */1,
-                      _0: {
-                        TAG: /* Const_float */3,
-                        _0: neg_float_string(f._0)
-                      }
-                    });
+                TAG: /* Pexp_constant */1,
+                _0: {
+                  TAG: /* Const_float */3,
+                  _0: neg_float_string(f._0)
+                }
+              });
         }
         
       }
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: mkoperator("~" + _1, 1),
-                  _1: {
-                    hd: [
-                      "",
-                      _2
-                    ],
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: mkoperator("~" + _1, 1),
+            _1: {
+              hd: [
+                "",
+                _2
+              ],
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -19040,92 +19040,92 @@ const yyact = [
         return mkexp(desc);
       }
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: mkoperator("~" + _1, 1),
-                  _1: {
-                    hd: [
-                      "",
-                      _2
-                    ],
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: mkoperator("~" + _1, 1),
+            _1: {
+              hd: [
+                "",
+                _2
+              ],
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_setfield */13,
-                  _0: _1,
-                  _1: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  },
-                  _2: _5
-                });
+            TAG: /* Pexp_setfield */13,
+            _0: _1,
+            _1: {
+              txt: _3,
+              loc: rhs_loc(3)
+            },
+            _2: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: array_function("Array", "set")
-                      }),
-                  _1: {
-                    hd: [
-                      "",
-                      _1
-                    ],
-                    tl: {
-                      hd: [
-                        "",
-                        _4
-                      ],
-                      tl: {
-                        hd: [
-                          "",
-                          _7
-                        ],
-                        tl: /* [] */0
-                      }
-                    }
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: array_function("Array", "set")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  _4
+                ],
+                tl: {
+                  hd: [
+                    "",
+                    _7
+                  ],
+                  tl: /* [] */0
+                }
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: array_function("String", "set")
-                      }),
-                  _1: {
-                    hd: [
-                      "",
-                      _1
-                    ],
-                    tl: {
-                      hd: [
-                        "",
-                        _4
-                      ],
-                      tl: {
-                        hd: [
-                          "",
-                          _7
-                        ],
-                        tl: /* [] */0
-                      }
-                    }
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: array_function("String", "set")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  _4
+                ],
+                tl: {
+                  hd: [
+                    "",
+                    _7
+                  ],
+                  tl: /* [] */0
+                }
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -19138,175 +19138,175 @@ const yyact = [
         const c1 = coords.hd;
         if (!match) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array1", set)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              _7
-                            ],
-                            tl: /* [] */0
-                          }
-                        }
-                      }
-                    });
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array1", set)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
+                    hd: [
+                      "",
+                      c1
+                    ],
+                    tl: {
+                      hd: [
+                        "",
+                        _7
+                      ],
+                      tl: /* [] */0
+                    }
+                  }
+                }
+              });
         }
         const match$1 = match.tl;
         const c2 = match.hd;
         if (!match$1) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array2", set)
-                          }),
-                      _1: {
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array2", set)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
+                    hd: [
+                      "",
+                      c1
+                    ],
+                    tl: {
+                      hd: [
+                        "",
+                        c2
+                      ],
+                      tl: {
                         hd: [
                           "",
-                          _1
+                          _7
                         ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              c2
-                            ],
-                            tl: {
-                              hd: [
-                                "",
-                                _7
-                              ],
-                              tl: /* [] */0
-                            }
-                          }
-                        }
+                        tl: /* [] */0
                       }
-                    });
+                    }
+                  }
+                }
+              });
         }
         if (!match$1.tl) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array3", set)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              c2
-                            ],
-                            tl: {
-                              hd: [
-                                "",
-                                match$1.hd
-                              ],
-                              tl: {
-                                hd: [
-                                  "",
-                                  _7
-                                ],
-                                tl: /* [] */0
-                              }
-                            }
-                          }
-                        }
-                      }
-                    });
-        }
-        
-      }
-      return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: bigarray_function("Genarray", "set")
-                      }),
-                  _1: {
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array3", set)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
                     hd: [
                       "",
-                      _1
+                      c1
                     ],
                     tl: {
                       hd: [
                         "",
-                        ghexp({
-                              TAG: /* Pexp_array */14,
-                              _0: coords
-                            })
+                        c2
                       ],
                       tl: {
                         hd: [
                           "",
-                          _7
+                          match$1.hd
                         ],
-                        tl: /* [] */0
+                        tl: {
+                          hd: [
+                            "",
+                            _7
+                          ],
+                          tl: /* [] */0
+                        }
                       }
                     }
                   }
-                });
+                }
+              });
+        }
+        
+      }
+      return mkexp({
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: bigarray_function("Genarray", "set")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  ghexp({
+                        TAG: /* Pexp_array */14,
+                        _0: coords
+                      })
+                ],
+                tl: {
+                  hd: [
+                    "",
+                    _7
+                  ],
+                  tl: /* [] */0
+                }
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_setinstvar */23,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: _3
-                });
+            TAG: /* Pexp_setinstvar */23,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_assert */26,
-                      _0: _3
-                    }), _2);
+                TAG: /* Pexp_assert */26,
+                _0: _3
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_lazy */27,
-                      _0: _3
-                    }), _2);
+                TAG: /* Pexp_lazy */27,
+                _0: _3
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_object */29,
-                      _0: _3
-                    }), _2);
+                TAG: /* Pexp_object */29,
+                _0: _3
+              }), _2);
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -19321,38 +19321,38 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_ident */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Pexp_ident */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_constant */1,
-                  _0: _1
-                });
+            TAG: /* Pexp_constant */1,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_construct */9,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: undefined
-                });
+            TAG: /* Pexp_construct */9,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_variant */10,
-                  _0: _1,
-                  _1: undefined
-                });
+            TAG: /* Pexp_variant */10,
+            _0: _1,
+            _1: undefined
+          });
     }),
   (function (__caml_parser_env) {
       return reloc_exp(Stdlib__Parsing.peek_val(__caml_parser_env, 1));
@@ -19396,26 +19396,26 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_field */12,
-                  _0: _1,
-                  _1: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  }
-                });
+            TAG: /* Pexp_field */12,
+            _0: _1,
+            _1: {
+              txt: _3,
+              loc: rhs_loc(3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: _4
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: _4
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -19426,25 +19426,25 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: array_function("Array", "get")
-                      }),
-                  _1: {
-                    hd: [
-                      "",
-                      _1
-                    ],
-                    tl: {
-                      hd: [
-                        "",
-                        _4
-                      ],
-                      tl: /* [] */0
-                    }
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: array_function("Array", "get")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  _4
+                ],
+                tl: /* [] */0
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -19455,25 +19455,25 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: array_function("String", "get")
-                      }),
-                  _1: {
-                    hd: [
-                      "",
-                      _1
-                    ],
-                    tl: {
-                      hd: [
-                        "",
-                        _4
-                      ],
-                      tl: /* [] */0
-                    }
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: array_function("String", "get")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  _4
+                ],
+                tl: /* [] */0
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -19490,115 +19490,115 @@ const yyact = [
         const c1 = coords.hd;
         if (!match) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array1", get)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: /* [] */0
-                        }
-                      }
-                    });
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array1", get)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
+                    hd: [
+                      "",
+                      c1
+                    ],
+                    tl: /* [] */0
+                  }
+                }
+              });
         }
         const match$1 = match.tl;
         const c2 = match.hd;
         if (!match$1) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array2", get)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              c2
-                            ],
-                            tl: /* [] */0
-                          }
-                        }
-                      }
-                    });
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array2", get)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
+                    hd: [
+                      "",
+                      c1
+                    ],
+                    tl: {
+                      hd: [
+                        "",
+                        c2
+                      ],
+                      tl: /* [] */0
+                    }
+                  }
+                }
+              });
         }
         if (!match$1.tl) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array3", get)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              c2
-                            ],
-                            tl: {
-                              hd: [
-                                "",
-                                match$1.hd
-                              ],
-                              tl: /* [] */0
-                            }
-                          }
-                        }
-                      }
-                    });
-        }
-        
-      }
-      return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: bigarray_function("Genarray", "get")
-                      }),
-                  _1: {
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array3", get)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
                     hd: [
                       "",
-                      _1
+                      c1
                     ],
                     tl: {
                       hd: [
                         "",
-                        ghexp({
-                              TAG: /* Pexp_array */14,
-                              _0: coords
-                            })
+                        c2
                       ],
-                      tl: /* [] */0
+                      tl: {
+                        hd: [
+                          "",
+                          match$1.hd
+                        ],
+                        tl: /* [] */0
+                      }
                     }
                   }
-                });
+                }
+              });
+        }
+        
+      }
+      return mkexp({
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: bigarray_function("Genarray", "get")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  ghexp({
+                        TAG: /* Pexp_array */14,
+                        _0: coords
+                      })
+                ],
+                tl: /* [] */0
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -19608,10 +19608,10 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_record */11,
-                  _0: _2[1],
-                  _1: _2[0]
-                });
+            TAG: /* Pexp_record */11,
+            _0: _2[1],
+            _1: _2[0]
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -19626,14 +19626,14 @@ const yyact = [
             _1: _4[0]
           });
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: rec_exp
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: rec_exp
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -19644,9 +19644,9 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_array */14,
-                  _0: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pexp_array */14,
+            _0: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -19655,26 +19655,26 @@ const yyact = [
     }),
   (function (__caml_parser_env) {
       return mkexp({
-                  TAG: /* Pexp_array */14,
-                  _0: /* [] */0
-                });
+            TAG: /* Pexp_array */14,
+            _0: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: mkexp({
-                        TAG: /* Pexp_array */14,
-                        _0: Stdlib__List.rev(_4)
-                      })
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: mkexp({
+                  TAG: /* Pexp_array */14,
+                  _0: Stdlib__List.rev(_4)
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -19698,14 +19698,14 @@ const yyact = [
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const list_exp = reloc_exp(mktailexp(rhs_loc(6), Stdlib__List.rev(_4)));
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: list_exp
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: list_exp
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -19717,30 +19717,30 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: mkoperator(_1, 1),
-                  _1: {
-                    hd: [
-                      "",
-                      _2
-                    ],
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: mkoperator(_1, 1),
+            _1: {
+              hd: [
+                "",
+                _2
+              ],
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: mkoperator("!", 1),
-                  _1: {
-                    hd: [
-                      "",
-                      _2
-                    ],
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: mkoperator("!", 1),
+            _1: {
+              hd: [
+                "",
+                _2
+              ],
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -19758,9 +19758,9 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_override */24,
-                  _0: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pexp_override */24,
+            _0: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -19769,26 +19769,26 @@ const yyact = [
     }),
   (function (__caml_parser_env) {
       return mkexp({
-                  TAG: /* Pexp_override */24,
-                  _0: /* [] */0
-                });
+            TAG: /* Pexp_override */24,
+            _0: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: mkexp({
-                        TAG: /* Pexp_override */24,
-                        _0: Stdlib__List.rev(_4)
-                      })
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: mkexp({
+                  TAG: /* Pexp_override */24,
+                  _0: Stdlib__List.rev(_4)
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -19800,10 +19800,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_send */21,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Pexp_send */21,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -19814,24 +19814,24 @@ const yyact = [
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_pack */31,
-                  _0: _3
-                });
+            TAG: /* Pexp_pack */31,
+            _0: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_constraint */19,
-                  _0: ghexp({
-                        TAG: /* Pexp_pack */31,
-                        _0: _3
-                      }),
-                  _1: ghtyp({
-                        TAG: /* Ptyp_package */9,
-                        _0: _5
-                      })
-                });
+            TAG: /* Pexp_constraint */19,
+            _0: ghexp({
+                  TAG: /* Pexp_pack */31,
+                  _0: _3
+                }),
+            _1: ghtyp({
+                  TAG: /* Ptyp_package */9,
+                  _0: _5
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -19842,24 +19842,24 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: mkexp({
-                        TAG: /* Pexp_constraint */19,
-                        _0: ghexp({
-                              TAG: /* Pexp_pack */31,
-                              _0: _5
-                            }),
-                        _1: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _7
-                            })
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: mkexp({
+                  TAG: /* Pexp_constraint */19,
+                  _0: ghexp({
+                        TAG: /* Pexp_pack */31,
+                        _0: _5
+                      }),
+                  _1: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _7
                       })
-                });
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -19869,31 +19869,31 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_extension */33,
-                  _0: _1
-                });
+            TAG: /* Pexp_extension */33,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "",
-              _1
-            ];
+        "",
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -19902,9 +19902,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _2
-            ];
+        _1,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -19912,56 +19912,56 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "?" + _2[0],
-              _2[1]
-            ];
+        "?" + _2[0],
+        _2[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "?" + _1,
-              _2
-            ];
+        "?" + _1,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              mkexp({
-                    TAG: /* Pexp_ident */0,
-                    _0: {
-                      txt: {
-                        TAG: /* Lident */0,
-                        _0: _1
-                      },
-                      loc: rhs_loc(1)
-                    }
-                  })
-            ];
+        _1,
+        mkexp({
+              TAG: /* Pexp_ident */0,
+              _0: {
+                txt: {
+                  TAG: /* Lident */0,
+                  _0: _1
+                },
+                loc: rhs_loc(1)
+              }
+            })
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              mkpatvar(_1, 1),
-              _2
-            ];
+        mkpatvar(_1, 1),
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -19969,17 +19969,17 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              ghpat({
-                    TAG: /* Ppat_constraint */10,
-                    _0: mkpatvar(_1, 1),
-                    _1: ghtyp({
-                          TAG: /* Ptyp_poly */8,
-                          _0: Stdlib__List.rev(_3),
-                          _1: _5
-                        })
-                  }),
-              _7
-            ];
+        ghpat({
+              TAG: /* Ppat_constraint */10,
+              _0: mkpatvar(_1, 1),
+              _1: ghtyp({
+                    TAG: /* Ptyp_poly */8,
+                    _0: Stdlib__List.rev(_3),
+                    _1: _5
+                  })
+            }),
+        _7
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 7);
@@ -19988,34 +19988,34 @@ const yyact = [
       const _8 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       const match = wrap_type_annotation(_4, _6, _8);
       return [
-              ghpat({
-                    TAG: /* Ppat_constraint */10,
-                    _0: mkpatvar(_1, 1),
-                    _1: match[1]
-                  }),
-              match[0]
-            ];
+        ghpat({
+              TAG: /* Ppat_constraint */10,
+              _0: mkpatvar(_1, 1),
+              _1: match[1]
+            }),
+        match[0]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _3
-            ];
+        _1,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              ghpat({
-                    TAG: /* Ppat_constraint */10,
-                    _0: _1,
-                    _1: _3
-                  }),
-              _5
-            ];
+        ghpat({
+              TAG: /* Ppat_constraint */10,
+              _0: _1,
+              _1: _3
+            }),
+        _5
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -20024,15 +20024,15 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              lbs_bindings: {
-                hd: _2,
-                tl: _1.lbs_bindings
-              },
-              lbs_rec: _1.lbs_rec,
-              lbs_extension: _1.lbs_extension,
-              lbs_attributes: _1.lbs_attributes,
-              lbs_loc: _1.lbs_loc
-            };
+        lbs_bindings: {
+          hd: _2,
+          tl: _1.lbs_bindings
+        },
+        lbs_rec: _1.lbs_rec,
+        lbs_extension: _1.lbs_extension,
+        lbs_attributes: _1.lbs_attributes,
+        lbs_loc: _1.lbs_loc
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -20041,15 +20041,15 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       let lb = mklb(_4, _5);
       return {
-              lbs_bindings: {
-                hd: lb,
-                tl: /* [] */0
-              },
-              lbs_rec: _3,
-              lbs_extension: _2[0],
-              lbs_attributes: _2[1],
-              lbs_loc: symbol_rloc(undefined)
-            };
+        lbs_bindings: {
+          hd: lb,
+          tl: /* [] */0
+        },
+        lbs_rec: _3,
+        lbs_extension: _2[0],
+        lbs_attributes: _2[1],
+        lbs_loc: symbol_rloc(undefined)
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -20071,36 +20071,36 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return ghexp({
-                  TAG: /* Pexp_fun */4,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _2
-                });
+            TAG: /* Pexp_fun */4,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_newtype */30,
-                  _0: _3,
-                  _1: _5
-                });
+            TAG: /* Pexp_newtype */30,
+            _0: _3,
+            _1: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -20120,174 +20120,174 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return ghexp({
-                  TAG: /* Pexp_fun */4,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _2
-                });
+            TAG: /* Pexp_fun */4,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_newtype */30,
-                  _0: _3,
-                  _1: _5
-                });
+            TAG: /* Pexp_newtype */30,
+            _0: _3,
+            _1: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: {
-                hd: _1,
-                tl: /* [] */0
-              }
-            };
+        hd: _3,
+        tl: {
+          hd: _1,
+          tl: /* [] */0
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _3
-            ];
+        _1,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              undefined,
-              _1
-            ];
+        undefined,
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _3
-            };
+        hd: _1,
+        tl: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              _3
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              exp_of_label(_1, 1)
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        exp_of_label(_1, 1)
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: [
-                {
-                  txt: _1,
-                  loc: rhs_loc(1)
-                },
-                _3
-              ],
-              tl: /* [] */0
-            };
+        hd: [
+          {
+            txt: _1,
+            loc: rhs_loc(1)
+          },
+          _3
+        ],
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: [
-                {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                },
-                _5
-              ],
-              tl: _1
-            };
+        hd: [
+          {
+            txt: _3,
+            loc: rhs_loc(3)
+          },
+          _5
+        ],
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              undefined
-            ];
+        _2,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              _4
-            ];
+        _2,
+        _4
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              undefined,
-              _2
-            ];
+        undefined,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                MEL_EXN_ID: Escape_error
-              });
+            MEL_EXN_ID: Escape_error
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                MEL_EXN_ID: Escape_error
-              });
+            MEL_EXN_ID: Escape_error
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -20296,13 +20296,13 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_alias */1,
-                  _0: _1,
-                  _1: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  }
-                });
+            TAG: /* Ppat_alias */1,
+            _0: _1,
+            _1: {
+              txt: _3,
+              loc: rhs_loc(3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -20311,44 +20311,44 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_tuple */4,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Ppat_tuple */4,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_construct */5,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: _2
-                });
+            TAG: /* Ppat_construct */5,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_variant */6,
-                  _0: _1,
-                  _1: _2
-                });
+            TAG: /* Ppat_variant */6,
+            _0: _1,
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat_cons(rhs_loc(2), ghpat({
-                      TAG: /* Ppat_tuple */4,
-                      _0: {
-                        hd: _1,
-                        tl: {
-                          hd: _3,
-                          tl: /* [] */0
-                        }
-                      }
-                    }), symbol_rloc(undefined));
+                TAG: /* Ppat_tuple */4,
+                _0: {
+                  hd: _1,
+                  tl: {
+                    hd: _3,
+                    tl: /* [] */0
+                  }
+                }
+              }), symbol_rloc(undefined));
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -20358,15 +20358,15 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat_cons(rhs_loc(2), ghpat({
-                      TAG: /* Ppat_tuple */4,
-                      _0: {
-                        hd: _5,
-                        tl: {
-                          hd: _7,
-                          tl: /* [] */0
-                        }
-                      }
-                    }), symbol_rloc(undefined));
+                TAG: /* Ppat_tuple */4,
+                _0: {
+                  hd: _5,
+                  tl: {
+                    hd: _7,
+                    tl: /* [] */0
+                  }
+                }
+              }), symbol_rloc(undefined));
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -20377,10 +20377,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_or */9,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Ppat_or */9,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -20389,16 +20389,16 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_lazy */12,
-                  _0: _2
-                });
+            TAG: /* Ppat_lazy */12,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_exception */14,
-                  _0: _2
-                });
+            TAG: /* Ppat_exception */14,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -20408,12 +20408,12 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_var */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Ppat_var */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -20424,55 +20424,55 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_constant */2,
-                  _0: _1
-                });
+            TAG: /* Ppat_constant */2,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_interval */3,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Ppat_interval */3,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_construct */5,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: undefined
-                });
+            TAG: /* Ppat_construct */5,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_variant */6,
-                  _0: _1,
-                  _1: undefined
-                });
+            TAG: /* Ppat_variant */6,
+            _0: _1,
+            _1: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_type */11,
-                  _0: {
-                    txt: _2,
-                    loc: rhs_loc(2)
-                  }
-                });
+            TAG: /* Ppat_type */11,
+            _0: {
+              txt: _2,
+              loc: rhs_loc(2)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_record */7,
-                  _0: _2[0],
-                  _1: _2[1]
-                });
+            TAG: /* Ppat_record */7,
+            _0: _2[0],
+            _1: _2[1]
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -20492,15 +20492,15 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_array */8,
-                  _0: Stdlib__List.rev(_2)
-                });
+            TAG: /* Ppat_array */8,
+            _0: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       return mkpat({
-                  TAG: /* Ppat_array */8,
-                  _0: /* [] */0
-                });
+            TAG: /* Ppat_array */8,
+            _0: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -20518,10 +20518,10 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_constraint */10,
-                  _0: _2,
-                  _1: _4
-                });
+            TAG: /* Ppat_constraint */10,
+            _0: _2,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -20535,30 +20535,30 @@ const yyact = [
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_unpack */13,
-                  _0: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  }
-                });
+            TAG: /* Ppat_unpack */13,
+            _0: {
+              txt: _3,
+              loc: rhs_loc(3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_constraint */10,
-                  _0: mkpat({
-                        TAG: /* Ppat_unpack */13,
-                        _0: {
-                          txt: _3,
-                          loc: rhs_loc(3)
-                        }
-                      }),
-                  _1: ghtyp({
-                        TAG: /* Ptyp_package */9,
-                        _0: _5
-                      })
-                });
+            TAG: /* Ppat_constraint */10,
+            _0: mkpat({
+                  TAG: /* Ppat_unpack */13,
+                  _0: {
+                    txt: _3,
+                    loc: rhs_loc(3)
+                  }
+                }),
+            _1: ghtyp({
+                  TAG: /* Ptyp_package */9,
+                  _0: _5
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -20568,28 +20568,28 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_extension */15,
-                  _0: _1
-                });
+            TAG: /* Ppat_extension */15,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: {
-                hd: _1,
-                tl: /* [] */0
-              }
-            };
+        hd: _3,
+        tl: {
+          hd: _1,
+          tl: /* [] */0
+        }
+      };
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -20598,104 +20598,104 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: /* [] */0
-              },
-              /* Closed */0
-            ];
+        {
+          hd: _1,
+          tl: /* [] */0
+        },
+        /* Closed */0
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              {
-                hd: _1,
-                tl: /* [] */0
-              },
-              /* Closed */0
-            ];
+        {
+          hd: _1,
+          tl: /* [] */0
+        },
+        /* Closed */0
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: /* [] */0
-              },
-              /* Open */1
-            ];
+        {
+          hd: _1,
+          tl: /* [] */0
+        },
+        /* Open */1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: _3[0]
-              },
-              _3[1]
-            ];
+        {
+          hd: _1,
+          tl: _3[0]
+        },
+        _3[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              _3
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              pat_of_label(_1, 1)
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        pat_of_label(_1, 1)
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$11(symbol_rloc(undefined), _5, symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1[0],
-              tl: /* [] */0
-            };
+        hd: _1[0],
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1[0],
-              tl: _2
-            };
+        hd: _1[0],
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -20703,24 +20703,24 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$11(symbol_rloc(undefined), _7, symbol_docs(undefined), _6, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -20730,9 +20730,9 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$19(symbol_rloc(undefined), add_nonrec(_2, _7, 2), symbol_docs(undefined), undefined, _3, Stdlib__List.rev(_6), _5[0], _5[1], _5[2], {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                });
+            txt: _4,
+            loc: rhs_loc(4)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -20741,118 +20741,118 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$19(symbol_rloc(undefined), _6, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), _2, Stdlib__List.rev(_5), _4[0], _4[1], _4[2], {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                });
+            txt: _3,
+            loc: rhs_loc(3)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
     }),
   (function (__caml_parser_env) {
       return [
-              /* Ptype_abstract */0,
-              /* Public */1,
-              undefined
-            ];
+        /* Ptype_abstract */0,
+        /* Public */1,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              /* Ptype_abstract */0,
-              /* Public */1,
-              _2
-            ];
+        /* Ptype_abstract */0,
+        /* Public */1,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              /* Ptype_abstract */0,
-              /* Private */0,
-              _3
-            ];
+        /* Ptype_abstract */0,
+        /* Private */0,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                TAG: /* Ptype_variant */0,
-                _0: Stdlib__List.rev(_2)
-              },
-              /* Public */1,
-              undefined
-            ];
+        {
+          TAG: /* Ptype_variant */0,
+          _0: Stdlib__List.rev(_2)
+        },
+        /* Public */1,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                TAG: /* Ptype_variant */0,
-                _0: Stdlib__List.rev(_3)
-              },
-              /* Private */0,
-              undefined
-            ];
+        {
+          TAG: /* Ptype_variant */0,
+          _0: Stdlib__List.rev(_3)
+        },
+        /* Private */0,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Ptype_open */1,
-              /* Public */1,
-              undefined
-            ];
+        /* Ptype_open */1,
+        /* Public */1,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              {
-                TAG: /* Ptype_record */1,
-                _0: _4
-              },
-              _2,
-              undefined
-            ];
+        {
+          TAG: /* Ptype_record */1,
+          _0: _4
+        },
+        _2,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                TAG: /* Ptype_variant */0,
-                _0: Stdlib__List.rev(_5)
-              },
-              _4,
-              _2
-            ];
+        {
+          TAG: /* Ptype_variant */0,
+          _0: Stdlib__List.rev(_5)
+        },
+        _4,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       return [
-              /* Ptype_open */1,
-              /* Public */1,
-              _2
-            ];
+        /* Ptype_open */1,
+        /* Public */1,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              {
-                TAG: /* Ptype_record */1,
-                _0: _6
-              },
-              _4,
-              _2
-            ];
+        {
+          TAG: /* Ptype_record */1,
+          _0: _6
+        },
+        _4,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -20860,9 +20860,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__List.rev(Stdlib__Parsing.peek_val(__caml_parser_env, 1));
@@ -20871,31 +20871,31 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              _1
-            ];
+        _2,
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_var */0,
-                  _0: _2
-                });
+            TAG: /* Ptyp_var */0,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       return mktyp(/* Ptyp_any */0);
@@ -20906,9 +20906,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__List.rev(Stdlib__Parsing.peek_val(__caml_parser_env, 1));
@@ -20917,9 +20917,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              _1
-            ];
+        _2,
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       return /* Invariant */2;
@@ -20933,64 +20933,64 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_var */0,
-                  _0: _2
-                });
+            TAG: /* Ptyp_var */0,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return constructor(symbol_rloc(undefined), _3, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _2[0], _2[1], {
-                  txt: _1,
-                  loc: rhs_loc(1)
-                });
+            txt: _1,
+            loc: rhs_loc(1)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return constructor(symbol_rloc(undefined), _4, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _3[0], _3[1], {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -21001,12 +21001,12 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return rebind(symbol_rloc(undefined), Stdlib.$at(_5, _6), symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          }, {
+            txt: _4,
+            loc: rhs_loc(4)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -21014,59 +21014,59 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return decl(symbol_rloc(undefined), Stdlib.$at(_4, _5), symbol_docs(undefined), undefined, _3[0], _3[1], {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          });
     }),
   (function (__caml_parser_env) {
       return [
-              /* [] */0,
-              undefined
-            ];
+        /* [] */0,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              Stdlib__List.rev(_2),
-              undefined
-            ];
+        Stdlib__List.rev(_2),
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              Stdlib__List.rev(_2),
-              _4
-            ];
+        Stdlib__List.rev(_2),
+        _4
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              /* [] */0,
-              _2
-            ];
+        /* [] */0,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -21074,9 +21074,9 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return field$1(symbol_rloc(undefined), _5, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _1, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -21087,9 +21087,9 @@ const yyact = [
       const info_before_semi = get_info(Stdlib__Parsing.rhs_end_pos(5));
       const info = info_before_semi !== undefined ? info_before_semi : get_info(Stdlib__Parsing.symbol_end_pos(undefined));
       return field$1(symbol_rloc(undefined), Stdlib.$at(_5, _7), Caml_option.some(info), _1, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -21102,9 +21102,9 @@ const yyact = [
         not_expecting(2, "nonrec flag");
       }
       return mk$20(_8, symbol_docs(undefined), _3, _6, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, Stdlib__List.rev(_7));
+            txt: _4,
+            loc: rhs_loc(4)
+          }, Stdlib__List.rev(_7));
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -21117,132 +21117,132 @@ const yyact = [
         not_expecting(2, "nonrec flag");
       }
       return mk$20(_8, symbol_docs(undefined), _3, _6, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, Stdlib__List.rev(_7));
+            txt: _4,
+            loc: rhs_loc(4)
+          }, Stdlib__List.rev(_7));
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return decl(symbol_rloc(undefined), _3, undefined, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _2[0], _2[1], {
-                  txt: _1,
-                  loc: rhs_loc(1)
-                });
+            txt: _1,
+            loc: rhs_loc(1)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return decl(symbol_rloc(undefined), _4, undefined, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _3[0], _3[1], {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return rebind(symbol_rloc(undefined), _4, undefined, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), {
-                  txt: _1,
-                  loc: rhs_loc(1)
-                }, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                });
+            txt: _1,
+            loc: rhs_loc(1)
+          }, {
+            txt: _3,
+            loc: rhs_loc(3)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return rebind(symbol_rloc(undefined), _5, undefined, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          }, {
+            txt: _4,
+            loc: rhs_loc(4)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -21252,58 +21252,58 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       const rhs = last$1(_3);
       return {
-              TAG: /* Pwith_type */0,
-              _0: {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _1: mk$19(symbol_rloc(undefined), undefined, undefined, undefined, _2, Stdlib__List.rev(_6), undefined, _4, _5, {
-                    txt: rhs,
-                    loc: rhs_loc(3)
-                  })
-            };
+        TAG: /* Pwith_type */0,
+        _0: {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _1: mk$19(symbol_rloc(undefined), undefined, undefined, undefined, _2, Stdlib__List.rev(_6), undefined, _4, _5, {
+              txt: rhs,
+              loc: rhs_loc(3)
+            })
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Pwith_typesubst */2,
-              _0: mk$19(symbol_rloc(undefined), undefined, undefined, undefined, _2, undefined, undefined, undefined, _5, {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  })
-            };
+        TAG: /* Pwith_typesubst */2,
+        _0: mk$19(symbol_rloc(undefined), undefined, undefined, undefined, _2, undefined, undefined, undefined, _5, {
+              txt: _3,
+              loc: rhs_loc(3)
+            })
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Pwith_module */1,
-              _0: {
-                txt: _2,
-                loc: rhs_loc(2)
-              },
-              _1: {
-                txt: _4,
-                loc: rhs_loc(4)
-              }
-            };
+        TAG: /* Pwith_module */1,
+        _0: {
+          txt: _2,
+          loc: rhs_loc(2)
+        },
+        _1: {
+          txt: _4,
+          loc: rhs_loc(4)
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Pwith_modsubst */3,
-              _0: {
-                txt: _2,
-                loc: rhs_loc(2)
-              },
-              _1: {
-                txt: _4,
-                loc: rhs_loc(4)
-              }
-            };
+        TAG: /* Pwith_modsubst */3,
+        _0: {
+          txt: _2,
+          loc: rhs_loc(2)
+        },
+        _1: {
+          txt: _4,
+          loc: rhs_loc(4)
+        }
+      };
     }),
   (function (__caml_parser_env) {
       return /* Public */1;
@@ -21314,17 +21314,17 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: /* [] */0
-            };
+        hd: _2,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -21333,10 +21333,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_poly */8,
-                  _0: Stdlib__List.rev(_1),
-                  _1: _3
-                });
+            TAG: /* Ptyp_poly */8,
+            _0: Stdlib__List.rev(_1),
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -21345,10 +21345,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_poly */8,
-                  _0: Stdlib__List.rev(_1),
-                  _1: _3
-                });
+            TAG: /* Ptyp_poly */8,
+            _0: Stdlib__List.rev(_1),
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -21365,10 +21365,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_alias */6,
-                  _0: _1,
-                  _1: _4
-                });
+            TAG: /* Ptyp_alias */6,
+            _0: _1,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -21378,43 +21378,43 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_arrow */1,
-                  _0: "?" + _2,
-                  _1: mkoption(_4),
-                  _2: _6
-                });
+            TAG: /* Ptyp_arrow */1,
+            _0: "?" + _2,
+            _1: mkoption(_4),
+            _2: _6
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_arrow */1,
-                  _0: "?" + _1,
-                  _1: mkoption(_2),
-                  _2: _4
-                });
+            TAG: /* Ptyp_arrow */1,
+            _0: "?" + _1,
+            _1: mkoption(_2),
+            _2: _4
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_arrow */1,
-                  _0: _1,
-                  _1: _3,
-                  _2: _5
-                });
+            TAG: /* Ptyp_arrow */1,
+            _0: _1,
+            _1: _3,
+            _2: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_arrow */1,
-                  _0: "",
-                  _1: _1,
-                  _2: _3
-                });
+            TAG: /* Ptyp_arrow */1,
+            _0: "",
+            _1: _1,
+            _2: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -21424,14 +21424,14 @@ const yyact = [
       if (_2) {
         if (_2.tl) {
           throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.Parse_error, {
-                    MEL_EXN_ID: Stdlib__Parsing.Parse_error
-                  });
+                MEL_EXN_ID: Stdlib__Parsing.Parse_error
+              });
         }
         return _2.hd;
       }
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.Parse_error, {
-                MEL_EXN_ID: Stdlib__Parsing.Parse_error
-              });
+            MEL_EXN_ID: Stdlib__Parsing.Parse_error
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -21441,21 +21441,21 @@ const yyact = [
       if (_2) {
         if (_2.tl) {
           throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.Parse_error, {
-                    MEL_EXN_ID: Stdlib__Parsing.Parse_error
-                  });
+                MEL_EXN_ID: Stdlib__Parsing.Parse_error
+              });
         }
         return _2.hd;
       }
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.Parse_error, {
-                MEL_EXN_ID: Stdlib__Parsing.Parse_error
-              });
+            MEL_EXN_ID: Stdlib__Parsing.Parse_error
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_var */0,
-                  _0: _2
-                });
+            TAG: /* Ptyp_var */0,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       return mktyp(/* Ptyp_any */0);
@@ -21463,242 +21463,242 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_constr */3,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: /* [] */0
-                });
+            TAG: /* Ptyp_constr */3,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_constr */3,
-                  _0: {
-                    txt: _2,
-                    loc: rhs_loc(2)
-                  },
-                  _1: {
-                    hd: _1,
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Ptyp_constr */3,
+            _0: {
+              txt: _2,
+              loc: rhs_loc(2)
+            },
+            _1: {
+              hd: _1,
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_constr */3,
-                  _0: {
-                    txt: _4,
-                    loc: rhs_loc(4)
-                  },
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Ptyp_constr */3,
+            _0: {
+              txt: _4,
+              loc: rhs_loc(4)
+            },
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_object */4,
-                  _0: _2[0],
-                  _1: _2[1]
-                });
+            TAG: /* Ptyp_object */4,
+            _0: _2[0],
+            _1: _2[1]
+          });
     }),
   (function (__caml_parser_env) {
       return mktyp({
-                  TAG: /* Ptyp_object */4,
-                  _0: /* [] */0,
-                  _1: /* Closed */0
-                });
+            TAG: /* Ptyp_object */4,
+            _0: /* [] */0,
+            _1: /* Closed */0
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_class */5,
-                  _0: {
-                    txt: _2,
-                    loc: rhs_loc(2)
-                  },
-                  _1: /* [] */0
-                });
+            TAG: /* Ptyp_class */5,
+            _0: {
+              txt: _2,
+              loc: rhs_loc(2)
+            },
+            _1: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_class */5,
-                  _0: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  },
-                  _1: {
-                    hd: _1,
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Ptyp_class */5,
+            _0: {
+              txt: _3,
+              loc: rhs_loc(3)
+            },
+            _1: {
+              hd: _1,
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_class */5,
-                  _0: {
-                    txt: _5,
-                    loc: rhs_loc(5)
-                  },
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Ptyp_class */5,
+            _0: {
+              txt: _5,
+              loc: rhs_loc(5)
+            },
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: {
-                    hd: _2,
-                    tl: /* [] */0
-                  },
-                  _1: /* Closed */0,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: {
+              hd: _2,
+              tl: /* [] */0
+            },
+            _1: /* Closed */0,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: Stdlib__List.rev(_3),
-                  _1: /* Closed */0,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: Stdlib__List.rev(_3),
+            _1: /* Closed */0,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: {
-                    hd: _2,
-                    tl: Stdlib__List.rev(_4)
-                  },
-                  _1: /* Closed */0,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: {
+              hd: _2,
+              tl: Stdlib__List.rev(_4)
+            },
+            _1: /* Closed */0,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: Stdlib__List.rev(_3),
-                  _1: /* Open */1,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: Stdlib__List.rev(_3),
+            _1: /* Open */1,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: /* [] */0,
-                  _1: /* Open */1,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: /* [] */0,
+            _1: /* Open */1,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: Stdlib__List.rev(_3),
-                  _1: /* Closed */0,
-                  _2: /* [] */0
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: Stdlib__List.rev(_3),
+            _1: /* Closed */0,
+            _2: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: Stdlib__List.rev(_3),
-                  _1: /* Closed */0,
-                  _2: Stdlib__List.rev(_5)
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: Stdlib__List.rev(_3),
+            _1: /* Closed */0,
+            _2: Stdlib__List.rev(_5)
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_package */9,
-                  _0: _3
-                });
+            TAG: /* Ptyp_package */9,
+            _0: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_extension */10,
-                  _0: _1
-                });
+            TAG: /* Ptyp_extension */10,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              /* [] */0
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        /* [] */0
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              _3
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _2,
-                loc: rhs_loc(2)
-              },
-              _4
-            ];
+        {
+          txt: _2,
+          loc: rhs_loc(2)
+        },
+        _4
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _3
-            };
+        hd: _1,
+        tl: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -21706,9 +21706,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Rinherit */1,
-              _0: _1
-            };
+        TAG: /* Rinherit */1,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -21716,23 +21716,23 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Rtag */0,
-              _0: _1,
-              _1: _5,
-              _2: _3,
-              _3: Stdlib__List.rev(_4)
-            };
+        TAG: /* Rtag */0,
+        _0: _1,
+        _1: _5,
+        _2: _3,
+        _3: Stdlib__List.rev(_4)
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Rtag */0,
-              _0: _1,
-              _1: _2,
-              _2: true,
-              _3: /* [] */0
-            };
+        TAG: /* Rtag */0,
+        _0: _1,
+        _1: _2,
+        _2: true,
+        _3: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       return true;
@@ -21743,32 +21743,32 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -21777,12 +21777,12 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_tuple */2,
-                  _0: {
-                    hd: _1,
-                    tl: Stdlib__List.rev(_3)
-                  }
-                });
+            TAG: /* Ptyp_tuple */2,
+            _0: {
+              hd: _1,
+              tl: Stdlib__List.rev(_3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -21791,95 +21791,95 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_tuple */2,
-                  _0: {
-                    hd: _1,
-                    tl: Stdlib__List.rev(_3)
-                  }
-                });
+            TAG: /* Ptyp_tuple */2,
+            _0: {
+              hd: _1,
+              tl: Stdlib__List.rev(_3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: _3[0]
-              },
-              _3[1]
-            ];
+        {
+          hd: _1,
+          tl: _3[0]
+        },
+        _3[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: /* [] */0
-              },
-              /* Closed */0
-            ];
+        {
+          hd: _1,
+          tl: /* [] */0
+        },
+        /* Closed */0
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* [] */0,
-              /* Open */1
-            ];
+        /* [] */0,
+        /* Open */1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _4,
-              _3
-            ];
+        _1,
+        _4,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -21887,52 +21887,52 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int */0,
-              _0: _1
-            };
+        TAG: /* Const_int */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_char */1,
-              _0: _1
-            };
+        TAG: /* Const_char */1,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_string */2,
-              _0: _1[0],
-              _1: _1[1]
-            };
+        TAG: /* Const_string */2,
+        _0: _1[0],
+        _1: _1[1]
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_float */3,
-              _0: _1
-            };
+        TAG: /* Const_float */3,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int32 */4,
-              _0: _1
-            };
+        TAG: /* Const_int32 */4,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int64 */5,
-              _0: _1
-            };
+        TAG: /* Const_int64 */5,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_nativeint */6,
-              _0: _1
-            };
+        TAG: /* Const_nativeint */6,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -21940,72 +21940,72 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int */0,
-              _0: -_2 | 0
-            };
+        TAG: /* Const_int */0,
+        _0: -_2 | 0
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_float */3,
-              _0: "-" + _2
-            };
+        TAG: /* Const_float */3,
+        _0: "-" + _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int32 */4,
-              _0: -_2 | 0
-            };
+        TAG: /* Const_int32 */4,
+        _0: -_2 | 0
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int64 */5,
-              _0: Caml_int64.neg(_2)
-            };
+        TAG: /* Const_int64 */5,
+        _0: Caml_int64.neg(_2)
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_nativeint */6,
-              _0: Caml_external_polyfill.resolve("nativeint_neg")(_2)
-            };
+        TAG: /* Const_nativeint */6,
+        _0: Caml_external_polyfill.resolve("nativeint_neg")(_2)
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int */0,
-              _0: _2
-            };
+        TAG: /* Const_int */0,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_float */3,
-              _0: _2
-            };
+        TAG: /* Const_float */3,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int32 */4,
-              _0: _2
-            };
+        TAG: /* Const_int32 */4,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int64 */5,
-              _0: _2
-            };
+        TAG: /* Const_int64 */5,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_nativeint */6,
-              _0: _2
-            };
+        TAG: /* Const_nativeint */6,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -22116,253 +22116,253 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Lident */0,
-              _0: "[]"
-            };
+        TAG: /* Lident */0,
+        _0: "[]"
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Lident */0,
-              _0: "()"
-            };
+        TAG: /* Lident */0,
+        _0: "()"
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Lident */0,
-              _0: "false"
-            };
+        TAG: /* Lident */0,
+        _0: "false"
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Lident */0,
-              _0: "true"
-            };
+        TAG: /* Lident */0,
+        _0: "true"
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       if (applicative_functors.contents) {
         return {
-                TAG: /* Lapply */2,
-                _0: _1,
-                _1: _3
-              };
+          TAG: /* Lapply */2,
+          _0: _1,
+          _1: _3
+        };
       }
       throw new Caml_js_exceptions.MelangeError($$Error$3, {
-                MEL_EXN_ID: $$Error$3,
-                _1: {
-                  TAG: /* Applicative_path */3,
-                  _0: symbol_rloc(undefined)
-                }
-              });
+            MEL_EXN_ID: $$Error$3,
+            _1: {
+              TAG: /* Applicative_path */3,
+              _0: symbol_rloc(undefined)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: /* Pdir_none */0
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: /* Pdir_none */0
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_string */0,
-                _0: _3[0]
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_string */0,
+          _0: _3[0]
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_int */1,
-                _0: _3
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_int */1,
+          _0: _3
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_ident */2,
-                _0: _3
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_ident */2,
+          _0: _3
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_ident */2,
-                _0: _3
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_ident */2,
+          _0: _3
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_bool */3,
-                _0: false
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_bool */3,
+          _0: false
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_bool */3,
-                _0: true
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_bool */3,
+          _0: true
+        }
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -22405,33 +22405,33 @@ const yyact = [
     }),
   (function (__caml_parser_env) {
       return [
-              /* Public */1,
-              /* Concrete */1
-            ];
+        /* Public */1,
+        /* Concrete */1
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Private */0,
-              /* Concrete */1
-            ];
+        /* Private */0,
+        /* Concrete */1
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Public */1,
-              /* Virtual */0
-            ];
+        /* Public */1,
+        /* Virtual */0
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Private */0,
-              /* Virtual */0
-            ];
+        /* Private */0,
+        /* Virtual */0
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Private */0,
-              /* Virtual */0
-            ];
+        /* Private */0,
+        /* Virtual */0
+      ];
     }),
   (function (__caml_parser_env) {
       return /* Fresh */1;
@@ -22616,41 +22616,41 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              txt: _1,
-              loc: symbol_rloc(undefined)
-            };
+        txt: _1,
+        loc: symbol_rloc(undefined)
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              txt: _1 + ("." + _3.txt),
-              loc: symbol_rloc(undefined)
-            };
+        txt: _1 + ("." + _3.txt),
+        loc: symbol_rloc(undefined)
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -22659,9 +22659,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -22670,123 +22670,123 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       return [
-              undefined,
-              /* [] */0
-            ];
+        undefined,
+        /* [] */0
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              undefined,
-              {
-                hd: _1,
-                tl: _2
-              }
-            ];
+        undefined,
+        {
+          hd: _1,
+          tl: _2
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* PStr */0,
-              _0: _1
-            };
+        TAG: /* PStr */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* PTyp */1,
-              _0: _2
-            };
+        TAG: /* PTyp */1,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* PPat */2,
-              _0: _2,
-              _1: undefined
-            };
+        TAG: /* PPat */2,
+        _0: _2,
+        _1: undefined
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* PPat */2,
-              _0: _2,
-              _1: _4
-            };
+        TAG: /* PPat */2,
+        _0: _2,
+        _1: _4
+      };
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     })
 ];
 
@@ -22853,14 +22853,14 @@ function assert_same_type(lexbuf, x, y) {
   const rhs = type_of_directive(y);
   if (lhs !== rhs) {
     throw new Caml_js_exceptions.MelangeError($$Error$4, {
-              MEL_EXN_ID: $$Error$4,
-              _1: {
-                TAG: /* Conditional_expr_expected_type */7,
-                _0: lhs,
-                _1: rhs
-              },
-              _2: curr(lexbuf)
-            });
+          MEL_EXN_ID: $$Error$4,
+          _1: {
+            TAG: /* Conditional_expr_expected_type */7,
+            _0: lhs,
+            _1: rhs
+          },
+          _2: curr(lexbuf)
+        });
   }
   return y;
 }
@@ -22922,23 +22922,23 @@ function semantic_version_parse(str, start, last_index) {
       const start = _start;
       if (start > last_index) {
         return [
-                acc,
-                start
-              ];
+          acc,
+          start
+        ];
       }
       const c = str.charCodeAt(start);
       if (c === /* '.' */46) {
         return [
-                acc,
-                start + 1 | 0
-              ];
+          acc,
+          start + 1 | 0
+        ];
       }
       const v = c - /* '0' */48 | 0;
       if (!(v >= 0 && v <= 9)) {
         return [
-                acc,
-                start
-              ];
+          acc,
+          start
+        ];
       }
       _acc = Math.imul(acc, 10) + v | 0;
       _start = start + 1 | 0;
@@ -22951,13 +22951,13 @@ function semantic_version_parse(str, start, last_index) {
   const patch_end = match$2[1];
   const additional = Stdlib__String.sub(str, patch_end, (last_index - patch_end | 0) + 1 | 0);
   return [
-          [
-            match[0],
-            match$1[0],
-            match$2[0]
-          ],
-          additional
-        ];
+    [
+      match[0],
+      match$1[0],
+      match$2[0]
+    ],
+    additional
+  ];
 }
 
 function defined(str) {
@@ -22999,38 +22999,38 @@ function query(loc, str) {
         const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
         if (exn$1.MEL_EXN_ID === Stdlib.Not_found) {
           return {
-                  TAG: /* Dir_bool */0,
-                  _0: false
-                };
+            TAG: /* Dir_bool */0,
+            _0: false
+          };
         }
         throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
       }
       if (exit === 2) {
         try {
           return {
-                  TAG: /* Dir_bool */0,
-                  _0: Stdlib.bool_of_string(v$1)
-                };
+            TAG: /* Dir_bool */0,
+            _0: Stdlib.bool_of_string(v$1)
+          };
         }
         catch (exn$2){
           try {
             return {
-                    TAG: /* Dir_int */2,
-                    _0: Caml_format.caml_int_of_string(v$1)
-                  };
+              TAG: /* Dir_int */2,
+              _0: Caml_format.caml_int_of_string(v$1)
+            };
           }
           catch (exn$3){
             try {
               return {
-                      TAG: /* Dir_float */1,
-                      _0: Caml_format.caml_float_of_string(v$1)
-                    };
+                TAG: /* Dir_float */1,
+                _0: Caml_format.caml_float_of_string(v$1)
+              };
             }
             catch (exn$4){
               return {
-                      TAG: /* Dir_string */3,
-                      _0: v$1
-                    };
+                TAG: /* Dir_string */3,
+                _0: v$1
+              };
             }
           }
         }
@@ -23042,9 +23042,9 @@ function query(loc, str) {
   }
   if (/* tag */typeof v === "number" || typeof v === "string") {
     return {
-            TAG: /* Dir_bool */0,
-            _0: false
-          };
+      TAG: /* Dir_bool */0,
+      _0: false
+    };
   } else {
     return v;
   }
@@ -23055,46 +23055,46 @@ function value_of_token(loc, t) {
     switch (t) {
       case /* FALSE */29 :
           return {
-                  TAG: /* Dir_bool */0,
-                  _0: false
-                };
+            TAG: /* Dir_bool */0,
+            _0: false
+          };
       case /* TRUE */91 :
           return {
-                  TAG: /* Dir_bool */0,
-                  _0: true
-                };
+            TAG: /* Dir_bool */0,
+            _0: true
+          };
       default:
         throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                  MEL_EXN_ID: $$Error$4,
-                  _1: /* Unexpected_token_in_conditional */4,
-                  _2: loc
-                });
+              MEL_EXN_ID: $$Error$4,
+              _1: /* Unexpected_token_in_conditional */4,
+              _2: loc
+            });
     }
   } else {
     switch (t.TAG) {
       case /* FLOAT */1 :
           return {
-                  TAG: /* Dir_float */1,
-                  _0: Caml_format.caml_float_of_string(t._0)
-                };
+            TAG: /* Dir_float */1,
+            _0: Caml_format.caml_float_of_string(t._0)
+          };
       case /* INT */7 :
           return {
-                  TAG: /* Dir_int */2,
-                  _0: t._0
-                };
+            TAG: /* Dir_int */2,
+            _0: t._0
+          };
       case /* STRING */16 :
           return {
-                  TAG: /* Dir_string */3,
-                  _0: t._0[0]
-                };
+            TAG: /* Dir_string */3,
+            _0: t._0[0]
+          };
       case /* UIDENT */17 :
           return query(loc, t._0);
       default:
         throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                  MEL_EXN_ID: $$Error$4,
-                  _1: /* Unexpected_token_in_conditional */4,
-                  _2: loc
-                });
+              MEL_EXN_ID: $$Error$4,
+              _1: /* Unexpected_token_in_conditional */4,
+              _2: loc
+            });
     }
   }
 }
@@ -23116,10 +23116,10 @@ function directive_parse(token_with_comments, lexbuf) {
         switch (t) {
           case /* EOF */25 :
               throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                        MEL_EXN_ID: $$Error$4,
-                        _1: /* Unterminated_if */2,
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$4,
+                    _1: /* Unterminated_if */2,
+                    _2: curr(lexbuf)
+                  });
           case /* EOL */100 :
               _param = undefined;
               continue ;
@@ -23141,13 +23141,13 @@ function directive_parse(token_with_comments, lexbuf) {
   const push = function (e) {
     if (look_ahead.contents !== undefined) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  24607,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              24607,
+              4
+            ]
+          });
     }
     look_ahead.contents = e;
   };
@@ -23189,13 +23189,13 @@ function directive_parse(token_with_comments, lexbuf) {
                   const last_index = str.length - 1 | 0;
                   if (last_index < 0) {
                     throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                              MEL_EXN_ID: $$Error$4,
-                              _1: {
-                                TAG: /* Illegal_semver */6,
-                                _0: str
-                              },
-                              _2: curr_loc
-                            });
+                          MEL_EXN_ID: $$Error$4,
+                          _1: {
+                            TAG: /* Illegal_semver */6,
+                            _0: str
+                          },
+                          _2: curr_loc
+                        });
                   }
                   const v = str.charCodeAt(0);
                   let match;
@@ -23215,13 +23215,13 @@ function directive_parse(token_with_comments, lexbuf) {
                         case 60 :
                             if (last_index === 0) {
                               throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                        MEL_EXN_ID: $$Error$4,
-                                        _1: {
-                                          TAG: /* Illegal_semver */6,
-                                          _0: str
-                                        },
-                                        _2: curr_loc
-                                      });
+                                    MEL_EXN_ID: $$Error$4,
+                                    _1: {
+                                      TAG: /* Illegal_semver */6,
+                                      _0: str
+                                    },
+                                    _2: curr_loc
+                                  });
                             }
                             match = str[1] === "=" ? [
                                 "Le",
@@ -23237,13 +23237,13 @@ function directive_parse(token_with_comments, lexbuf) {
                         case 62 :
                             if (last_index === 0) {
                               throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                        MEL_EXN_ID: $$Error$4,
-                                        _1: {
-                                          TAG: /* Illegal_semver */6,
-                                          _0: str
-                                        },
-                                        _2: curr_loc
-                                      });
+                                    MEL_EXN_ID: $$Error$4,
+                                    _1: {
+                                      TAG: /* Illegal_semver */6,
+                                      _0: str
+                                    },
+                                    _2: curr_loc
+                                  });
                             }
                             match = str[1] === "=" ? [
                                 "Ge",
@@ -23303,27 +23303,27 @@ function directive_parse(token_with_comments, lexbuf) {
               }
               if (exit$2 === 3) {
                 throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                          MEL_EXN_ID: $$Error$4,
-                          _1: {
-                            TAG: /* Conditional_expr_expected_type */7,
-                            _0: /* Dir_type_string */3,
-                            _1: type_of_directive(lhs)
-                          },
-                          _2: curr(lexbuf)
-                        });
+                      MEL_EXN_ID: $$Error$4,
+                      _1: {
+                        TAG: /* Conditional_expr_expected_type */7,
+                        _0: /* Dir_type_string */3,
+                        _1: type_of_directive(lhs)
+                      },
+                      _2: curr(lexbuf)
+                    });
               }
               
             }
             if (exit$1 === 2) {
               throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                        MEL_EXN_ID: $$Error$4,
-                        _1: {
-                          TAG: /* Conditional_expr_expected_type */7,
-                          _0: /* Dir_type_string */3,
-                          _1: type_of_directive(lhs)
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$4,
+                    _1: {
+                      TAG: /* Conditional_expr_expected_type */7,
+                      _0: /* Dir_type_string */3,
+                      _1: type_of_directive(lhs)
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             break;
         case "<=" :
@@ -23368,13 +23368,13 @@ function directive_parse(token_with_comments, lexbuf) {
       }
       if (exit$4 === 2) {
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/ocaml_typedtree_test.ml",
-                    24626,
-                    17
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/ocaml_typedtree_test.ml",
+                24626,
+                17
+              ]
+            });
       }
       const curr_loc$1 = curr(lexbuf);
       const rhs$1 = value_of_token(curr_loc$1, token(undefined));
@@ -23420,58 +23420,58 @@ function directive_parse(token_with_comments, lexbuf) {
                 return v;
               }
               throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                        MEL_EXN_ID: $$Error$4,
-                        _1: /* Unterminated_paren_in_conditional */1,
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$4,
+                    _1: /* Unterminated_paren_in_conditional */1,
+                    _2: curr(lexbuf)
+                  });
             } else {
               throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                        MEL_EXN_ID: $$Error$4,
-                        _1: /* Unterminated_paren_in_conditional */1,
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$4,
+                    _1: /* Unterminated_paren_in_conditional */1,
+                    _2: curr(lexbuf)
+                  });
             }
         case /* TRUE */91 :
             return true;
         default:
           throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                    MEL_EXN_ID: $$Error$4,
-                    _1: /* Unexpected_token_in_conditional */4,
-                    _2: curr_loc
-                  });
+                MEL_EXN_ID: $$Error$4,
+                _1: /* Unexpected_token_in_conditional */4,
+                _2: curr_loc
+              });
       }
     } else {
       switch (curr_token.TAG) {
         case /* FLOAT */1 :
             return token_op(calc, (function (e) {
-                          throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                    MEL_EXN_ID: $$Error$4,
-                                    _1: {
-                                      TAG: /* Conditional_expr_expected_type */7,
-                                      _0: /* Dir_type_bool */0,
-                                      _1: /* Dir_type_float */1
-                                    },
-                                    _2: curr_loc
-                                  });
-                        }), {
-                        TAG: /* Dir_float */1,
-                        _0: Caml_format.caml_float_of_string(curr_token._0)
-                      });
+                    throw new Caml_js_exceptions.MelangeError($$Error$4, {
+                          MEL_EXN_ID: $$Error$4,
+                          _1: {
+                            TAG: /* Conditional_expr_expected_type */7,
+                            _0: /* Dir_type_bool */0,
+                            _1: /* Dir_type_float */1
+                          },
+                          _2: curr_loc
+                        });
+                  }), {
+                  TAG: /* Dir_float */1,
+                  _0: Caml_format.caml_float_of_string(curr_token._0)
+                });
         case /* INT */7 :
             return token_op(calc, (function (e) {
-                          throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                    MEL_EXN_ID: $$Error$4,
-                                    _1: {
-                                      TAG: /* Conditional_expr_expected_type */7,
-                                      _0: /* Dir_type_bool */0,
-                                      _1: /* Dir_type_int */2
-                                    },
-                                    _2: curr_loc
-                                  });
-                        }), {
-                        TAG: /* Dir_int */2,
-                        _0: curr_token._0
-                      });
+                    throw new Caml_js_exceptions.MelangeError($$Error$4, {
+                          MEL_EXN_ID: $$Error$4,
+                          _1: {
+                            TAG: /* Conditional_expr_expected_type */7,
+                            _0: /* Dir_type_bool */0,
+                            _1: /* Dir_type_int */2
+                          },
+                          _2: curr_loc
+                        });
+                  }), {
+                  TAG: /* Dir_int */2,
+                  _0: curr_token._0
+                });
         case /* LIDENT */11 :
             const r = curr_token._0;
             switch (r) {
@@ -23480,19 +23480,19 @@ function directive_parse(token_with_comments, lexbuf) {
                   break;
               default:
                 throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                          MEL_EXN_ID: $$Error$4,
-                          _1: /* Unexpected_token_in_conditional */4,
-                          _2: curr_loc
-                        });
+                      MEL_EXN_ID: $$Error$4,
+                      _1: /* Unexpected_token_in_conditional */4,
+                      _2: curr_loc
+                    });
             }
             const t = token(undefined);
             const loc = curr(lexbuf);
             if (/* tag */typeof t === "number" || typeof t === "string") {
               throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                        MEL_EXN_ID: $$Error$4,
-                        _1: /* Unexpected_token_in_conditional */4,
-                        _2: loc
-                      });
+                    MEL_EXN_ID: $$Error$4,
+                    _1: /* Unexpected_token_in_conditional */4,
+                    _2: loc
+                  });
             }
             if (t.TAG === /* UIDENT */17) {
               const s = t._0;
@@ -23507,50 +23507,50 @@ function directive_parse(token_with_comments, lexbuf) {
               }
             }
             throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                      MEL_EXN_ID: $$Error$4,
-                      _1: /* Unexpected_token_in_conditional */4,
-                      _2: loc
-                    });
+                  MEL_EXN_ID: $$Error$4,
+                  _1: /* Unexpected_token_in_conditional */4,
+                  _2: loc
+                });
             break;
         case /* STRING */16 :
             return token_op(calc, (function (e) {
-                          throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                    MEL_EXN_ID: $$Error$4,
-                                    _1: {
-                                      TAG: /* Conditional_expr_expected_type */7,
-                                      _0: /* Dir_type_bool */0,
-                                      _1: /* Dir_type_string */3
-                                    },
-                                    _2: curr_loc
-                                  });
-                        }), {
-                        TAG: /* Dir_string */3,
-                        _0: curr_token._0[0]
-                      });
+                    throw new Caml_js_exceptions.MelangeError($$Error$4, {
+                          MEL_EXN_ID: $$Error$4,
+                          _1: {
+                            TAG: /* Conditional_expr_expected_type */7,
+                            _0: /* Dir_type_bool */0,
+                            _1: /* Dir_type_string */3
+                          },
+                          _2: curr_loc
+                        });
+                  }), {
+                  TAG: /* Dir_string */3,
+                  _0: curr_token._0[0]
+                });
         case /* UIDENT */17 :
             const value_v = query(curr_loc, curr_token._0);
             return token_op(calc, (function (e) {
-                          push(e);
-                          if (!/* tag */(typeof value_v === "number" || typeof value_v === "string") && value_v.TAG === /* Dir_bool */0) {
-                            return value_v._0;
-                          }
-                          const ty = type_of_directive(value_v);
-                          throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                    MEL_EXN_ID: $$Error$4,
-                                    _1: {
-                                      TAG: /* Conditional_expr_expected_type */7,
-                                      _0: /* Dir_type_bool */0,
-                                      _1: ty
-                                    },
-                                    _2: curr_loc
-                                  });
-                        }), value_v);
+                    push(e);
+                    if (!/* tag */(typeof value_v === "number" || typeof value_v === "string") && value_v.TAG === /* Dir_bool */0) {
+                      return value_v._0;
+                    }
+                    const ty = type_of_directive(value_v);
+                    throw new Caml_js_exceptions.MelangeError($$Error$4, {
+                          MEL_EXN_ID: $$Error$4,
+                          _1: {
+                            TAG: /* Conditional_expr_expected_type */7,
+                            _0: /* Dir_type_bool */0,
+                            _1: ty
+                          },
+                          _2: curr_loc
+                        });
+                  }), value_v);
         default:
           throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                    MEL_EXN_ID: $$Error$4,
-                    _1: /* Unexpected_token_in_conditional */4,
-                    _2: curr_loc
-                  });
+                MEL_EXN_ID: $$Error$4,
+                _1: /* Unexpected_token_in_conditional */4,
+                _2: curr_loc
+              });
       }
     }
   };
@@ -23580,16 +23580,16 @@ function directive_parse(token_with_comments, lexbuf) {
       return v;
     }
     throw new Caml_js_exceptions.MelangeError($$Error$4, {
-              MEL_EXN_ID: $$Error$4,
-              _1: /* Expect_hash_then_in_conditional */5,
-              _2: curr(lexbuf)
-            });
+          MEL_EXN_ID: $$Error$4,
+          _1: /* Expect_hash_then_in_conditional */5,
+          _2: curr(lexbuf)
+        });
   } else {
     throw new Caml_js_exceptions.MelangeError($$Error$4, {
-              MEL_EXN_ID: $$Error$4,
-              _1: /* Expect_hash_then_in_conditional */5,
-              _2: curr(lexbuf)
-            });
+          MEL_EXN_ID: $$Error$4,
+          _1: /* Expect_hash_then_in_conditional */5,
+          _2: curr(lexbuf)
+        });
   }
 }
 
@@ -24040,9 +24040,9 @@ function with_comment_buffer(comment, lexbuf) {
     loc_ghost: loc_loc_ghost
   };
   return [
-          s,
-          loc
-        ];
+    s,
+    loc
+  ];
 }
 
 function char_for_backslash(c) {
@@ -24081,13 +24081,13 @@ function char_for_decimal_code(lexbuf, i) {
     return /* 'x' */120;
   }
   throw new Caml_js_exceptions.MelangeError($$Error$4, {
-            MEL_EXN_ID: $$Error$4,
-            _1: {
-              TAG: /* Illegal_escape */1,
-              _0: Stdlib__Lexing.lexeme(lexbuf)
-            },
-            _2: curr(lexbuf)
-          });
+        MEL_EXN_ID: $$Error$4,
+        _1: {
+          TAG: /* Illegal_escape */1,
+          _0: Stdlib__Lexing.lexeme(lexbuf)
+        },
+        _2: curr(lexbuf)
+      });
 }
 
 function char_for_hexadecimal_code(lexbuf, i) {
@@ -24116,13 +24116,13 @@ function cvt_int64_literal(s) {
 
 function cvt_nativeint_literal(s) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              24914,
-              30
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          24914,
+          30
+        ]
+      });
 }
 
 function remove_underscores(s) {
@@ -24157,13 +24157,13 @@ function get_label_name(lexbuf) {
   const name = Stdlib__String.sub(s, 1, s.length - 2 | 0);
   if (Stdlib__Hashtbl.mem(keyword_table, name)) {
     throw new Caml_js_exceptions.MelangeError($$Error$4, {
-              MEL_EXN_ID: $$Error$4,
-              _1: {
-                TAG: /* Keyword_as_label */4,
-                _0: name
-              },
-              _2: curr(lexbuf)
-            });
+          MEL_EXN_ID: $$Error$4,
+          _1: {
+            TAG: /* Keyword_as_label */4,
+            _0: name
+          },
+          _2: curr(lexbuf)
+        });
   }
   return name;
 }
@@ -24210,217 +24210,217 @@ function report_error$2(ppf, c) {
     switch (c) {
       case /* Unterminated_string */0 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "String literal not terminated",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "String literal not terminated"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "String literal not terminated",
+                  _1: /* End_of_format */0
+                },
+                _1: "String literal not terminated"
+              });
       case /* Unterminated_paren_in_conditional */1 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Unterminated parens in conditional predicate",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Unterminated parens in conditional predicate"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Unterminated parens in conditional predicate",
+                  _1: /* End_of_format */0
+                },
+                _1: "Unterminated parens in conditional predicate"
+              });
       case /* Unterminated_if */2 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "#if not terminated",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "#if not terminated"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "#if not terminated",
+                  _1: /* End_of_format */0
+                },
+                _1: "#if not terminated"
+              });
       case /* Unterminated_else */3 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "#else not terminated",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "#else not terminated"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "#else not terminated",
+                  _1: /* End_of_format */0
+                },
+                _1: "#else not terminated"
+              });
       case /* Unexpected_token_in_conditional */4 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Unexpected token in conditional predicate",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Unexpected token in conditional predicate"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Unexpected token in conditional predicate",
+                  _1: /* End_of_format */0
+                },
+                _1: "Unexpected token in conditional predicate"
+              });
       case /* Expect_hash_then_in_conditional */5 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Expect `then` after conditional predicate",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Expect `then` after conditional predicate"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Expect `then` after conditional predicate",
+                  _1: /* End_of_format */0
+                },
+                _1: "Expect `then` after conditional predicate"
+              });
       case /* Unexpected_directive */6 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Unexpected directive",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Unexpected directive"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Unexpected directive",
+                  _1: /* End_of_format */0
+                },
+                _1: "Unexpected directive"
+              });
       
     }
   } else {
     switch (c.TAG) {
       case /* Illegal_character */0 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Illegal character (",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ')' */41,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "Illegal character (%s)"
-                        }), Stdlib__Char.escaped(c._0));
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Illegal character (",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ')' */41,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "Illegal character (%s)"
+                  }), Stdlib__Char.escaped(c._0));
       case /* Illegal_escape */1 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Illegal backslash escape in string or character (",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ')' */41,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "Illegal backslash escape in string or character (%s)"
-                        }), c._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Illegal backslash escape in string or character (",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ')' */41,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "Illegal backslash escape in string or character (%s)"
+                  }), c._0);
       case /* Unterminated_comment */2 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Comment not terminated",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Comment not terminated"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Comment not terminated",
+                  _1: /* End_of_format */0
+                },
+                _1: "Comment not terminated"
+              });
       case /* Unterminated_string_in_comment */3 :
           return Curry._2(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "This comment contains an unterminated string literal",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: /* Flush_newline */4,
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
                             TAG: /* String_literal */11,
-                            _0: "This comment contains an unterminated string literal",
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: /* Flush_newline */4,
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "String literal begins here",
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          },
-                          _1: "This comment contains an unterminated string literal@.%aString literal begins here"
-                        }), print_error, c._1);
+                            _0: "String literal begins here",
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "This comment contains an unterminated string literal@.%aString literal begins here"
+                  }), print_error, c._1);
       case /* Keyword_as_label */4 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '`' */96,
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: "' is a keyword, it cannot be used as label name",
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "`%s' is a keyword, it cannot be used as label name"
-                        }), c._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '`' */96,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: "' is a keyword, it cannot be used as label name",
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "`%s' is a keyword, it cannot be used as label name"
+                  }), c._0);
       case /* Literal_overflow */5 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Integer literal exceeds the range of representable integers of type ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          },
-                          _1: "Integer literal exceeds the range of representable integers of type %s"
-                        }), c._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Integer literal exceeds the range of representable integers of type ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
+                      }
+                    },
+                    _1: "Integer literal exceeds the range of representable integers of type %s"
+                  }), c._0);
       case /* Illegal_semver */6 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Illegal semantic version string ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          },
-                          _1: "Illegal semantic version string %s"
-                        }), c._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Illegal semantic version string ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
+                      }
+                    },
+                    _1: "Illegal semantic version string %s"
+                  }), c._0);
       case /* Conditional_expr_expected_type */7 :
           return Curry._2(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Conditional expression type mismatch (",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Conditional expression type mismatch (",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ',' */44,
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ',' */44,
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* Char_literal */12,
-                                    _0: /* ')' */41,
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* Char_literal */12,
+                              _0: /* ')' */41,
+                              _1: /* End_of_format */0
                             }
-                          },
-                          _1: "Conditional expression type mismatch (%s,%s)"
-                        }), string_of_type_directive(c._0), string_of_type_directive(c._1));
+                          }
+                        }
+                      }
+                    },
+                    _1: "Conditional expression type mismatch (%s,%s)"
+                  }), string_of_type_directive(c._0), string_of_type_directive(c._1));
       
     }
   }
@@ -24457,13 +24457,13 @@ function token(lexbuf) {
       case 0 :
           if (!escaped_newlines.contents) {
             throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                      MEL_EXN_ID: $$Error$4,
-                      _1: {
-                        TAG: /* Illegal_character */0,
-                        _0: Stdlib__Lexing.lexeme_char(lexbuf, 0)
-                      },
-                      _2: curr(lexbuf)
-                    });
+                  MEL_EXN_ID: $$Error$4,
+                  _1: {
+                    TAG: /* Illegal_character */0,
+                    _0: Stdlib__Lexing.lexeme_char(lexbuf, 0)
+                  },
+                  _2: curr(lexbuf)
+                });
           }
           update_loc(lexbuf, undefined, 1, false, 0);
           return token(lexbuf);
@@ -24478,34 +24478,34 @@ function token(lexbuf) {
           return /* TILDE */89;
       case 5 :
           return {
-                  TAG: /* LABEL */10,
-                  _0: get_label_name(lexbuf)
-                };
+            TAG: /* LABEL */10,
+            _0: get_label_name(lexbuf)
+          };
       case 6 :
           prerr_warning(curr(lexbuf), {
                 TAG: /* Deprecated */0,
                 _0: "ISO-Latin1 characters in identifiers"
               });
           return {
-                  TAG: /* LABEL */10,
-                  _0: get_label_name(lexbuf)
-                };
+            TAG: /* LABEL */10,
+            _0: get_label_name(lexbuf)
+          };
       case 7 :
           return /* QUESTION */76;
       case 8 :
           return {
-                  TAG: /* OPTLABEL */13,
-                  _0: get_label_name(lexbuf)
-                };
+            TAG: /* OPTLABEL */13,
+            _0: get_label_name(lexbuf)
+          };
       case 9 :
           prerr_warning(curr(lexbuf), {
                 TAG: /* Deprecated */0,
                 _0: "ISO-Latin1 characters in identifiers"
               });
           return {
-                  TAG: /* OPTLABEL */13,
-                  _0: get_label_name(lexbuf)
-                };
+            TAG: /* OPTLABEL */13,
+            _0: get_label_name(lexbuf)
+          };
       case 10 :
           const s = Stdlib__Lexing.lexeme(lexbuf);
           try {
@@ -24515,9 +24515,9 @@ function token(lexbuf) {
             const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn.MEL_EXN_ID === Stdlib.Not_found) {
               return {
-                      TAG: /* LIDENT */11,
-                      _0: s
-                    };
+                TAG: /* LIDENT */11,
+                _0: s
+              };
             }
             throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
           }
@@ -24527,109 +24527,109 @@ function token(lexbuf) {
                 _0: "ISO-Latin1 characters in identifiers"
               });
           return {
-                  TAG: /* LIDENT */11,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* LIDENT */11,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 12 :
           return {
-                  TAG: /* UIDENT */17,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* UIDENT */17,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 13 :
           prerr_warning(curr(lexbuf), {
                 TAG: /* Deprecated */0,
                 _0: "ISO-Latin1 characters in identifiers"
               });
           return {
-                  TAG: /* UIDENT */17,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* UIDENT */17,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 14 :
           try {
             return {
-                    TAG: /* INT */7,
-                    _0: cvt_int_literal(Stdlib__Lexing.lexeme(lexbuf))
-                  };
+              TAG: /* INT */7,
+              _0: cvt_int_literal(Stdlib__Lexing.lexeme(lexbuf))
+            };
           }
           catch (raw_exn$1){
             const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
             if (exn$1.MEL_EXN_ID === Stdlib.Failure) {
               throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                        MEL_EXN_ID: $$Error$4,
-                        _1: {
-                          TAG: /* Literal_overflow */5,
-                          _0: "int"
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$4,
+                    _1: {
+                      TAG: /* Literal_overflow */5,
+                      _0: "int"
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
           }
       case 15 :
           return {
-                  TAG: /* FLOAT */1,
-                  _0: remove_underscores(Stdlib__Lexing.lexeme(lexbuf))
-                };
+            TAG: /* FLOAT */1,
+            _0: remove_underscores(Stdlib__Lexing.lexeme(lexbuf))
+          };
       case 16 :
           try {
             return {
-                    TAG: /* INT32 */8,
-                    _0: cvt_int32_literal(Stdlib__Lexing.lexeme(lexbuf))
-                  };
+              TAG: /* INT32 */8,
+              _0: cvt_int32_literal(Stdlib__Lexing.lexeme(lexbuf))
+            };
           }
           catch (raw_exn$2){
             const exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn$2);
             if (exn$2.MEL_EXN_ID === Stdlib.Failure) {
               throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                        MEL_EXN_ID: $$Error$4,
-                        _1: {
-                          TAG: /* Literal_overflow */5,
-                          _0: "int32"
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$4,
+                    _1: {
+                      TAG: /* Literal_overflow */5,
+                      _0: "int32"
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$2.MEL_EXN_ID, exn$2);
           }
       case 17 :
           try {
             return {
-                    TAG: /* INT64 */9,
-                    _0: cvt_int64_literal(Stdlib__Lexing.lexeme(lexbuf))
-                  };
+              TAG: /* INT64 */9,
+              _0: cvt_int64_literal(Stdlib__Lexing.lexeme(lexbuf))
+            };
           }
           catch (raw_exn$3){
             const exn$3 = Caml_js_exceptions.internalToOCamlException(raw_exn$3);
             if (exn$3.MEL_EXN_ID === Stdlib.Failure) {
               throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                        MEL_EXN_ID: $$Error$4,
-                        _1: {
-                          TAG: /* Literal_overflow */5,
-                          _0: "int64"
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$4,
+                    _1: {
+                      TAG: /* Literal_overflow */5,
+                      _0: "int64"
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$3.MEL_EXN_ID, exn$3);
           }
       case 18 :
           try {
             return {
-                    TAG: /* NATIVEINT */12,
-                    _0: cvt_nativeint_literal(Stdlib__Lexing.lexeme(lexbuf))
-                  };
+              TAG: /* NATIVEINT */12,
+              _0: cvt_nativeint_literal(Stdlib__Lexing.lexeme(lexbuf))
+            };
           }
           catch (raw_exn$4){
             const exn$4 = Caml_js_exceptions.internalToOCamlException(raw_exn$4);
             if (exn$4.MEL_EXN_ID === Stdlib.Failure) {
               throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                        MEL_EXN_ID: $$Error$4,
-                        _1: {
-                          TAG: /* Literal_overflow */5,
-                          _0: "nativeint"
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$4,
+                    _1: {
+                      TAG: /* Literal_overflow */5,
+                      _0: "nativeint"
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$4.MEL_EXN_ID, exn$4);
           }
@@ -24642,12 +24642,12 @@ function token(lexbuf) {
           is_in_string.contents = false;
           lexbuf.lex_start_p = string_start;
           return {
-                  TAG: /* STRING */16,
-                  _0: [
-                    get_stored_string(undefined),
-                    undefined
-                  ]
-                };
+            TAG: /* STRING */16,
+            _0: [
+              get_stored_string(undefined),
+              undefined
+            ]
+          };
       case 20 :
           reset_string_buffer(undefined);
           const delim = Stdlib__Lexing.lexeme(lexbuf);
@@ -24659,64 +24659,64 @@ function token(lexbuf) {
           is_in_string.contents = false;
           lexbuf.lex_start_p = string_start$1;
           return {
-                  TAG: /* STRING */16,
-                  _0: [
-                    get_stored_string(undefined),
-                    delim$1
-                  ]
-                };
+            TAG: /* STRING */16,
+            _0: [
+              get_stored_string(undefined),
+              delim$1
+            ]
+          };
       case 21 :
           update_loc(lexbuf, undefined, 1, false, 1);
           return {
-                  TAG: /* CHAR */0,
-                  _0: Stdlib__Lexing.lexeme_char(lexbuf, 1)
-                };
+            TAG: /* CHAR */0,
+            _0: Stdlib__Lexing.lexeme_char(lexbuf, 1)
+          };
       case 22 :
           return {
-                  TAG: /* CHAR */0,
-                  _0: Stdlib__Lexing.lexeme_char(lexbuf, 1)
-                };
+            TAG: /* CHAR */0,
+            _0: Stdlib__Lexing.lexeme_char(lexbuf, 1)
+          };
       case 23 :
           return {
-                  TAG: /* CHAR */0,
-                  _0: char_for_backslash(Stdlib__Lexing.lexeme_char(lexbuf, 2))
-                };
+            TAG: /* CHAR */0,
+            _0: char_for_backslash(Stdlib__Lexing.lexeme_char(lexbuf, 2))
+          };
       case 24 :
           return {
-                  TAG: /* CHAR */0,
-                  _0: char_for_decimal_code(lexbuf, 2)
-                };
+            TAG: /* CHAR */0,
+            _0: char_for_decimal_code(lexbuf, 2)
+          };
       case 25 :
           return {
-                  TAG: /* CHAR */0,
-                  _0: char_for_hexadecimal_code(lexbuf, 3)
-                };
+            TAG: /* CHAR */0,
+            _0: char_for_hexadecimal_code(lexbuf, 3)
+          };
       case 26 :
           const l = Stdlib__Lexing.lexeme(lexbuf);
           const esc = Stdlib__String.sub(l, 1, l.length - 1 | 0);
           throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                    MEL_EXN_ID: $$Error$4,
-                    _1: {
-                      TAG: /* Illegal_escape */1,
-                      _0: esc
-                    },
-                    _2: curr(lexbuf)
-                  });
+                MEL_EXN_ID: $$Error$4,
+                _1: {
+                  TAG: /* Illegal_escape */1,
+                  _0: esc
+                },
+                _2: curr(lexbuf)
+              });
       case 27 :
           const match = with_comment_buffer(comment, lexbuf);
           return {
-                  TAG: /* COMMENT */18,
-                  _0: [
-                    match[0],
-                    match[1]
-                  ]
-                };
+            TAG: /* COMMENT */18,
+            _0: [
+              match[0],
+              match[1]
+            ]
+          };
       case 28 :
           const match$1 = with_comment_buffer(comment, lexbuf);
           return {
-                  TAG: /* DOCSTRING */19,
-                  _0: docstring(match$1[0], match$1[1])
-                };
+            TAG: /* DOCSTRING */19,
+            _0: docstring(match$1[0], match$1[1])
+          };
       case 29 :
           const stars = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos);
           const match$2 = with_comment_buffer((function (lexbuf) {
@@ -24724,33 +24724,33 @@ function token(lexbuf) {
                   return __ocaml_lex_comment_rec(lexbuf, 132);
                 }), lexbuf);
           return {
-                  TAG: /* COMMENT */18,
-                  _0: [
-                    match$2[0],
-                    match$2[1]
-                  ]
-                };
+            TAG: /* COMMENT */18,
+            _0: [
+              match$2[0],
+              match$2[1]
+            ]
+          };
       case 30 :
           if (print_warnings.contents) {
             prerr_warning(curr(lexbuf), /* Comment_start */0);
           }
           const match$3 = with_comment_buffer(comment, lexbuf);
           return {
-                  TAG: /* COMMENT */18,
-                  _0: [
-                    match$3[0],
-                    match$3[1]
-                  ]
-                };
+            TAG: /* COMMENT */18,
+            _0: [
+              match$3[0],
+              match$3[1]
+            ]
+          };
       case 31 :
           const stars$1 = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos - 2 | 0);
           return {
-                  TAG: /* COMMENT */18,
-                  _0: [
-                    stars$1,
-                    curr(lexbuf)
-                  ]
-                };
+            TAG: /* COMMENT */18,
+            _0: [
+              stars$1,
+              curr(lexbuf)
+            ]
+          };
       case 32 :
           const loc = curr(lexbuf);
           prerr_warning(loc, /* Comment_not_end */1);
@@ -24852,9 +24852,9 @@ function token(lexbuf) {
           return /* BANG */6;
       case 75 :
           return {
-                  TAG: /* INFIXOP0 */2,
-                  _0: "!="
-                };
+            TAG: /* INFIXOP0 */2,
+            _0: "!="
+          };
       case 76 :
           return /* PLUS */72;
       case 77 :
@@ -24868,66 +24868,66 @@ function token(lexbuf) {
       case 81 :
       case 82 :
           return {
-                  TAG: /* PREFIXOP */14,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* PREFIXOP */14,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 83 :
           return {
-                  TAG: /* INFIXOP0 */2,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP0 */2,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 84 :
           return {
-                  TAG: /* INFIXOP1 */3,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP1 */3,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 85 :
           return {
-                  TAG: /* INFIXOP2 */4,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP2 */4,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 86 :
           return {
-                  TAG: /* INFIXOP4 */6,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP4 */6,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 87 :
           return /* PERCENT */71;
       case 88 :
           return {
-                  TAG: /* INFIXOP3 */5,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP3 */5,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 89 :
           return {
-                  TAG: /* SHARPOP */15,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* SHARPOP */15,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 90 :
           if (if_then_else.contents === /* Dir_out */2) {
             return /* EOF */25;
           }
           if (if_then_else.contents === /* Dir_if_true */0) {
             throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                      MEL_EXN_ID: $$Error$4,
-                      _1: /* Unterminated_if */2,
-                      _2: curr(lexbuf)
-                    });
+                  MEL_EXN_ID: $$Error$4,
+                  _1: /* Unterminated_if */2,
+                  _2: curr(lexbuf)
+                });
           }
           throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                    MEL_EXN_ID: $$Error$4,
-                    _1: /* Unterminated_else */3,
-                    _2: curr(lexbuf)
-                  });
+                MEL_EXN_ID: $$Error$4,
+                _1: /* Unterminated_else */3,
+                _2: curr(lexbuf)
+              });
       case 91 :
           throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                    MEL_EXN_ID: $$Error$4,
-                    _1: {
-                      TAG: /* Illegal_character */0,
-                      _0: Stdlib__Lexing.lexeme_char(lexbuf, 0)
-                    },
-                    _2: curr(lexbuf)
-                  });
+                MEL_EXN_ID: $$Error$4,
+                _1: {
+                  TAG: /* Illegal_character */0,
+                  _0: Stdlib__Lexing.lexeme_char(lexbuf, 0)
+                },
+                _2: curr(lexbuf)
+              });
       default:
         Curry._1(lexbuf.refill_buff, lexbuf);
         ___ocaml_lex_state = __ocaml_lex_state$1;
@@ -24981,10 +24981,10 @@ function string(lexbuf) {
       case 7 :
           is_in_string.contents = false;
           throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                    MEL_EXN_ID: $$Error$4,
-                    _1: /* Unterminated_string */0,
-                    _2: string_start_loc.contents
-                  });
+                MEL_EXN_ID: $$Error$4,
+                _1: /* Unterminated_string */0,
+                _2: string_start_loc.contents
+              });
       case 8 :
           store_string_char(Stdlib__Lexing.lexeme_char(lexbuf, 0));
           return string(lexbuf);
@@ -25022,13 +25022,13 @@ function __ocaml_lex_comment_rec(lexbuf, ___ocaml_lex_state) {
             return curr(lexbuf);
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      26844,
-                      16
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  26844,
+                  16
+                ]
+              });
       case 2 :
           string_start_loc.contents = curr(lexbuf);
           store_string_char(/* '"' */34);
@@ -25047,23 +25047,23 @@ function __ocaml_lex_comment_rec(lexbuf, ___ocaml_lex_state) {
                     const start = Stdlib__List.hd(Stdlib__List.rev(comment_start_loc.contents));
                     comment_start_loc.contents = /* [] */0;
                     throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                              MEL_EXN_ID: $$Error$4,
-                              _1: {
-                                TAG: /* Unterminated_string_in_comment */3,
-                                _0: start,
-                                _1: exn._2
-                              },
-                              _2: match$1.hd
-                            });
+                          MEL_EXN_ID: $$Error$4,
+                          _1: {
+                            TAG: /* Unterminated_string_in_comment */3,
+                            _0: start,
+                            _1: exn._2
+                          },
+                          _2: match$1.hd
+                        });
                   }
                   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                            MEL_EXN_ID: "Assert_failure",
-                            _1: [
-                              "jscomp/test/ocaml_typedtree_test.ml",
-                              26861,
-                              18
-                            ]
-                          });
+                        MEL_EXN_ID: "Assert_failure",
+                        _1: [
+                          "jscomp/test/ocaml_typedtree_test.ml",
+                          26861,
+                          18
+                        ]
+                      });
                 }
                 throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
               } else {
@@ -25097,23 +25097,23 @@ function __ocaml_lex_comment_rec(lexbuf, ___ocaml_lex_state) {
                     const start$1 = Stdlib__List.hd(Stdlib__List.rev(comment_start_loc.contents));
                     comment_start_loc.contents = /* [] */0;
                     throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                              MEL_EXN_ID: $$Error$4,
-                              _1: {
-                                TAG: /* Unterminated_string_in_comment */3,
-                                _0: start$1,
-                                _1: exn$1._2
-                              },
-                              _2: match$2.hd
-                            });
+                          MEL_EXN_ID: $$Error$4,
+                          _1: {
+                            TAG: /* Unterminated_string_in_comment */3,
+                            _0: start$1,
+                            _1: exn$1._2
+                          },
+                          _2: match$2.hd
+                        });
                   }
                   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                            MEL_EXN_ID: "Assert_failure",
-                            _1: [
-                              "jscomp/test/ocaml_typedtree_test.ml",
-                              26884,
-                              18
-                            ]
-                          });
+                        MEL_EXN_ID: "Assert_failure",
+                        _1: [
+                          "jscomp/test/ocaml_typedtree_test.ml",
+                          26884,
+                          18
+                        ]
+                      });
                 }
                 throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
               } else {
@@ -25140,22 +25140,22 @@ function __ocaml_lex_comment_rec(lexbuf, ___ocaml_lex_state) {
             const start$2 = Stdlib__List.hd(Stdlib__List.rev(comment_start_loc.contents));
             comment_start_loc.contents = /* [] */0;
             throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                      MEL_EXN_ID: $$Error$4,
-                      _1: {
-                        TAG: /* Unterminated_comment */2,
-                        _0: start$2
-                      },
-                      _2: match$3.hd
-                    });
+                  MEL_EXN_ID: $$Error$4,
+                  _1: {
+                    TAG: /* Unterminated_comment */2,
+                    _0: start$2
+                  },
+                  _2: match$3.hd
+                });
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      26934,
-                      16
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  26934,
+                  16
+                ]
+              });
       case 11 :
           update_loc(lexbuf, undefined, 1, false, 0);
           store_string(Stdlib__Lexing.lexeme(lexbuf));
@@ -25191,10 +25191,10 @@ function __ocaml_lex_quoted_string_rec(delim, lexbuf, ___ocaml_lex_state) {
       case 1 :
           is_in_string.contents = false;
           throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                    MEL_EXN_ID: $$Error$4,
-                    _1: /* Unterminated_string */0,
-                    _2: string_start_loc.contents
-                  });
+                MEL_EXN_ID: $$Error$4,
+                _1: /* Unterminated_string */0,
+                _2: string_start_loc.contents
+              });
       case 2 :
           const edelim = Stdlib__Lexing.lexeme(lexbuf);
           const edelim$1 = Stdlib__String.sub(edelim, 1, edelim.length - 2 | 0);
@@ -25297,10 +25297,10 @@ function token$1(lexbuf) {
                           case /* Dir_if_false */1 :
                           case /* Dir_out */2 :
                               throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                        MEL_EXN_ID: $$Error$4,
-                                        _1: /* Unexpected_directive */6,
-                                        _2: curr(lexbuf)
-                                      });
+                                    MEL_EXN_ID: $$Error$4,
+                                    _1: /* Unexpected_directive */6,
+                                    _2: curr(lexbuf)
+                                  });
                           
                         }
                         break;
@@ -25312,10 +25312,10 @@ function token$1(lexbuf) {
                               return Curry._1(cont, lexbuf);
                           case /* Dir_out */2 :
                               throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                        MEL_EXN_ID: $$Error$4,
-                                        _1: /* Unexpected_directive */6,
-                                        _2: curr(lexbuf)
-                                      });
+                                    MEL_EXN_ID: $$Error$4,
+                                    _1: /* Unexpected_directive */6,
+                                    _2: curr(lexbuf)
+                                  });
                           
                         }
                     case /* IF */37 :
@@ -25323,10 +25323,10 @@ function token$1(lexbuf) {
                           case /* Dir_if_true */0 :
                           case /* Dir_if_false */1 :
                               throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                        MEL_EXN_ID: $$Error$4,
-                                        _1: /* Unexpected_directive */6,
-                                        _2: curr(lexbuf)
-                                      });
+                                    MEL_EXN_ID: $$Error$4,
+                                    _1: /* Unexpected_directive */6,
+                                    _2: curr(lexbuf)
+                                  });
                           case /* Dir_out */2 :
                               if (directive_parse(token_with_comments, lexbuf)) {
                                 if_then_else.contents = /* Dir_if_true */0;
@@ -25337,10 +25337,10 @@ function token$1(lexbuf) {
                                   const token = token_with_comments(lexbuf);
                                   if (Caml_obj.caml_equal(token, /* EOF */25)) {
                                     throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                              MEL_EXN_ID: $$Error$4,
-                                              _1: /* Unterminated_if */2,
-                                              _2: curr(lexbuf)
-                                            });
+                                          MEL_EXN_ID: $$Error$4,
+                                          _1: /* Unterminated_if */2,
+                                          _2: curr(lexbuf)
+                                        });
                                   }
                                   if (Caml_obj.caml_equal(token, /* SHARP */84) && at_bol(lexbuf)) {
                                     const token$1 = token_with_comments(lexbuf);
@@ -25354,10 +25354,10 @@ function token$1(lexbuf) {
                                             return Curry._1(cont, lexbuf);
                                         case /* IF */37 :
                                             throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                                      MEL_EXN_ID: $$Error$4,
-                                                      _1: /* Unexpected_directive */6,
-                                                      _2: curr(lexbuf)
-                                                    });
+                                                  MEL_EXN_ID: $$Error$4,
+                                                  _1: /* Unexpected_directive */6,
+                                                  _2: curr(lexbuf)
+                                                });
                                         default:
                                           
                                       }
@@ -25391,10 +25391,10 @@ function token$1(lexbuf) {
                     case /* Dir_if_false */1 :
                     case /* Dir_out */2 :
                         throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                  MEL_EXN_ID: $$Error$4,
-                                  _1: /* Unexpected_directive */6,
-                                  _2: curr(lexbuf)
-                                });
+                              MEL_EXN_ID: $$Error$4,
+                              _1: /* Unexpected_directive */6,
+                              _2: curr(lexbuf)
+                            });
                     
                   }
                 }
@@ -25406,10 +25406,10 @@ function token$1(lexbuf) {
                         const token$2 = token_with_comments(lexbuf);
                         if (Caml_obj.caml_equal(token$2, /* EOF */25)) {
                           throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                    MEL_EXN_ID: $$Error$4,
-                                    _1: /* Unterminated_else */3,
-                                    _2: curr(lexbuf)
-                                  });
+                                MEL_EXN_ID: $$Error$4,
+                                _1: /* Unterminated_else */3,
+                                _2: curr(lexbuf)
+                              });
                         }
                         if (Caml_obj.caml_equal(token$2, /* SHARP */84) && at_bol(lexbuf)) {
                           const token$3 = token_with_comments(lexbuf);
@@ -25418,10 +25418,10 @@ function token$1(lexbuf) {
                               case /* ELSE */23 :
                                   if (else_seen) {
                                     throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                              MEL_EXN_ID: $$Error$4,
-                                              _1: /* Unexpected_directive */6,
-                                              _2: curr(lexbuf)
-                                            });
+                                          MEL_EXN_ID: $$Error$4,
+                                          _1: /* Unexpected_directive */6,
+                                          _2: curr(lexbuf)
+                                        });
                                   }
                                   _else_seen = true;
                                   continue ;
@@ -25430,20 +25430,20 @@ function token$1(lexbuf) {
                                   return Curry._1(cont, lexbuf);
                               case /* IF */37 :
                                   throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                            MEL_EXN_ID: $$Error$4,
-                                            _1: /* Unexpected_directive */6,
-                                            _2: curr(lexbuf)
-                                          });
+                                        MEL_EXN_ID: $$Error$4,
+                                        _1: /* Unexpected_directive */6,
+                                        _2: curr(lexbuf)
+                                      });
                               default:
                                 
                             }
                           }
                           if (else_seen && is_elif(token$3)) {
                             throw new Caml_js_exceptions.MelangeError($$Error$4, {
-                                      MEL_EXN_ID: $$Error$4,
-                                      _1: /* Unexpected_directive */6,
-                                      _2: curr(lexbuf)
-                                    });
+                                  MEL_EXN_ID: $$Error$4,
+                                  _1: /* Unexpected_directive */6,
+                                  _2: curr(lexbuf)
+                                });
                           }
                           continue ;
                         }
@@ -25704,12 +25704,12 @@ function wrap$1(parsing_fun, lexbuf) {
       maybe_skip_phrase(lexbuf);
     }
     throw new Caml_js_exceptions.MelangeError($$Error$3, {
-              MEL_EXN_ID: $$Error$3,
-              _1: {
-                TAG: /* Other */5,
-                _0: loc
-              }
-            });
+          MEL_EXN_ID: $$Error$3,
+          _1: {
+            TAG: /* Other */5,
+            _0: loc
+          }
+        });
   }
 }
 
@@ -25724,8 +25724,8 @@ function iter_pattern_desc(f, patl) {
         return may(f, patl._1);
     case /* Tpat_record */6 :
         return Stdlib__List.iter((function (param) {
-                      Curry._1(f, param[2]);
-                    }), patl._0);
+                Curry._1(f, param[2]);
+              }), patl._0);
     case /* Tpat_tuple */3 :
     case /* Tpat_array */7 :
         return Stdlib__List.iter(f, patl._0);
@@ -25747,64 +25747,64 @@ function map_pattern_desc(f, d) {
   switch (d.TAG) {
     case /* Tpat_alias */1 :
         return {
-                TAG: /* Tpat_alias */1,
-                _0: Curry._1(f, d._0),
-                _1: d._1,
-                _2: d._2
-              };
+          TAG: /* Tpat_alias */1,
+          _0: Curry._1(f, d._0),
+          _1: d._1,
+          _2: d._2
+        };
     case /* Tpat_tuple */3 :
         return {
-                TAG: /* Tpat_tuple */3,
-                _0: Stdlib__List.map(f, d._0)
-              };
+          TAG: /* Tpat_tuple */3,
+          _0: Stdlib__List.map(f, d._0)
+        };
     case /* Tpat_construct */4 :
         return {
-                TAG: /* Tpat_construct */4,
-                _0: d._0,
-                _1: d._1,
-                _2: Stdlib__List.map(f, d._2)
-              };
+          TAG: /* Tpat_construct */4,
+          _0: d._0,
+          _1: d._1,
+          _2: Stdlib__List.map(f, d._2)
+        };
     case /* Tpat_variant */5 :
         const p1 = d._1;
         if (p1 !== undefined) {
           return {
-                  TAG: /* Tpat_variant */5,
-                  _0: d._0,
-                  _1: Curry._1(f, p1),
-                  _2: d._2
-                };
+            TAG: /* Tpat_variant */5,
+            _0: d._0,
+            _1: Curry._1(f, p1),
+            _2: d._2
+          };
         } else {
           return d;
         }
     case /* Tpat_record */6 :
         return {
-                TAG: /* Tpat_record */6,
-                _0: Stdlib__List.map((function (param) {
-                        return [
-                                param[0],
-                                param[1],
-                                Curry._1(f, param[2])
-                              ];
-                      }), d._0),
-                _1: d._1
-              };
+          TAG: /* Tpat_record */6,
+          _0: Stdlib__List.map((function (param) {
+                  return [
+                    param[0],
+                    param[1],
+                    Curry._1(f, param[2])
+                  ];
+                }), d._0),
+          _1: d._1
+        };
     case /* Tpat_array */7 :
         return {
-                TAG: /* Tpat_array */7,
-                _0: Stdlib__List.map(f, d._0)
-              };
+          TAG: /* Tpat_array */7,
+          _0: Stdlib__List.map(f, d._0)
+        };
     case /* Tpat_or */8 :
         return {
-                TAG: /* Tpat_or */8,
-                _0: Curry._1(f, d._0),
-                _1: Curry._1(f, d._1),
-                _2: d._2
-              };
+          TAG: /* Tpat_or */8,
+          _0: Curry._1(f, d._0),
+          _1: Curry._1(f, d._1),
+          _2: d._2
+        };
     case /* Tpat_lazy */9 :
         return {
-                TAG: /* Tpat_lazy */9,
-                _0: Curry._1(f, d._0)
-              };
+          TAG: /* Tpat_lazy */9,
+          _0: Curry._1(f, d._0)
+        };
     default:
       return d;
   }
@@ -25870,8 +25870,8 @@ function rev_let_bound_idents_with_loc(bindings) {
 
 function let_bound_idents(pat) {
   return Stdlib__List.map((function (prim) {
-                return prim[0];
-              }), Stdlib__List.rev(rev_let_bound_idents_with_loc(pat)));
+          return prim[0];
+        }), Stdlib__List.rev(rev_let_bound_idents_with_loc(pat)));
 }
 
 function alpha_pat(env, p) {
@@ -25896,29 +25896,29 @@ function alpha_pat(env, p) {
             }
           }
           return {
-                  pat_desc: tmp,
-                  pat_loc: p.pat_loc,
-                  pat_extra: p.pat_extra,
-                  pat_type: p.pat_type,
-                  pat_env: p.pat_env,
-                  pat_attributes: p.pat_attributes
-                };
+            pat_desc: tmp,
+            pat_loc: p.pat_loc,
+            pat_extra: p.pat_extra,
+            pat_type: p.pat_type,
+            pat_env: p.pat_env,
+            pat_attributes: p.pat_attributes
+          };
       case /* Tpat_alias */1 :
           const new_p = alpha_pat(env, d._0);
           try {
             return {
-                    pat_desc: {
-                      TAG: /* Tpat_alias */1,
-                      _0: new_p,
-                      _1: Stdlib__List.assoc(d._1, env),
-                      _2: d._2
-                    },
-                    pat_loc: p.pat_loc,
-                    pat_extra: p.pat_extra,
-                    pat_type: p.pat_type,
-                    pat_env: p.pat_env,
-                    pat_attributes: p.pat_attributes
-                  };
+              pat_desc: {
+                TAG: /* Tpat_alias */1,
+                _0: new_p,
+                _1: Stdlib__List.assoc(d._1, env),
+                _2: d._2
+              },
+              pat_loc: p.pat_loc,
+              pat_extra: p.pat_extra,
+              pat_type: p.pat_type,
+              pat_env: p.pat_env,
+              pat_attributes: p.pat_attributes
+            };
           }
           catch (raw_exn$1){
             const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
@@ -25932,15 +25932,15 @@ function alpha_pat(env, p) {
     }
   }
   return {
-          pat_desc: map_pattern_desc((function (param) {
-                  return alpha_pat(env, param);
-                }), d),
-          pat_loc: p.pat_loc,
-          pat_extra: p.pat_extra,
-          pat_type: p.pat_type,
-          pat_env: p.pat_env,
-          pat_attributes: p.pat_attributes
-        };
+    pat_desc: map_pattern_desc((function (param) {
+            return alpha_pat(env, param);
+          }), d),
+    pat_loc: p.pat_loc,
+    pat_extra: p.pat_extra,
+    pat_type: p.pat_type,
+    pat_env: p.pat_env,
+    pat_attributes: p.pat_attributes
+  };
 }
 
 function enter_structure(t) {
@@ -26104,16 +26104,16 @@ function TypedtreeMap_MakeMap(funarg) {
     const str$1 = Curry._1(funarg.enter_structure, str);
     const str_items = Stdlib__List.map(map_structure_item, str$1.str_items);
     return Curry._1(funarg.leave_structure, {
-                str_items: str_items,
-                str_type: str$1.str_type,
-                str_final_env: str$1.str_final_env
-              });
+          str_items: str_items,
+          str_type: str$1.str_type,
+          str_final_env: str$1.str_final_env
+        });
   };
   const map_type_parameter = function (param) {
     return [
-            map_core_type(param[0]),
-            param[1]
-          ];
+      map_core_type(param[0]),
+      param[1]
+    ];
   };
   const map_class_type = function (ct) {
     const ct$1 = Curry._1(funarg.enter_class_type, ct);
@@ -26145,12 +26145,12 @@ function TypedtreeMap_MakeMap(funarg) {
       
     }
     return Curry._1(funarg.leave_class_type, {
-                cltyp_desc: cltyp_desc,
-                cltyp_type: ct$1.cltyp_type,
-                cltyp_env: ct$1.cltyp_env,
-                cltyp_loc: ct$1.cltyp_loc,
-                cltyp_attributes: ct$1.cltyp_attributes
-              });
+          cltyp_desc: cltyp_desc,
+          cltyp_type: ct$1.cltyp_type,
+          cltyp_env: ct$1.cltyp_env,
+          cltyp_loc: ct$1.cltyp_loc,
+          cltyp_attributes: ct$1.cltyp_attributes
+        });
   };
   const map_core_type = function (ct) {
     const ct$1 = Curry._1(funarg.enter_core_type, ct);
@@ -26190,10 +26190,10 @@ function TypedtreeMap_MakeMap(funarg) {
               TAG: /* Ttyp_object */4,
               _0: Stdlib__List.map((function (param) {
                       return [
-                              param[0],
-                              param[1],
-                              map_core_type(param[2])
-                            ];
+                        param[0],
+                        param[1],
+                        map_core_type(param[2])
+                      ];
                     }), list._0),
               _1: list._1
             };
@@ -26238,12 +26238,12 @@ function TypedtreeMap_MakeMap(funarg) {
       }
     }
     return Curry._1(funarg.leave_core_type, {
-                ctyp_desc: ctyp_desc,
-                ctyp_type: ct$1.ctyp_type,
-                ctyp_env: ct$1.ctyp_env,
-                ctyp_loc: ct$1.ctyp_loc,
-                ctyp_attributes: ct$1.ctyp_attributes
-              });
+          ctyp_desc: ctyp_desc,
+          ctyp_type: ct$1.ctyp_type,
+          ctyp_env: ct$1.ctyp_env,
+          ctyp_loc: ct$1.ctyp_loc,
+          ctyp_attributes: ct$1.ctyp_attributes
+        });
   };
   const map_module_type = function (mty) {
     const mty$1 = Curry._1(funarg.enter_module_type, mty);
@@ -26271,10 +26271,10 @@ function TypedtreeMap_MakeMap(funarg) {
             _0: map_module_type(sg._0),
             _1: Stdlib__List.map((function (param) {
                     return [
-                            param[0],
-                            param[1],
-                            map_with_constraint(param[2])
-                          ];
+                      param[0],
+                      param[1],
+                      map_with_constraint(param[2])
+                    ];
                   }), sg._1)
           };
           break;
@@ -26291,12 +26291,12 @@ function TypedtreeMap_MakeMap(funarg) {
       
     }
     return Curry._1(funarg.leave_module_type, {
-                mty_desc: mty_desc,
-                mty_type: mty$1.mty_type,
-                mty_env: mty$1.mty_env,
-                mty_loc: mty$1.mty_loc,
-                mty_attributes: mty$1.mty_attributes
-              });
+          mty_desc: mty_desc,
+          mty_type: mty$1.mty_type,
+          mty_env: mty$1.mty_env,
+          mty_loc: mty$1.mty_loc,
+          mty_attributes: mty$1.mty_attributes
+        });
   };
   const map_expression = function (exp) {
     const exp$1 = Curry._1(funarg.enter_expression, exp);
@@ -26328,10 +26328,10 @@ function TypedtreeMap_MakeMap(funarg) {
                     const expo = param[1];
                     const expo$1 = expo !== undefined ? map_expression(expo) : expo;
                     return [
-                            param[0],
-                            expo$1,
-                            param[2]
-                          ];
+                      param[0],
+                      expo$1,
+                      param[2]
+                    ];
                   }), list._1)
           };
           break;
@@ -26378,10 +26378,10 @@ function TypedtreeMap_MakeMap(funarg) {
           const expo$2 = list._1;
           const list$1 = Stdlib__List.map((function (param) {
                   return [
-                          param[0],
-                          param[1],
-                          map_expression(param[2])
-                        ];
+                    param[0],
+                    param[1],
+                    map_expression(param[2])
+                  ];
                 }), list._0);
           const expo$3 = expo$2 !== undefined ? map_expression(expo$2) : expo$2;
           exp_desc = {
@@ -26476,10 +26476,10 @@ function TypedtreeMap_MakeMap(funarg) {
             _0: list._0,
             _1: Stdlib__List.map((function (param) {
                     return [
-                            param[0],
-                            param[1],
-                            map_expression(param[2])
-                          ];
+                      param[0],
+                      param[1],
+                      map_expression(param[2])
+                    ];
                   }), list._1)
           };
           break;
@@ -26521,13 +26521,13 @@ function TypedtreeMap_MakeMap(funarg) {
     }
     const exp_extra = Stdlib__List.map(map_exp_extra, exp$1.exp_extra);
     return Curry._1(funarg.leave_expression, {
-                exp_desc: exp_desc,
-                exp_loc: exp$1.exp_loc,
-                exp_extra: exp_extra,
-                exp_type: exp$1.exp_type,
-                exp_env: exp$1.exp_env,
-                exp_attributes: exp$1.exp_attributes
-              });
+          exp_desc: exp_desc,
+          exp_loc: exp$1.exp_loc,
+          exp_extra: exp_extra,
+          exp_type: exp$1.exp_type,
+          exp_env: exp$1.exp_env,
+          exp_attributes: exp$1.exp_attributes
+        });
   };
   const map_module_expr = function (mexpr) {
     const mexpr$1 = Curry._1(funarg.enter_module_expr, mexpr);
@@ -26565,21 +26565,21 @@ function TypedtreeMap_MakeMap(funarg) {
           const mod_type = st._1;
           const mexpr$2 = st._0;
           mod_desc = /* tag */typeof mtype === "number" || typeof mtype === "string" ? ({
-                TAG: /* Tmod_constraint */4,
-                _0: map_module_expr(mexpr$2),
-                _1: mod_type,
-                _2: /* Tmodtype_implicit */0,
-                _3: st._3
-              }) : ({
-                TAG: /* Tmod_constraint */4,
-                _0: map_module_expr(mexpr$2),
-                _1: mod_type,
-                _2: {
-                  TAG: /* Tmodtype_explicit */0,
-                  _0: map_module_type(mtype._0)
-                },
-                _3: st._3
-              });
+              TAG: /* Tmod_constraint */4,
+              _0: map_module_expr(mexpr$2),
+              _1: mod_type,
+              _2: /* Tmodtype_implicit */0,
+              _3: st._3
+            }) : ({
+              TAG: /* Tmod_constraint */4,
+              _0: map_module_expr(mexpr$2),
+              _1: mod_type,
+              _2: {
+                TAG: /* Tmodtype_explicit */0,
+                _0: map_module_type(mtype._0)
+              },
+              _3: st._3
+            });
           break;
       case /* Tmod_unpack */5 :
           mod_desc = {
@@ -26591,44 +26591,44 @@ function TypedtreeMap_MakeMap(funarg) {
       
     }
     return Curry._1(funarg.leave_module_expr, {
-                mod_desc: mod_desc,
-                mod_loc: mexpr$1.mod_loc,
-                mod_type: mexpr$1.mod_type,
-                mod_env: mexpr$1.mod_env,
-                mod_attributes: mexpr$1.mod_attributes
-              });
+          mod_desc: mod_desc,
+          mod_loc: mexpr$1.mod_loc,
+          mod_type: mexpr$1.mod_type,
+          mod_env: mexpr$1.mod_env,
+          mod_attributes: mexpr$1.mod_attributes
+        });
   };
   const map_type_extension = function (tyext) {
     const tyext$1 = Curry._1(funarg.enter_type_extension, tyext);
     const tyext_params = Stdlib__List.map(map_type_parameter, tyext$1.tyext_params);
     const tyext_constructors = Stdlib__List.map(map_extension_constructor, tyext$1.tyext_constructors);
     return Curry._1(funarg.leave_type_extension, {
-                tyext_path: tyext$1.tyext_path,
-                tyext_txt: tyext$1.tyext_txt,
-                tyext_params: tyext_params,
-                tyext_constructors: tyext_constructors,
-                tyext_private: tyext$1.tyext_private,
-                tyext_attributes: tyext$1.tyext_attributes
-              });
+          tyext_path: tyext$1.tyext_path,
+          tyext_txt: tyext$1.tyext_txt,
+          tyext_params: tyext_params,
+          tyext_constructors: tyext_constructors,
+          tyext_private: tyext$1.tyext_private,
+          tyext_attributes: tyext$1.tyext_attributes
+        });
   };
   const map_class_type_declaration = function (cd) {
     const cd$1 = Curry._1(funarg.enter_class_type_declaration, cd);
     const ci_params = Stdlib__List.map(map_type_parameter, cd$1.ci_params);
     const ci_expr = map_class_type(cd$1.ci_expr);
     return Curry._1(funarg.leave_class_type_declaration, {
-                ci_virt: cd$1.ci_virt,
-                ci_params: ci_params,
-                ci_id_name: cd$1.ci_id_name,
-                ci_id_class: cd$1.ci_id_class,
-                ci_id_class_type: cd$1.ci_id_class_type,
-                ci_id_object: cd$1.ci_id_object,
-                ci_id_typesharp: cd$1.ci_id_typesharp,
-                ci_expr: ci_expr,
-                ci_decl: cd$1.ci_decl,
-                ci_type_decl: cd$1.ci_type_decl,
-                ci_loc: cd$1.ci_loc,
-                ci_attributes: cd$1.ci_attributes
-              });
+          ci_virt: cd$1.ci_virt,
+          ci_params: ci_params,
+          ci_id_name: cd$1.ci_id_name,
+          ci_id_class: cd$1.ci_id_class,
+          ci_id_class_type: cd$1.ci_id_class_type,
+          ci_id_object: cd$1.ci_id_object,
+          ci_id_typesharp: cd$1.ci_id_typesharp,
+          ci_expr: ci_expr,
+          ci_decl: cd$1.ci_decl,
+          ci_type_decl: cd$1.ci_type_decl,
+          ci_loc: cd$1.ci_loc,
+          ci_attributes: cd$1.ci_attributes
+        });
   };
   const map_extension_constructor = function (ext) {
     const ext$1 = Curry._1(funarg.enter_extension_constructor, ext);
@@ -26650,23 +26650,23 @@ function TypedtreeMap_MakeMap(funarg) {
       };
     }
     return Curry._1(funarg.leave_extension_constructor, {
-                ext_id: ext$1.ext_id,
-                ext_name: ext$1.ext_name,
-                ext_type: ext$1.ext_type,
-                ext_kind: ext_kind,
-                ext_loc: ext$1.ext_loc,
-                ext_attributes: ext$1.ext_attributes
-              });
+          ext_id: ext$1.ext_id,
+          ext_name: ext$1.ext_name,
+          ext_type: ext$1.ext_type,
+          ext_kind: ext_kind,
+          ext_loc: ext$1.ext_loc,
+          ext_attributes: ext$1.ext_attributes
+        });
   };
   const map_type_declaration = function (decl) {
     const decl$1 = Curry._1(funarg.enter_type_declaration, decl);
     const typ_params = Stdlib__List.map(map_type_parameter, decl$1.typ_params);
     const typ_cstrs = Stdlib__List.map((function (param) {
             return [
-                    map_core_type(param[0]),
-                    map_core_type(param[1]),
-                    param[2]
-                  ];
+              map_core_type(param[0]),
+              map_core_type(param[1]),
+              param[2]
+            ];
           }), decl$1.typ_cstrs);
     const list = decl$1.typ_kind;
     let typ_kind;
@@ -26681,13 +26681,13 @@ function TypedtreeMap_MakeMap(funarg) {
     } else {
       const list$2 = Stdlib__List.map((function (ld) {
               return {
-                      ld_id: ld.ld_id,
-                      ld_name: ld.ld_name,
-                      ld_mutable: ld.ld_mutable,
-                      ld_type: map_core_type(ld.ld_type),
-                      ld_loc: ld.ld_loc,
-                      ld_attributes: ld.ld_attributes
-                    };
+                ld_id: ld.ld_id,
+                ld_name: ld.ld_name,
+                ld_mutable: ld.ld_mutable,
+                ld_type: map_core_type(ld.ld_type),
+                ld_loc: ld.ld_loc,
+                ld_attributes: ld.ld_attributes
+              };
             }), list._0);
       typ_kind = {
         TAG: /* Ttype_record */1,
@@ -26696,59 +26696,59 @@ function TypedtreeMap_MakeMap(funarg) {
     }
     const typ_manifest = may_map(map_core_type, decl$1.typ_manifest);
     return Curry._1(funarg.leave_type_declaration, {
-                typ_id: decl$1.typ_id,
-                typ_name: decl$1.typ_name,
-                typ_params: typ_params,
-                typ_type: decl$1.typ_type,
-                typ_cstrs: typ_cstrs,
-                typ_kind: typ_kind,
-                typ_private: decl$1.typ_private,
-                typ_manifest: typ_manifest,
-                typ_loc: decl$1.typ_loc,
-                typ_attributes: decl$1.typ_attributes
-              });
+          typ_id: decl$1.typ_id,
+          typ_name: decl$1.typ_name,
+          typ_params: typ_params,
+          typ_type: decl$1.typ_type,
+          typ_cstrs: typ_cstrs,
+          typ_kind: typ_kind,
+          typ_private: decl$1.typ_private,
+          typ_manifest: typ_manifest,
+          typ_loc: decl$1.typ_loc,
+          typ_attributes: decl$1.typ_attributes
+        });
   };
   const map_class_description = function (cd) {
     const cd$1 = Curry._1(funarg.enter_class_description, cd);
     const ci_params = Stdlib__List.map(map_type_parameter, cd$1.ci_params);
     const ci_expr = map_class_type(cd$1.ci_expr);
     return Curry._1(funarg.leave_class_description, {
-                ci_virt: cd$1.ci_virt,
-                ci_params: ci_params,
-                ci_id_name: cd$1.ci_id_name,
-                ci_id_class: cd$1.ci_id_class,
-                ci_id_class_type: cd$1.ci_id_class_type,
-                ci_id_object: cd$1.ci_id_object,
-                ci_id_typesharp: cd$1.ci_id_typesharp,
-                ci_expr: ci_expr,
-                ci_decl: cd$1.ci_decl,
-                ci_type_decl: cd$1.ci_type_decl,
-                ci_loc: cd$1.ci_loc,
-                ci_attributes: cd$1.ci_attributes
-              });
+          ci_virt: cd$1.ci_virt,
+          ci_params: ci_params,
+          ci_id_name: cd$1.ci_id_name,
+          ci_id_class: cd$1.ci_id_class,
+          ci_id_class_type: cd$1.ci_id_class_type,
+          ci_id_object: cd$1.ci_id_object,
+          ci_id_typesharp: cd$1.ci_id_typesharp,
+          ci_expr: ci_expr,
+          ci_decl: cd$1.ci_decl,
+          ci_type_decl: cd$1.ci_type_decl,
+          ci_loc: cd$1.ci_loc,
+          ci_attributes: cd$1.ci_attributes
+        });
   };
   const map_value_description = function (v) {
     const v$1 = Curry._1(funarg.enter_value_description, v);
     const val_desc = map_core_type(v$1.val_desc);
     return Curry._1(funarg.leave_value_description, {
-                val_id: v$1.val_id,
-                val_name: v$1.val_name,
-                val_desc: val_desc,
-                val_val: v$1.val_val,
-                val_prim: v$1.val_prim,
-                val_loc: v$1.val_loc,
-                val_attributes: v$1.val_attributes
-              });
+          val_id: v$1.val_id,
+          val_name: v$1.val_name,
+          val_desc: val_desc,
+          val_val: v$1.val_val,
+          val_prim: v$1.val_prim,
+          val_loc: v$1.val_loc,
+          val_attributes: v$1.val_attributes
+        });
   };
   const map_module_type_declaration = function (mtd) {
     const mtd$1 = Curry._1(funarg.enter_module_type_declaration, mtd);
     return Curry._1(funarg.leave_module_type_declaration, {
-                mtd_id: mtd$1.mtd_id,
-                mtd_name: mtd$1.mtd_name,
-                mtd_type: may_map(map_module_type, mtd$1.mtd_type),
-                mtd_attributes: mtd$1.mtd_attributes,
-                mtd_loc: mtd$1.mtd_loc
-              });
+          mtd_id: mtd$1.mtd_id,
+          mtd_name: mtd$1.mtd_name,
+          mtd_type: may_map(map_module_type, mtd$1.mtd_type),
+          mtd_attributes: mtd$1.mtd_attributes,
+          mtd_loc: mtd$1.mtd_loc
+        });
   };
   const map_structure_item = function (item) {
     const item$1 = Curry._1(funarg.enter_structure_item, item);
@@ -26822,10 +26822,10 @@ function TypedtreeMap_MakeMap(funarg) {
       case /* Tstr_class */10 :
           const list$1 = Stdlib__List.map((function (param) {
                   return [
-                          map_class_declaration(param[0]),
-                          param[1],
-                          param[2]
-                        ];
+                    map_class_declaration(param[0]),
+                    param[1],
+                    param[2]
+                  ];
                 }), vd._0);
           str_desc = {
             TAG: /* Tstr_class */10,
@@ -26835,10 +26835,10 @@ function TypedtreeMap_MakeMap(funarg) {
       case /* Tstr_class_type */11 :
           const list$2 = Stdlib__List.map((function (param) {
                   return [
-                          param[0],
-                          param[1],
-                          map_class_type_declaration(param[2])
-                        ];
+                    param[0],
+                    param[1],
+                    map_class_type_declaration(param[2])
+                  ];
                 }), vd._0);
           str_desc = {
             TAG: /* Tstr_class_type */11,
@@ -26866,20 +26866,20 @@ function TypedtreeMap_MakeMap(funarg) {
       
     }
     return Curry._1(funarg.leave_structure_item, {
-                str_desc: str_desc,
-                str_loc: item$1.str_loc,
-                str_env: item$1.str_env
-              });
+          str_desc: str_desc,
+          str_loc: item$1.str_loc,
+          str_env: item$1.str_env
+        });
   };
   const map_class_signature = function (cs) {
     const cs$1 = Curry._1(funarg.enter_class_signature, cs);
     const csig_self = map_core_type(cs$1.csig_self);
     const csig_fields = Stdlib__List.map(map_class_type_field, cs$1.csig_fields);
     return Curry._1(funarg.leave_class_signature, {
-                csig_self: csig_self,
-                csig_fields: csig_fields,
-                csig_type: cs$1.csig_type
-              });
+          csig_self: csig_self,
+          csig_fields: csig_fields,
+          csig_type: cs$1.csig_type
+        });
   };
   const map_pat_extra = function (pat_extra) {
     const ct = pat_extra[0];
@@ -26887,13 +26887,13 @@ function TypedtreeMap_MakeMap(funarg) {
       return pat_extra;
     } else {
       return [
-              {
-                TAG: /* Tpat_constraint */0,
-                _0: map_core_type(ct._0)
-              },
-              pat_extra[1],
-              pat_extra[2]
-            ];
+        {
+          TAG: /* Tpat_constraint */0,
+          _0: map_core_type(ct._0)
+        },
+        pat_extra[1],
+        pat_extra[2]
+      ];
     }
   };
   const map_pattern = function (pat) {
@@ -26942,10 +26942,10 @@ function TypedtreeMap_MakeMap(funarg) {
               TAG: /* Tpat_record */6,
               _0: Stdlib__List.map((function (param) {
                       return [
-                              param[0],
-                              param[1],
-                              map_pattern(param[2])
-                            ];
+                        param[0],
+                        param[1],
+                        map_pattern(param[2])
+                      ];
                     }), list._0),
               _1: list._1
             };
@@ -26976,21 +26976,21 @@ function TypedtreeMap_MakeMap(funarg) {
     }
     const pat_extra = Stdlib__List.map(map_pat_extra, pat$1.pat_extra);
     return Curry._1(funarg.leave_pattern, {
-                pat_desc: pat_desc,
-                pat_loc: pat$1.pat_loc,
-                pat_extra: pat_extra,
-                pat_type: pat$1.pat_type,
-                pat_env: pat$1.pat_env,
-                pat_attributes: pat$1.pat_attributes
-              });
+          pat_desc: pat_desc,
+          pat_loc: pat$1.pat_loc,
+          pat_extra: pat_extra,
+          pat_type: pat$1.pat_type,
+          pat_env: pat$1.pat_env,
+          pat_attributes: pat$1.pat_attributes
+        });
   };
   const map_binding = function (vb) {
     return {
-            vb_pat: map_pattern(vb.vb_pat),
-            vb_expr: map_expression(vb.vb_expr),
-            vb_attributes: vb.vb_attributes,
-            vb_loc: vb.vb_loc
-          };
+      vb_pat: map_pattern(vb.vb_pat),
+      vb_expr: map_expression(vb.vb_expr),
+      vb_attributes: vb.vb_attributes,
+      vb_loc: vb.vb_loc
+    };
   };
   const map_class_expr = function (cexpr) {
     const cexpr$1 = Curry._1(funarg.enter_class_expr, cexpr);
@@ -27018,10 +27018,10 @@ function TypedtreeMap_MakeMap(funarg) {
             _1: map_pattern(clstr._1),
             _2: Stdlib__List.map((function (param) {
                     return [
-                            param[0],
-                            param[1],
-                            map_expression(param[2])
-                          ];
+                      param[0],
+                      param[1],
+                      map_expression(param[2])
+                    ];
                   }), clstr._2),
             _3: map_class_expr(clstr._3),
             _4: clstr._4
@@ -27033,10 +27033,10 @@ function TypedtreeMap_MakeMap(funarg) {
             _0: map_class_expr(clstr._0),
             _1: Stdlib__List.map((function (param) {
                     return [
-                            param[0],
-                            may_map(map_expression, param[1]),
-                            param[2]
-                          ];
+                      param[0],
+                      may_map(map_expression, param[1]),
+                      param[2]
+                    ];
                   }), clstr._1)
           };
           break;
@@ -27048,10 +27048,10 @@ function TypedtreeMap_MakeMap(funarg) {
             _1: Stdlib__List.map(map_binding, clstr._1),
             _2: Stdlib__List.map((function (param) {
                     return [
-                            param[0],
-                            param[1],
-                            map_expression(param[2])
-                          ];
+                      param[0],
+                      param[1],
+                      map_expression(param[2])
+                    ];
                   }), clstr._2),
             _3: map_class_expr(clstr._3)
           };
@@ -27060,50 +27060,50 @@ function TypedtreeMap_MakeMap(funarg) {
           const clty = clstr._1;
           const cl = clstr._0;
           cl_desc = clty !== undefined ? ({
-                TAG: /* Tcl_constraint */5,
-                _0: map_class_expr(cl),
-                _1: map_class_type(clty),
-                _2: clstr._2,
-                _3: clstr._3,
-                _4: clstr._4
-              }) : ({
-                TAG: /* Tcl_constraint */5,
-                _0: map_class_expr(cl),
-                _1: undefined,
-                _2: clstr._2,
-                _3: clstr._3,
-                _4: clstr._4
-              });
+              TAG: /* Tcl_constraint */5,
+              _0: map_class_expr(cl),
+              _1: map_class_type(clty),
+              _2: clstr._2,
+              _3: clstr._3,
+              _4: clstr._4
+            }) : ({
+              TAG: /* Tcl_constraint */5,
+              _0: map_class_expr(cl),
+              _1: undefined,
+              _2: clstr._2,
+              _3: clstr._3,
+              _4: clstr._4
+            });
           break;
       
     }
     return Curry._1(funarg.leave_class_expr, {
-                cl_desc: cl_desc,
-                cl_loc: cexpr$1.cl_loc,
-                cl_type: cexpr$1.cl_type,
-                cl_env: cexpr$1.cl_env,
-                cl_attributes: cexpr$1.cl_attributes
-              });
+          cl_desc: cl_desc,
+          cl_loc: cexpr$1.cl_loc,
+          cl_type: cexpr$1.cl_type,
+          cl_env: cexpr$1.cl_env,
+          cl_attributes: cexpr$1.cl_attributes
+        });
   };
   const map_class_structure = function (cs) {
     const cs$1 = Curry._1(funarg.enter_class_structure, cs);
     const cstr_self = map_pattern(cs$1.cstr_self);
     const cstr_fields = Stdlib__List.map(map_class_field, cs$1.cstr_fields);
     return Curry._1(funarg.leave_class_structure, {
-                cstr_self: cstr_self,
-                cstr_fields: cstr_fields,
-                cstr_type: cs$1.cstr_type,
-                cstr_meths: cs$1.cstr_meths
-              });
+          cstr_self: cstr_self,
+          cstr_fields: cstr_fields,
+          cstr_type: cs$1.cstr_type,
+          cstr_meths: cs$1.cstr_meths
+        });
   };
   const map_signature = function (sg) {
     const sg$1 = Curry._1(funarg.enter_signature, sg);
     const sig_items = Stdlib__List.map(map_signature_item, sg$1.sig_items);
     return Curry._1(funarg.leave_signature, {
-                sig_items: sig_items,
-                sig_type: sg$1.sig_type,
-                sig_final_env: sg$1.sig_final_env
-              });
+          sig_items: sig_items,
+          sig_type: sg$1.sig_type,
+          sig_final_env: sg$1.sig_final_env
+        });
   };
   const map_with_constraint = function (cstr) {
     const cstr$1 = Curry._1(funarg.enter_with_constraint, cstr);
@@ -27150,50 +27150,50 @@ function TypedtreeMap_MakeMap(funarg) {
           const mut = exp._1;
           const lab = exp._0;
           cf_desc = cty.TAG === /* Tcfk_virtual */0 ? ({
-                TAG: /* Tcf_val */1,
-                _0: lab,
-                _1: mut,
-                _2: ident,
-                _3: {
-                  TAG: /* Tcfk_virtual */0,
-                  _0: map_core_type(cty._0)
-                },
-                _4: exp._4
-              }) : ({
-                TAG: /* Tcf_val */1,
-                _0: lab,
-                _1: mut,
-                _2: ident,
-                _3: {
-                  TAG: /* Tcfk_concrete */1,
-                  _0: cty._0,
-                  _1: map_expression(cty._1)
-                },
-                _4: exp._4
-              });
+              TAG: /* Tcf_val */1,
+              _0: lab,
+              _1: mut,
+              _2: ident,
+              _3: {
+                TAG: /* Tcfk_virtual */0,
+                _0: map_core_type(cty._0)
+              },
+              _4: exp._4
+            }) : ({
+              TAG: /* Tcf_val */1,
+              _0: lab,
+              _1: mut,
+              _2: ident,
+              _3: {
+                TAG: /* Tcfk_concrete */1,
+                _0: cty._0,
+                _1: map_expression(cty._1)
+              },
+              _4: exp._4
+            });
           break;
       case /* Tcf_method */2 :
           const cty$1 = exp._2;
           const priv = exp._1;
           const lab$1 = exp._0;
           cf_desc = cty$1.TAG === /* Tcfk_virtual */0 ? ({
-                TAG: /* Tcf_method */2,
-                _0: lab$1,
-                _1: priv,
-                _2: {
-                  TAG: /* Tcfk_virtual */0,
-                  _0: map_core_type(cty$1._0)
-                }
-              }) : ({
-                TAG: /* Tcf_method */2,
-                _0: lab$1,
-                _1: priv,
-                _2: {
-                  TAG: /* Tcfk_concrete */1,
-                  _0: cty$1._0,
-                  _1: map_expression(cty$1._1)
-                }
-              });
+              TAG: /* Tcf_method */2,
+              _0: lab$1,
+              _1: priv,
+              _2: {
+                TAG: /* Tcfk_virtual */0,
+                _0: map_core_type(cty$1._0)
+              }
+            }) : ({
+              TAG: /* Tcf_method */2,
+              _0: lab$1,
+              _1: priv,
+              _2: {
+                TAG: /* Tcfk_concrete */1,
+                _0: cty$1._0,
+                _1: map_expression(cty$1._1)
+              }
+            });
           break;
       case /* Tcf_constraint */3 :
           cf_desc = {
@@ -27214,38 +27214,38 @@ function TypedtreeMap_MakeMap(funarg) {
       
     }
     return Curry._1(funarg.leave_class_field, {
-                cf_desc: cf_desc,
-                cf_loc: cf$1.cf_loc,
-                cf_attributes: cf$1.cf_attributes
-              });
+          cf_desc: cf_desc,
+          cf_loc: cf$1.cf_loc,
+          cf_attributes: cf$1.cf_attributes
+        });
   };
   const map_class_declaration = function (cd) {
     const cd$1 = Curry._1(funarg.enter_class_declaration, cd);
     const ci_params = Stdlib__List.map(map_type_parameter, cd$1.ci_params);
     const ci_expr = map_class_expr(cd$1.ci_expr);
     return Curry._1(funarg.leave_class_declaration, {
-                ci_virt: cd$1.ci_virt,
-                ci_params: ci_params,
-                ci_id_name: cd$1.ci_id_name,
-                ci_id_class: cd$1.ci_id_class,
-                ci_id_class_type: cd$1.ci_id_class_type,
-                ci_id_object: cd$1.ci_id_object,
-                ci_id_typesharp: cd$1.ci_id_typesharp,
-                ci_expr: ci_expr,
-                ci_decl: cd$1.ci_decl,
-                ci_type_decl: cd$1.ci_type_decl,
-                ci_loc: cd$1.ci_loc,
-                ci_attributes: cd$1.ci_attributes
-              });
+          ci_virt: cd$1.ci_virt,
+          ci_params: ci_params,
+          ci_id_name: cd$1.ci_id_name,
+          ci_id_class: cd$1.ci_id_class,
+          ci_id_class_type: cd$1.ci_id_class_type,
+          ci_id_object: cd$1.ci_id_object,
+          ci_id_typesharp: cd$1.ci_id_typesharp,
+          ci_expr: ci_expr,
+          ci_decl: cd$1.ci_decl,
+          ci_type_decl: cd$1.ci_type_decl,
+          ci_loc: cd$1.ci_loc,
+          ci_attributes: cd$1.ci_attributes
+        });
   };
   const map_module_binding = function (x) {
     return {
-            mb_id: x.mb_id,
-            mb_name: x.mb_name,
-            mb_expr: map_module_expr(x.mb_expr),
-            mb_attributes: x.mb_attributes,
-            mb_loc: x.mb_loc
-          };
+      mb_id: x.mb_id,
+      mb_name: x.mb_name,
+      mb_expr: map_module_expr(x.mb_expr),
+      mb_attributes: x.mb_attributes,
+      mb_loc: x.mb_loc
+    };
   };
   const map_signature_item = function (item) {
     const item$1 = Curry._1(funarg.enter_signature_item, item);
@@ -27294,12 +27294,12 @@ function TypedtreeMap_MakeMap(funarg) {
             TAG: /* Tsig_recmodule */5,
             _0: Stdlib__List.map((function (md) {
                     return {
-                            md_id: md.md_id,
-                            md_name: md.md_name,
-                            md_type: map_module_type(md.md_type),
-                            md_attributes: md.md_attributes,
-                            md_loc: md.md_loc
-                          };
+                      md_id: md.md_id,
+                      md_name: md.md_name,
+                      md_type: map_module_type(md.md_type),
+                      md_attributes: md.md_attributes,
+                      md_loc: md.md_loc
+                    };
                   }), vd._0)
           };
           break;
@@ -27342,20 +27342,20 @@ function TypedtreeMap_MakeMap(funarg) {
       
     }
     return Curry._1(funarg.leave_signature_item, {
-                sig_desc: sig_desc,
-                sig_env: item$1.sig_env,
-                sig_loc: item$1.sig_loc
-              });
+          sig_desc: sig_desc,
+          sig_env: item$1.sig_env,
+          sig_loc: item$1.sig_loc
+        });
   };
   const map_constructor_declaration = function (cd) {
     return {
-            cd_id: cd.cd_id,
-            cd_name: cd.cd_name,
-            cd_args: Stdlib__List.map(map_core_type, cd.cd_args),
-            cd_res: may_map(map_core_type, cd.cd_res),
-            cd_loc: cd.cd_loc,
-            cd_attributes: cd.cd_attributes
-          };
+      cd_id: cd.cd_id,
+      cd_name: cd.cd_name,
+      cd_args: Stdlib__List.map(map_core_type, cd.cd_args),
+      cd_res: may_map(map_core_type, cd.cd_res),
+      cd_loc: cd.cd_loc,
+      cd_attributes: cd.cd_attributes
+    };
   };
   const map_class_type_field = function (ctf) {
     const ctf$1 = Curry._1(funarg.enter_class_type_field, ctf);
@@ -27408,48 +27408,48 @@ function TypedtreeMap_MakeMap(funarg) {
       
     }
     return Curry._1(funarg.leave_class_type_field, {
-                ctf_desc: ctf_desc,
-                ctf_loc: ctf$1.ctf_loc,
-                ctf_attributes: ctf$1.ctf_attributes
-              });
+          ctf_desc: ctf_desc,
+          ctf_loc: ctf$1.ctf_loc,
+          ctf_attributes: ctf$1.ctf_attributes
+        });
   };
   const map_case = function (param) {
     return {
-            c_lhs: map_pattern(param.c_lhs),
-            c_guard: may_map(map_expression, param.c_guard),
-            c_rhs: map_expression(param.c_rhs)
-          };
+      c_lhs: map_pattern(param.c_lhs),
+      c_guard: may_map(map_expression, param.c_guard),
+      c_rhs: map_expression(param.c_rhs)
+    };
   };
   const map_row_field = function (rf) {
     if (rf.TAG === /* Ttag */0) {
       return {
-              TAG: /* Ttag */0,
-              _0: rf._0,
-              _1: rf._1,
-              _2: rf._2,
-              _3: Stdlib__List.map(map_core_type, rf._3)
-            };
+        TAG: /* Ttag */0,
+        _0: rf._0,
+        _1: rf._1,
+        _2: rf._2,
+        _3: Stdlib__List.map(map_core_type, rf._3)
+      };
     } else {
       return {
-              TAG: /* Tinherit */1,
-              _0: map_core_type(rf._0)
-            };
+        TAG: /* Tinherit */1,
+        _0: map_core_type(rf._0)
+      };
     }
   };
   const map_package_type = function (pack) {
     const pack$1 = Curry._1(funarg.enter_package_type, pack);
     const pack_fields = Stdlib__List.map((function (param) {
             return [
-                    param[0],
-                    map_core_type(param[1])
-                  ];
+              param[0],
+              map_core_type(param[1])
+            ];
           }), pack$1.pack_fields);
     return Curry._1(funarg.leave_package_type, {
-                pack_path: pack$1.pack_path,
-                pack_fields: pack_fields,
-                pack_type: pack$1.pack_type,
-                pack_txt: pack$1.pack_txt
-              });
+          pack_path: pack$1.pack_path,
+          pack_fields: pack_fields,
+          pack_type: pack$1.pack_type,
+          pack_txt: pack$1.pack_txt
+        });
   };
   const map_exp_extra = function (exp_extra) {
     const attrs = exp_extra[2];
@@ -27458,47 +27458,47 @@ function TypedtreeMap_MakeMap(funarg) {
     switch (desc.TAG) {
       case /* Texp_constraint */0 :
           return [
-                  {
-                    TAG: /* Texp_constraint */0,
-                    _0: map_core_type(desc._0)
-                  },
-                  loc,
-                  attrs
-                ];
+            {
+              TAG: /* Texp_constraint */0,
+              _0: map_core_type(desc._0)
+            },
+            loc,
+            attrs
+          ];
       case /* Texp_coerce */1 :
           const ct1 = desc._0;
           if (ct1 !== undefined) {
             return [
-                    {
-                      TAG: /* Texp_coerce */1,
-                      _0: map_core_type(ct1),
-                      _1: map_core_type(desc._1)
-                    },
-                    loc,
-                    attrs
-                  ];
+              {
+                TAG: /* Texp_coerce */1,
+                _0: map_core_type(ct1),
+                _1: map_core_type(desc._1)
+              },
+              loc,
+              attrs
+            ];
           } else {
             return [
-                    {
-                      TAG: /* Texp_coerce */1,
-                      _0: undefined,
-                      _1: map_core_type(desc._1)
-                    },
-                    loc,
-                    attrs
-                  ];
+              {
+                TAG: /* Texp_coerce */1,
+                _0: undefined,
+                _1: map_core_type(desc._1)
+              },
+              loc,
+              attrs
+            ];
           }
       case /* Texp_poly */3 :
           const ct = desc._0;
           if (ct !== undefined) {
             return [
-                    {
-                      TAG: /* Texp_poly */3,
-                      _0: map_core_type(ct)
-                    },
-                    loc,
-                    attrs
-                  ];
+              {
+                TAG: /* Texp_poly */3,
+                _0: map_core_type(ct)
+              },
+              loc,
+              attrs
+            ];
           } else {
             return exp_extra;
           }
@@ -27509,15 +27509,15 @@ function TypedtreeMap_MakeMap(funarg) {
     }
   };
   return {
-          map_structure: map_structure,
-          map_pattern: map_pattern,
-          map_structure_item: map_structure_item,
-          map_expression: map_expression,
-          map_class_expr: map_class_expr,
-          map_signature: map_signature,
-          map_signature_item: map_signature_item,
-          map_module_type: map_module_type
-        };
+    map_structure: map_structure,
+    map_pattern: map_pattern,
+    map_structure_item: map_structure_item,
+    map_expression: map_expression,
+    map_class_expr: map_class_expr,
+    map_signature: map_signature,
+    map_signature_item: map_signature_item,
+    map_module_type: map_module_type
+  };
 }
 
 let need_to_clear_env;
@@ -27537,13 +27537,13 @@ catch (raw_exn$2){
 
 function leave_pattern(p) {
   return {
-          pat_desc: p.pat_desc,
-          pat_loc: p.pat_loc,
-          pat_extra: p.pat_extra,
-          pat_type: p.pat_type,
-          pat_env: keep_only_summary(p.pat_env),
-          pat_attributes: p.pat_attributes
-        };
+    pat_desc: p.pat_desc,
+    pat_loc: p.pat_loc,
+    pat_extra: p.pat_extra,
+    pat_type: p.pat_type,
+    pat_env: keep_only_summary(p.pat_env),
+    pat_attributes: p.pat_attributes
+  };
 }
 
 function leave_expression(e) {
@@ -27551,110 +27551,110 @@ function leave_expression(e) {
           const match = exp_extra[0];
           if (match.TAG === /* Texp_open */2) {
             return [
-                    {
-                      TAG: /* Texp_open */2,
-                      _0: match._0,
-                      _1: match._1,
-                      _2: match._2,
-                      _3: keep_only_summary(match._3)
-                    },
-                    exp_extra[1],
-                    exp_extra[2]
-                  ];
+              {
+                TAG: /* Texp_open */2,
+                _0: match._0,
+                _1: match._1,
+                _2: match._2,
+                _3: keep_only_summary(match._3)
+              },
+              exp_extra[1],
+              exp_extra[2]
+            ];
           } else {
             return exp_extra;
           }
         }), e.exp_extra);
   return {
-          exp_desc: e.exp_desc,
-          exp_loc: e.exp_loc,
-          exp_extra: exp_extra,
-          exp_type: e.exp_type,
-          exp_env: keep_only_summary(e.exp_env),
-          exp_attributes: e.exp_attributes
-        };
+    exp_desc: e.exp_desc,
+    exp_loc: e.exp_loc,
+    exp_extra: exp_extra,
+    exp_type: e.exp_type,
+    exp_env: keep_only_summary(e.exp_env),
+    exp_attributes: e.exp_attributes
+  };
 }
 
 function leave_class_expr(c) {
   return {
-          cl_desc: c.cl_desc,
-          cl_loc: c.cl_loc,
-          cl_type: c.cl_type,
-          cl_env: keep_only_summary(c.cl_env),
-          cl_attributes: c.cl_attributes
-        };
+    cl_desc: c.cl_desc,
+    cl_loc: c.cl_loc,
+    cl_type: c.cl_type,
+    cl_env: keep_only_summary(c.cl_env),
+    cl_attributes: c.cl_attributes
+  };
 }
 
 function leave_module_expr(m) {
   return {
-          mod_desc: m.mod_desc,
-          mod_loc: m.mod_loc,
-          mod_type: m.mod_type,
-          mod_env: keep_only_summary(m.mod_env),
-          mod_attributes: m.mod_attributes
-        };
+    mod_desc: m.mod_desc,
+    mod_loc: m.mod_loc,
+    mod_type: m.mod_type,
+    mod_env: keep_only_summary(m.mod_env),
+    mod_attributes: m.mod_attributes
+  };
 }
 
 function leave_structure(s) {
   return {
-          str_items: s.str_items,
-          str_type: s.str_type,
-          str_final_env: keep_only_summary(s.str_final_env)
-        };
+    str_items: s.str_items,
+    str_type: s.str_type,
+    str_final_env: keep_only_summary(s.str_final_env)
+  };
 }
 
 function leave_structure_item(str) {
   return {
-          str_desc: str.str_desc,
-          str_loc: str.str_loc,
-          str_env: keep_only_summary(str.str_env)
-        };
+    str_desc: str.str_desc,
+    str_loc: str.str_loc,
+    str_env: keep_only_summary(str.str_env)
+  };
 }
 
 function leave_module_type(m) {
   return {
-          mty_desc: m.mty_desc,
-          mty_type: m.mty_type,
-          mty_env: keep_only_summary(m.mty_env),
-          mty_loc: m.mty_loc,
-          mty_attributes: m.mty_attributes
-        };
+    mty_desc: m.mty_desc,
+    mty_type: m.mty_type,
+    mty_env: keep_only_summary(m.mty_env),
+    mty_loc: m.mty_loc,
+    mty_attributes: m.mty_attributes
+  };
 }
 
 function leave_signature(s) {
   return {
-          sig_items: s.sig_items,
-          sig_type: s.sig_type,
-          sig_final_env: keep_only_summary(s.sig_final_env)
-        };
+    sig_items: s.sig_items,
+    sig_type: s.sig_type,
+    sig_final_env: keep_only_summary(s.sig_final_env)
+  };
 }
 
 function leave_signature_item(s) {
   return {
-          sig_desc: s.sig_desc,
-          sig_env: keep_only_summary(s.sig_env),
-          sig_loc: s.sig_loc
-        };
+    sig_desc: s.sig_desc,
+    sig_env: keep_only_summary(s.sig_env),
+    sig_loc: s.sig_loc
+  };
 }
 
 function leave_core_type(c) {
   return {
-          ctyp_desc: c.ctyp_desc,
-          ctyp_type: c.ctyp_type,
-          ctyp_env: keep_only_summary(c.ctyp_env),
-          ctyp_loc: c.ctyp_loc,
-          ctyp_attributes: c.ctyp_attributes
-        };
+    ctyp_desc: c.ctyp_desc,
+    ctyp_type: c.ctyp_type,
+    ctyp_env: keep_only_summary(c.ctyp_env),
+    ctyp_loc: c.ctyp_loc,
+    ctyp_attributes: c.ctyp_attributes
+  };
 }
 
 function leave_class_type(c) {
   return {
-          cltyp_desc: c.cltyp_desc,
-          cltyp_type: c.cltyp_type,
-          cltyp_env: keep_only_summary(c.cltyp_env),
-          cltyp_loc: c.cltyp_loc,
-          cltyp_attributes: c.cltyp_attributes
-        };
+    cltyp_desc: c.cltyp_desc,
+    cltyp_type: c.cltyp_type,
+    cltyp_env: keep_only_summary(c.cltyp_env),
+    cltyp_loc: c.cltyp_loc,
+    cltyp_attributes: c.cltyp_attributes
+  };
 }
 
 const ClearEnv = Curry._1(TypedtreeMap_MakeMap, {
@@ -27714,44 +27714,44 @@ function clear_part(p) {
   switch (p.TAG) {
     case /* Partial_structure */0 :
         return {
-                TAG: /* Partial_structure */0,
-                _0: Curry._1(ClearEnv.map_structure, p._0)
-              };
+          TAG: /* Partial_structure */0,
+          _0: Curry._1(ClearEnv.map_structure, p._0)
+        };
     case /* Partial_structure_item */1 :
         return {
-                TAG: /* Partial_structure_item */1,
-                _0: Curry._1(ClearEnv.map_structure_item, p._0)
-              };
+          TAG: /* Partial_structure_item */1,
+          _0: Curry._1(ClearEnv.map_structure_item, p._0)
+        };
     case /* Partial_expression */2 :
         return {
-                TAG: /* Partial_expression */2,
-                _0: Curry._1(ClearEnv.map_expression, p._0)
-              };
+          TAG: /* Partial_expression */2,
+          _0: Curry._1(ClearEnv.map_expression, p._0)
+        };
     case /* Partial_pattern */3 :
         return {
-                TAG: /* Partial_pattern */3,
-                _0: Curry._1(ClearEnv.map_pattern, p._0)
-              };
+          TAG: /* Partial_pattern */3,
+          _0: Curry._1(ClearEnv.map_pattern, p._0)
+        };
     case /* Partial_class_expr */4 :
         return {
-                TAG: /* Partial_class_expr */4,
-                _0: Curry._1(ClearEnv.map_class_expr, p._0)
-              };
+          TAG: /* Partial_class_expr */4,
+          _0: Curry._1(ClearEnv.map_class_expr, p._0)
+        };
     case /* Partial_signature */5 :
         return {
-                TAG: /* Partial_signature */5,
-                _0: Curry._1(ClearEnv.map_signature, p._0)
-              };
+          TAG: /* Partial_signature */5,
+          _0: Curry._1(ClearEnv.map_signature, p._0)
+        };
     case /* Partial_signature_item */6 :
         return {
-                TAG: /* Partial_signature_item */6,
-                _0: Curry._1(ClearEnv.map_signature_item, p._0)
-              };
+          TAG: /* Partial_signature_item */6,
+          _0: Curry._1(ClearEnv.map_signature_item, p._0)
+        };
     case /* Partial_module_type */7 :
         return {
-                TAG: /* Partial_module_type */7,
-                _0: Curry._1(ClearEnv.map_module_type, p._0)
-              };
+          TAG: /* Partial_module_type */7,
+          _0: Curry._1(ClearEnv.map_module_type, p._0)
+        };
     
   }
 }
@@ -27765,24 +27765,24 @@ function clear_env(binary_annots) {
         return binary_annots;
     case /* Implementation */1 :
         return {
-                TAG: /* Implementation */1,
-                _0: Curry._1(ClearEnv.map_structure, binary_annots._0)
-              };
+          TAG: /* Implementation */1,
+          _0: Curry._1(ClearEnv.map_structure, binary_annots._0)
+        };
     case /* Interface */2 :
         return {
-                TAG: /* Interface */2,
-                _0: Curry._1(ClearEnv.map_signature, binary_annots._0)
-              };
+          TAG: /* Interface */2,
+          _0: Curry._1(ClearEnv.map_signature, binary_annots._0)
+        };
     case /* Partial_implementation */3 :
         return {
-                TAG: /* Partial_implementation */3,
-                _0: Stdlib__Array.map(clear_part, binary_annots._0)
-              };
+          TAG: /* Partial_implementation */3,
+          _0: Stdlib__Array.map(clear_part, binary_annots._0)
+        };
     case /* Partial_interface */4 :
         return {
-                TAG: /* Partial_interface */4,
-                _0: Stdlib__Array.map(clear_part, binary_annots._0)
-              };
+          TAG: /* Partial_interface */4,
+          _0: Stdlib__Array.map(clear_part, binary_annots._0)
+        };
     
   }
 }
@@ -27833,9 +27833,9 @@ function save_cmt(filename, modname, binary_annots, sourcefile, initial_env, sg)
     let this_crc;
     if (sg !== undefined) {
       const cmi_cmi_flags = recursive_types.contents ? ({
-            hd: /* Rectypes */0,
-            tl: /* [] */0
-          }) : /* [] */0;
+          hd: /* Rectypes */0,
+          tl: /* [] */0
+        }) : /* [] */0;
       const cmi = {
         cmi_name: modname,
         cmi_sign: sg,
@@ -27899,67 +27899,64 @@ const Tags = /* @__PURE__ */Caml_exceptions.create("Ocaml_typedtree_test.Ctype.T
 register_error_of_exn(function (param) {
       if (param.MEL_EXN_ID === Tags) {
         return Curry._2(errorf(in_file(input_name.contents), undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "In this program,",
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "In this program,",
+                    _1: {
+                      TAG: /* Formatting_lit */17,
+                      _0: {
+                        TAG: /* Break */0,
+                        _0: "@ ",
+                        _1: 1,
+                        _2: 0
+                      },
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "variant constructors",
+                        _1: {
+                          TAG: /* Formatting_lit */17,
+                          _0: {
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
                           _1: {
-                            TAG: /* Formatting_lit */17,
-                            _0: {
-                              TAG: /* Break */0,
-                              _0: "@ ",
-                              _1: 1,
-                              _2: 0
-                            },
+                            TAG: /* Char_literal */12,
+                            _0: /* '`' */96,
                             _1: {
-                              TAG: /* String_literal */11,
-                              _0: "variant constructors",
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
                               _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
+                                TAG: /* String_literal */11,
+                                _0: " and `",
                                 _1: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* '`' */96,
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
                                   _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
+                                    TAG: /* Formatting_lit */17,
+                                    _0: {
+                                      TAG: /* Break */0,
+                                      _0: "@ ",
+                                      _1: 1,
+                                      _2: 0
+                                    },
                                     _1: {
                                       TAG: /* String_literal */11,
-                                      _0: " and `",
+                                      _0: "have the same hash value.",
                                       _1: {
-                                        TAG: /* String */2,
-                                        _0: /* No_padding */0,
+                                        TAG: /* Formatting_lit */17,
+                                        _0: {
+                                          TAG: /* Break */0,
+                                          _0: "@ ",
+                                          _1: 1,
+                                          _2: 0
+                                        },
                                         _1: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: {
-                                            TAG: /* Break */0,
-                                            _0: "@ ",
-                                            _1: 1,
-                                            _2: 0
-                                          },
-                                          _1: {
-                                            TAG: /* String_literal */11,
-                                            _0: "have the same hash value.",
-                                            _1: {
-                                              TAG: /* Formatting_lit */17,
-                                              _0: {
-                                                TAG: /* Break */0,
-                                                _0: "@ ",
-                                                _1: 1,
-                                                _2: 0
-                                              },
-                                              _1: {
-                                                TAG: /* String_literal */11,
-                                                _0: "Change one of them.",
-                                                _1: /* End_of_format */0
-                                              }
-                                            }
-                                          }
+                                          TAG: /* String_literal */11,
+                                          _0: "Change one of them.",
+                                          _1: /* End_of_format */0
                                         }
                                       }
                                     }
@@ -27968,9 +27965,12 @@ register_error_of_exn(function (param) {
                               }
                             }
                           }
-                        },
-                        _1: "In this program,@ variant constructors@ `%s and `%s@ have the same hash value.@ Change one of them."
-                      }), param._1, param._2);
+                        }
+                      }
+                    }
+                  },
+                  _1: "In this program,@ variant constructors@ `%s and `%s@ have the same hash value.@ Change one of them."
+                }), param._1, param._2);
       }
       
     });
@@ -28066,13 +28066,13 @@ function is_object_type(path) {
         break;
     case /* Papply */2 :
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/ocaml_typedtree_test.ml",
-                    30161,
-                    23
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/ocaml_typedtree_test.ml",
+                30161,
+                23
+              ]
+            });
     
   }
   return Caml_string.get(name, 0) === /* '#' */35;
@@ -28121,37 +28121,37 @@ function proper_abbrevs(path, tl, abbrev) {
 
 function newvar(name, param) {
   return newty2(current_level.contents, {
-              TAG: /* Tvar */0,
-              _0: name
-            });
+        TAG: /* Tvar */0,
+        _0: name
+      });
 }
 
 function new_global_var(name, param) {
   return newty2(global_level.contents, {
-              TAG: /* Tvar */0,
-              _0: name
-            });
+        TAG: /* Tvar */0,
+        _0: name
+      });
 }
 
 function newobj(fields) {
   return newty2(current_level.contents, {
-              TAG: /* Tobject */4,
-              _0: fields,
-              _1: {
-                contents: undefined
-              }
-            });
+        TAG: /* Tobject */4,
+        _0: fields,
+        _1: {
+          contents: undefined
+        }
+      });
 }
 
 function newconstr(path, tyl) {
   return newty2(current_level.contents, {
-              TAG: /* Tconstr */3,
-              _0: path,
-              _1: tyl,
-              _2: {
-                contents: /* Mnil */0
-              }
-            });
+        TAG: /* Tconstr */3,
+        _0: path,
+        _1: tyl,
+        _2: {
+          contents: /* Mnil */0
+        }
+      });
 }
 
 const none$2 = newty2(current_level.contents, {
@@ -28251,25 +28251,25 @@ function object_fields(ty) {
   const match = repr(ty).desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                30296,
-                27
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            30296,
+            27
+          ]
+        });
   }
   if (match.TAG === /* Tobject */4) {
     return match._0;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              30296,
-              27
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          30296,
+          27
+        ]
+      });
 }
 
 function flatten_fields(ty) {
@@ -28281,15 +28281,15 @@ function flatten_fields(ty) {
       const match = ty$1.desc;
       if (/* tag */typeof match === "number" || typeof match === "string") {
         return [
-                l,
-                ty$1
-              ];
+          l,
+          ty$1
+        ];
       }
       if (match.TAG !== /* Tfield */5) {
         return [
-                l,
-                ty$1
-              ];
+          l,
+          ty$1
+        ];
       }
       _ty = match._3;
       _l = {
@@ -28305,24 +28305,24 @@ function flatten_fields(ty) {
   };
   const match = flatten(/* [] */0, ty);
   return [
-          Stdlib__List.sort((function (param, param$1) {
-                  return Caml.caml_string_compare(param[0], param$1[0]);
-                }), match[0]),
-          match[1]
-        ];
+    Stdlib__List.sort((function (param, param$1) {
+            return Caml.caml_string_compare(param[0], param$1[0]);
+          }), match[0]),
+    match[1]
+  ];
 }
 
 function build_fields(level) {
   return function (param, param$1) {
     return Stdlib__List.fold_right((function (param, ty2) {
-                  return newty2(level, {
-                              TAG: /* Tfield */5,
-                              _0: param[0],
-                              _1: param[1],
-                              _2: param[2],
-                              _3: ty2
-                            });
-                }), param, param$1);
+            return newty2(level, {
+                  TAG: /* Tfield */5,
+                  _0: param[0],
+                  _1: param[1],
+                  _2: param[2],
+                  _3: ty2
+                });
+          }), param, param$1);
   };
 }
 
@@ -28342,17 +28342,17 @@ function associate_fields(fields1, fields2) {
     const l = param[0];
     if (!param[1]) {
       return [
-              Stdlib__List.rev(p),
-              Stdlib.$at(Stdlib__List.rev(s), l),
-              Stdlib__List.rev(s$p)
-            ];
+        Stdlib__List.rev(p),
+        Stdlib.$at(Stdlib__List.rev(s), l),
+        Stdlib__List.rev(s$p)
+      ];
     }
     if (!l) {
       return [
-              Stdlib__List.rev(p),
-              Stdlib__List.rev(s),
-              Stdlib.$at(Stdlib__List.rev(s$p), param[1])
-            ];
+        Stdlib__List.rev(p),
+        Stdlib__List.rev(s),
+        Stdlib.$at(Stdlib__List.rev(s$p), param[1])
+      ];
     }
     const l$p = param[1];
     const match = l$p.hd;
@@ -28459,13 +28459,13 @@ function close_object(ty) {
   const match = repr(ty).desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                30363,
-                25
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            30363,
+            25
+          ]
+        });
   }
   if (match.TAG === /* Tobject */4) {
     let _ty = match._0;
@@ -28475,13 +28475,13 @@ function close_object(ty) {
       const match$1 = ty$2.desc;
       if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/ocaml_typedtree_test.ml",
-                    30359,
-                    30
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/ocaml_typedtree_test.ml",
+                30359,
+                30
+              ]
+            });
       }
       switch (match$1.TAG) {
         case /* Tvar */0 :
@@ -28491,37 +28491,37 @@ function close_object(ty) {
             continue ;
         default:
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      30359,
-                      30
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  30359,
+                  30
+                ]
+              });
       }
     };
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              30363,
-              25
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          30363,
+          25
+        ]
+      });
 }
 
 function row_variable(ty) {
   const match = repr(ty).desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                30377,
-                23
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            30377,
+            23
+          ]
+        });
   }
   if (match.TAG === /* Tobject */4) {
     let _ty = match._0;
@@ -28531,13 +28531,13 @@ function row_variable(ty) {
       const match$1 = ty$2.desc;
       if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/ocaml_typedtree_test.ml",
-                    30373,
-                    30
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/ocaml_typedtree_test.ml",
+                30373,
+                30
+              ]
+            });
       }
       switch (match$1.TAG) {
         case /* Tvar */0 :
@@ -28547,92 +28547,92 @@ function row_variable(ty) {
             continue ;
         default:
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      30373,
-                      30
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  30373,
+                  30
+                ]
+              });
       }
     };
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              30377,
-              23
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          30377,
+          23
+        ]
+      });
 }
 
 function set_object_name(id, rv, params, ty) {
   const match = repr(ty).desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                30387,
-                6
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            30387,
+            6
+          ]
+        });
   }
   if (match.TAG === /* Tobject */4) {
     return set_name(match._1, [
-                {
-                  TAG: /* Pident */0,
-                  _0: id
-                },
-                {
-                  hd: rv,
-                  tl: params
-                }
-              ]);
+          {
+            TAG: /* Pident */0,
+            _0: id
+          },
+          {
+            hd: rv,
+            tl: params
+          }
+        ]);
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              30387,
-              6
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          30387,
+          6
+        ]
+      });
 }
 
 function hide_private_methods(ty) {
   const match = repr(ty).desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                30409,
-                6
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            30409,
+            6
+          ]
+        });
   }
   if (match.TAG === /* Tobject */4) {
     match._1.contents = undefined;
     const match$1 = flatten_fields(match._0);
     return Stdlib__List.iter((function (param) {
-                  const r = field_kind_repr(param[1]);
-                  if (/* tag */typeof r === "number" || typeof r === "string") {
-                    return ;
-                  } else {
-                    return set_kind(r._0, /* Fabsent */1);
-                  }
-                }), match$1[0]);
+            const r = field_kind_repr(param[1]);
+            if (/* tag */typeof r === "number" || typeof r === "string") {
+              return ;
+            } else {
+              return set_kind(r._0, /* Fabsent */1);
+            }
+          }), match$1[0]);
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              30409,
-              6
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          30409,
+          6
+        ]
+      });
 }
 
 function signature_of_class_type(_sign) {
@@ -28668,44 +28668,44 @@ function class_type_arity(_param) {
 
 function sort_row_fields(param) {
   return Stdlib__List.sort((function (param, param$1) {
-                return Caml.caml_string_compare(param[0], param$1[0]);
-              }), param);
+          return Caml.caml_string_compare(param[0], param$1[0]);
+        }), param);
 }
 
 function merge_row_fields(fi1, fi2) {
   let exit = 0;
   if (!fi1) {
     return [
-            fi1,
-            fi2,
-            /* [] */0
-          ];
+      fi1,
+      fi2,
+      /* [] */0
+    ];
   }
   if (!fi2) {
     return [
-            fi1,
-            fi2,
-            /* [] */0
-          ];
+      fi1,
+      fi2,
+      /* [] */0
+    ];
   }
   if (fi1.tl) {
     exit = 2;
   } else {
     if (!Stdlib__List.mem_assoc(fi1.hd[0], fi2)) {
       return [
-              fi1,
-              fi2,
-              /* [] */0
-            ];
+        fi1,
+        fi2,
+        /* [] */0
+      ];
     }
     exit = 2;
   }
   if (exit === 2 && !fi2.tl && !Stdlib__List.mem_assoc(fi2.hd[0], fi1)) {
     return [
-            fi1,
-            fi2,
-            /* [] */0
-          ];
+      fi1,
+      fi2,
+      /* [] */0
+    ];
   }
   let _r1 = /* [] */0;
   let _r2 = /* [] */0;
@@ -28720,17 +28720,17 @@ function merge_row_fields(fi1, fi2) {
     const r1 = _r1;
     if (!fi1$1) {
       return [
-              Stdlib__List.rev(r1),
-              Stdlib__List.rev_append(r2, fi2$1),
-              pairs
-            ];
+        Stdlib__List.rev(r1),
+        Stdlib__List.rev_append(r2, fi2$1),
+        pairs
+      ];
     }
     if (!fi2$1) {
       return [
-              Stdlib__List.rev_append(r1, fi1$1),
-              Stdlib__List.rev(r2),
-              pairs
-            ];
+        Stdlib__List.rev_append(r1, fi1$1),
+        Stdlib__List.rev(r2),
+        pairs
+      ];
     }
     const fi2$p = fi2$1.tl;
     const p2 = fi2$1.hd;
@@ -28779,9 +28779,9 @@ function filter_row_fields(erase, param) {
     return fi;
   } else if (match.TAG === /* Rpresent */0 || match._2 || !erase) {
     return {
-            hd: p,
-            tl: fi
-          };
+      hd: p,
+      tl: fi
+    };
   } else {
     set_row_field(match._3, /* Rabsent */0);
     return fi;
@@ -28807,8 +28807,8 @@ function closed_schema_rec(_ty) {
       case /* Tvar */0 :
           if (level !== 100000000) {
             throw new Caml_js_exceptions.MelangeError(Non_closed0, {
-                      MEL_EXN_ID: Non_closed0
-                    });
+                  MEL_EXN_ID: Non_closed0
+                });
           }
           return iter_type_expr(closed_schema_rec, ty$1);
       case /* Tfield */5 :
@@ -28870,8 +28870,8 @@ function free_vars_rec(_real, _ty) {
     const match$1 = really_closed.contents;
     if (/* tag */typeof match === "number" || typeof match === "string") {
       return iter_type_expr((function (param) {
-                    return free_vars_rec(true, param);
-                  }), ty$1);
+              return free_vars_rec(true, param);
+            }), ty$1);
     }
     switch (match.TAG) {
       case /* Tvar */0 :
@@ -28886,8 +28886,8 @@ function free_vars_rec(_real, _ty) {
       case /* Tconstr */3 :
           if (match$1 === undefined) {
             return iter_type_expr((function (param) {
-                          return free_vars_rec(true, param);
-                        }), ty$1);
+                    return free_vars_rec(true, param);
+                  }), ty$1);
           }
           try {
             const match$2 = find_type_expansion(match._0, Caml_option.valFromOption(match$1));
@@ -28910,8 +28910,8 @@ function free_vars_rec(_real, _ty) {
             
           }
           return Stdlib__List.iter((function (param) {
-                        return free_vars_rec(true, param);
-                      }), match._1);
+                  return free_vars_rec(true, param);
+                }), match._1);
       case /* Tobject */4 :
           _ty = match._0;
           _real = false;
@@ -28934,8 +28934,8 @@ function free_vars_rec(_real, _ty) {
           continue ;
       default:
         return iter_type_expr((function (param) {
-                      return free_vars_rec(true, param);
-                    }), ty$1);
+                return free_vars_rec(true, param);
+              }), ty$1);
     }
   };
 }
@@ -28965,10 +28965,10 @@ function closed_type(ty) {
   }
   const match$1 = match.hd;
   throw new Caml_js_exceptions.MelangeError(Non_closed, {
-            MEL_EXN_ID: Non_closed,
-            _1: match$1[0],
-            _2: match$1[1]
-          });
+        MEL_EXN_ID: Non_closed,
+        _1: match$1[0],
+        _2: match$1[1]
+      });
 }
 
 function closed_parameterized_type(params, ty) {
@@ -29077,15 +29077,15 @@ function closed_class(params, sign) {
               const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
               if (exn.MEL_EXN_ID === Non_closed) {
                 throw new Caml_js_exceptions.MelangeError(CCFailure, {
-                          MEL_EXN_ID: CCFailure,
-                          _1: {
-                            TAG: /* CC_Method */0,
-                            _0: exn._1,
-                            _1: exn._2,
-                            _2: param[0],
-                            _3: ty
-                          }
-                        });
+                      MEL_EXN_ID: CCFailure,
+                      _1: {
+                        TAG: /* CC_Method */0,
+                        _0: exn._1,
+                        _1: exn._2,
+                        _2: param[0],
+                        _3: ty
+                      }
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
             }
@@ -29157,8 +29157,8 @@ function generalize_structure(var_level, ty) {
   if (tmp) {
     set_level(ty$1, 100000000);
     return iter_type_expr((function (param) {
-                  return generalize_structure(var_level, param);
-                }), ty$1);
+            return generalize_structure(var_level, param);
+          }), ty$1);
   }
   
 }
@@ -29212,8 +29212,8 @@ function generalize_spine(_ty) {
 const forward_try_expand_once = {
   contents: (function (env, ty) {
       throw new Caml_js_exceptions.MelangeError(Cannot_expand, {
-                MEL_EXN_ID: Cannot_expand
-              });
+            MEL_EXN_ID: Cannot_expand
+          });
     })
 };
 
@@ -29271,18 +29271,18 @@ function update_level(env, level, _ty) {
     const lv = gadt_instance_level(env, ty$1);
     if (lv !== undefined && level < lv) {
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: {
-                  hd: [
-                    ty$1,
-                    newty2(level, {
-                          TAG: /* Tvar */0,
-                          _0: undefined
-                        })
-                  ],
-                  tl: /* [] */0
-                }
-              });
+            MEL_EXN_ID: Unify,
+            _1: {
+              hd: [
+                ty$1,
+                newty2(level, {
+                      TAG: /* Tvar */0,
+                      _0: undefined
+                    })
+              ],
+              tl: /* [] */0
+            }
+          });
     }
     const row = ty$1.desc;
     if (!/* tag */(typeof row === "number" || typeof row === "string")) {
@@ -29299,22 +29299,22 @@ function update_level(env, level, _ty) {
                 if (exn.MEL_EXN_ID === Cannot_expand) {
                   if (level < get_level(env, p)) {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: {
-                                hd: [
-                                  ty$1,
-                                  newty2(level, {
-                                        TAG: /* Tvar */0,
-                                        _0: undefined
-                                      })
-                                ],
-                                tl: /* [] */0
-                              }
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: {
+                            hd: [
+                              ty$1,
+                              newty2(level, {
+                                    TAG: /* Tvar */0,
+                                    _0: undefined
+                                  })
+                            ],
+                            tl: /* [] */0
+                          }
+                        });
                   }
                   return iter_type_expr((function (param) {
-                                return update_level(env, level, param);
-                              }), ty$1);
+                          return update_level(env, level, param);
+                        }), ty$1);
                 }
                 throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
               }
@@ -29333,18 +29333,18 @@ function update_level(env, level, _ty) {
             const ty1 = row._2;
             if (row._0 === dummy_method && repr(ty1).level > level) {
               throw new Caml_js_exceptions.MelangeError(Unify, {
-                        MEL_EXN_ID: Unify,
-                        _1: {
-                          hd: [
-                            ty1,
-                            newty2(level, {
-                                  TAG: /* Tvar */0,
-                                  _0: undefined
-                                })
-                          ],
-                          tl: /* [] */0
-                        }
-                      });
+                    MEL_EXN_ID: Unify,
+                    _1: {
+                      hd: [
+                        ty1,
+                        newty2(level, {
+                              TAG: /* Tvar */0,
+                              _0: undefined
+                            })
+                      ],
+                      tl: /* [] */0
+                    }
+                  });
             }
             break;
         case /* Tvariant */8 :
@@ -29366,26 +29366,26 @@ function update_level(env, level, _ty) {
             }
             set_level(ty$1, level);
             return iter_type_expr((function (param) {
-                          return update_level(env, level, param);
-                        }), ty$1);
+                    return update_level(env, level, param);
+                  }), ty$1);
         case /* Tpackage */11 :
             const p$1 = row._0;
             if (level < get_level(env, p$1)) {
               const p$p = normalize_package_path(env, p$1);
               if (same(p$1, p$p)) {
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: {
-                            hd: [
-                              ty$1,
-                              newty2(level, {
-                                    TAG: /* Tvar */0,
-                                    _0: undefined
-                                  })
-                            ],
-                            tl: /* [] */0
-                          }
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: {
+                        hd: [
+                          ty$1,
+                          newty2(level, {
+                                TAG: /* Tvar */0,
+                                _0: undefined
+                              })
+                        ],
+                        tl: /* [] */0
+                      }
+                    });
               }
               log_type(ty$1);
               ty$1.desc = {
@@ -29404,8 +29404,8 @@ function update_level(env, level, _ty) {
     }
     set_level(ty$1, level);
     return iter_type_expr((function (param) {
-                  return update_level(env, level, param);
-                }), ty$1);
+            return update_level(env, level, param);
+          }), ty$1);
   };
 }
 
@@ -29433,8 +29433,8 @@ function generalize_expansive(env, var_level, _ty) {
     const match = ty$1.desc;
     if (/* tag */typeof match === "number" || typeof match === "string") {
       return iter_type_expr((function (param) {
-                    return generalize_expansive(env, var_level, param);
-                  }), ty$1);
+              return generalize_expansive(env, var_level, param);
+            }), ty$1);
     }
     switch (match.TAG) {
       case /* Tarrow */1 :
@@ -29459,21 +29459,21 @@ function generalize_expansive(env, var_level, _ty) {
           }
           match._2.contents = /* Mnil */0;
           return Stdlib__List.iter2((function (v, t) {
-                        if (Curry._2(Types_Variance.mem, /* May_weak */2, v)) {
-                          return generalize_contravariant(env)(var_level, t);
-                        } else {
-                          return generalize_expansive(env, var_level, t);
-                        }
-                      }), variance, tyl);
+                  if (Curry._2(Types_Variance.mem, /* May_weak */2, v)) {
+                    return generalize_contravariant(env)(var_level, t);
+                  } else {
+                    return generalize_expansive(env, var_level, t);
+                  }
+                }), variance, tyl);
       case /* Tpackage */11 :
           const partial_arg = generalize_contravariant(env);
           return Stdlib__List.iter((function (param) {
-                        return partial_arg(var_level, param);
-                      }), match._2);
+                  return partial_arg(var_level, param);
+                }), match._2);
       default:
         return iter_type_expr((function (param) {
-                      return generalize_expansive(env, var_level, param);
-                    }), ty$1);
+                return generalize_expansive(env, var_level, param);
+              }), ty$1);
     }
   };
 }
@@ -29492,15 +29492,15 @@ function generalize_expansive$1(env, ty) {
           throw new Caml_js_exceptions.MelangeError(tr.MEL_EXN_ID, tr);
         }
         throw new Caml_js_exceptions.MelangeError(Unify, {
-                  MEL_EXN_ID: Unify,
-                  _1: {
-                    hd: [
-                      ty,
-                      tr$1.hd[1]
-                    ],
-                    tl: tr$1
-                  }
-                });
+              MEL_EXN_ID: Unify,
+              _1: {
+                hd: [
+                  ty,
+                  tr$1.hd[1]
+                ],
+                tl: tr$1
+              }
+            });
       }
       throw new Caml_js_exceptions.MelangeError(tr.MEL_EXN_ID, tr);
     }
@@ -29543,8 +29543,8 @@ function limited_generalize(ty0, ty) {
         tl: /* [] */0
       };
       return iter_type_expr((function (param) {
-                    return inverse(partial_arg, param);
-                  }), ty$1);
+              return inverse(partial_arg, param);
+            }), ty$1);
     }
     if (ty$1.level >= 0) {
       return ;
@@ -29610,8 +29610,8 @@ function inv_type(hash, pty, ty) {
         tl: /* [] */0
       };
       return iter_type_expr((function (param) {
-                    return inv_type(hash, partial_arg, param);
-                  }), ty$1);
+              return inv_type(hash, partial_arg, param);
+            }), ty$1);
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -29631,8 +29631,8 @@ function compute_univars(ty) {
       if (!Curry._2(mem$3, univ, univs.contents)) {
         univs.contents = Curry._2(add$3, univ, univs.contents);
         return Stdlib__List.iter((function (param) {
-                      return add_univar(univ, param);
-                    }), inv.inv_parents);
+                return add_univar(univ, param);
+              }), inv.inv_parents);
       } else {
         return ;
       }
@@ -29644,8 +29644,8 @@ function compute_univars(ty) {
               contents: Curry._1(singleton$2, univ)
             });
         return Stdlib__List.iter((function (param) {
-                      return add_univar(univ, param);
-                    }), inv.inv_parents);
+                return add_univar(univ, param);
+              }), inv.inv_parents);
       }
       throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
     }
@@ -29727,19 +29727,19 @@ function copy(env, partial, keep_names, ty) {
         ) : 100000000;
     } else {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  30996,
-                  16
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              30996,
+              16
+            ]
+          });
     }
     if (forget !== 100000000) {
       return newty2(forget, {
-                  TAG: /* Tvar */0,
-                  _0: undefined
-                });
+            TAG: /* Tvar */0,
+            _0: undefined
+          });
     }
     const desc = ty$1.desc;
     save_desc(ty$1, desc);
@@ -29785,9 +29785,9 @@ function copy(env, partial, keep_names, ty) {
               const abbrev = abbreviations.contents.contents;
               let tmp$1;
               tmp$1 = /* tag */typeof abbrev === "number" || typeof abbrev === "string" || abbrev.TAG !== /* Mcons */0 ? abbrev : ({
-                    TAG: /* Mlink */1,
-                    _0: abbreviations.contents
-                  });
+                  TAG: /* Mlink */1,
+                  _0: abbreviations.contents
+                });
               tmp = {
                 TAG: /* Tconstr */3,
                 _0: p,
@@ -29800,20 +29800,20 @@ function copy(env, partial, keep_names, ty) {
             break;
         case /* Tobject */4 :
             tmp = partial !== undefined ? ({
-                  TAG: /* Tobject */4,
-                  _0: copy$1(desc._0),
-                  _1: {
-                    contents: undefined
-                  }
-                }) : copy_type_desc(keep_names, copy$1, desc);
+                TAG: /* Tobject */4,
+                _0: copy$1(desc._0),
+                _1: {
+                  contents: undefined
+                }
+              }) : copy_type_desc(keep_names, copy$1, desc);
             break;
         case /* Tfield */5 :
             const r = field_kind_repr(desc._1);
             if (/* tag */typeof r === "number" || typeof r === "string") {
               tmp = r === /* Fpresent */0 ? copy_type_desc(undefined, copy$1, desc) : ({
-                    TAG: /* Tlink */6,
-                    _0: copy$1(desc._3)
-                  });
+                  TAG: /* Tlink */6,
+                  _0: copy$1(desc._3)
+                });
             } else {
               dup_kind(r._0);
               tmp = copy_type_desc(undefined, copy$1, desc);
@@ -29873,13 +29873,13 @@ function copy(env, partial, keep_names, ty) {
                       break;
                   default:
                     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                              MEL_EXN_ID: "Assert_failure",
-                              _1: [
-                                "jscomp/test/ocaml_typedtree_test.ml",
-                                31059,
-                                24
-                              ]
-                            });
+                          MEL_EXN_ID: "Assert_failure",
+                          _1: [
+                            "jscomp/test/ocaml_typedtree_test.ml",
+                            31059,
+                            24
+                          ]
+                        });
                 }
               }
               switch (exit$3) {
@@ -29899,13 +29899,13 @@ function copy(env, partial, keep_names, ty) {
               const match$5 = match$4.desc;
               let row$1;
               row$1 = /* tag */typeof match$5 === "number" || typeof match$5 === "string" || !(match$5.TAG === /* Tconstr */3 && !row.row_fixed) ? row : ({
-                    row_fields: row.row_fields,
-                    row_more: row.row_more,
-                    row_bound: row.row_bound,
-                    row_closed: row.row_closed,
-                    row_fixed: true,
-                    row_name: row.row_name
-                  });
+                  row_fields: row.row_fields,
+                  row_more: row.row_more,
+                  row_bound: row.row_bound,
+                  row_closed: row.row_closed,
+                  row_fixed: true,
+                  row_name: row.row_name
+                });
               let match$6;
               if (partial !== undefined && !partial[1]) {
                 let more$p$1;
@@ -30032,38 +30032,38 @@ function get_new_abstract_name(s) {
   }
   reified_var_counter.contents = Curry._3(Meths.add, s, index, reified_var_counter.contents);
   return Curry._2(Stdlib__Printf.sprintf({
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* String */2,
-                    _0: /* No_padding */0,
-                    _1: {
-                      TAG: /* Char_literal */12,
-                      _0: /* '#' */35,
-                      _1: {
-                        TAG: /* Int */4,
-                        _0: /* Int_d */0,
-                        _1: /* No_padding */0,
-                        _2: /* No_precision */0,
-                        _3: /* End_of_format */0
-                      }
-                    }
-                  },
-                  _1: "%s#%d"
-                }), s, index);
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* String */2,
+              _0: /* No_padding */0,
+              _1: {
+                TAG: /* Char_literal */12,
+                _0: /* '#' */35,
+                _1: {
+                  TAG: /* Int */4,
+                  _0: /* Int_d */0,
+                  _1: /* No_padding */0,
+                  _2: /* No_precision */0,
+                  _3: /* End_of_format */0
+                }
+              }
+            },
+            _1: "%s#%d"
+          }), s, index);
 }
 
 function new_declaration(newtype, manifest) {
   return {
-          type_params: /* [] */0,
-          type_arity: 0,
-          type_kind: /* Type_abstract */0,
-          type_private: /* Public */1,
-          type_manifest: manifest,
-          type_variance: /* [] */0,
-          type_newtype_level: newtype,
-          type_loc: none,
-          type_attributes: /* [] */0
-        };
+    type_params: /* [] */0,
+    type_arity: 0,
+    type_kind: /* Type_abstract */0,
+    type_private: /* Public */1,
+    type_manifest: manifest,
+    type_variance: /* [] */0,
+    type_newtype_level: newtype,
+    type_loc: none,
+    type_attributes: /* [] */0
+  };
 }
 
 function instance_constructor(in_pattern, cstr) {
@@ -30100,13 +30100,13 @@ function instance_constructor(in_pattern, cstr) {
       const tv = copy(undefined, undefined, undefined, existential);
       if (!is_Tvar(tv)) {
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/ocaml_typedtree_test.ml",
-                    31182,
-                    8
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/ocaml_typedtree_test.ml",
+                31182,
+                8
+              ]
+            });
       }
       link_type(tv, to_unify);
     };
@@ -30116,9 +30116,9 @@ function instance_constructor(in_pattern, cstr) {
   const ty_args = Stdlib__List.map(simple_copy, cstr.cstr_args);
   cleanup_types(undefined);
   return [
-          ty_args,
-          ty_res
-        ];
+    ty_args,
+    ty_res
+  ];
 }
 
 function instance_parameterized_type(keep_names, sch_args, sch) {
@@ -30128,9 +30128,9 @@ function instance_parameterized_type(keep_names, sch_args, sch) {
   const ty = copy(undefined, undefined, undefined, sch);
   cleanup_types(undefined);
   return [
-          ty_args,
-          ty
-        ];
+    ty_args,
+    ty
+  ];
 }
 
 function instance_declaration(decl) {
@@ -30140,29 +30140,29 @@ function instance_declaration(decl) {
       cl === /* Type_abstract */0 ? /* Type_abstract */0 : /* Type_open */1
     ) : (
       cl.TAG === /* Type_record */0 ? ({
-            TAG: /* Type_record */0,
-            _0: Stdlib__List.map((function (l) {
-                    return {
-                            ld_id: l.ld_id,
-                            ld_mutable: l.ld_mutable,
-                            ld_type: copy(undefined, undefined, undefined, l.ld_type),
-                            ld_loc: l.ld_loc,
-                            ld_attributes: l.ld_attributes
-                          };
-                  }), cl._0),
-            _1: cl._1
-          }) : ({
-            TAG: /* Type_variant */1,
-            _0: Stdlib__List.map((function (c) {
-                    return {
-                            cd_id: c.cd_id,
-                            cd_args: Stdlib__List.map(simple_copy, c.cd_args),
-                            cd_res: may_map(simple_copy, c.cd_res),
-                            cd_loc: c.cd_loc,
-                            cd_attributes: c.cd_attributes
-                          };
-                  }), cl._0)
-          })
+          TAG: /* Type_record */0,
+          _0: Stdlib__List.map((function (l) {
+                  return {
+                    ld_id: l.ld_id,
+                    ld_mutable: l.ld_mutable,
+                    ld_type: copy(undefined, undefined, undefined, l.ld_type),
+                    ld_loc: l.ld_loc,
+                    ld_attributes: l.ld_attributes
+                  };
+                }), cl._0),
+          _1: cl._1
+        }) : ({
+          TAG: /* Type_variant */1,
+          _0: Stdlib__List.map((function (c) {
+                  return {
+                    cd_id: c.cd_id,
+                    cd_args: Stdlib__List.map(simple_copy, c.cd_args),
+                    cd_res: may_map(simple_copy, c.cd_res),
+                    cd_loc: c.cd_loc,
+                    cd_attributes: c.cd_attributes
+                  };
+                }), cl._0)
+        })
     );
   const decl_type_params = Stdlib__List.map(simple_copy, decl.type_params);
   const decl_type_arity = decl.type_arity;
@@ -30192,40 +30192,40 @@ function instance_class(params, cty) {
     switch (sign.TAG) {
       case /* Cty_constr */0 :
           return {
-                  TAG: /* Cty_constr */0,
-                  _0: sign._0,
-                  _1: Stdlib__List.map(simple_copy, sign._1),
-                  _2: copy_class_type(sign._2)
-                };
+            TAG: /* Cty_constr */0,
+            _0: sign._0,
+            _1: Stdlib__List.map(simple_copy, sign._1),
+            _2: copy_class_type(sign._2)
+          };
       case /* Cty_signature */1 :
           const sign$1 = sign._0;
           return {
-                  TAG: /* Cty_signature */1,
-                  _0: {
-                    csig_self: copy(undefined, undefined, undefined, sign$1.csig_self),
-                    csig_vars: Curry._2(Meths.map, (function (param) {
-                            return [
-                                    param[0],
-                                    param[1],
-                                    copy(undefined, undefined, undefined, param[2])
-                                  ];
-                          }), sign$1.csig_vars),
-                    csig_concr: sign$1.csig_concr,
-                    csig_inher: Stdlib__List.map((function (param) {
-                            return [
-                                    param[0],
-                                    Stdlib__List.map(simple_copy, param[1])
-                                  ];
-                          }), sign$1.csig_inher)
-                  }
-                };
+            TAG: /* Cty_signature */1,
+            _0: {
+              csig_self: copy(undefined, undefined, undefined, sign$1.csig_self),
+              csig_vars: Curry._2(Meths.map, (function (param) {
+                      return [
+                        param[0],
+                        param[1],
+                        copy(undefined, undefined, undefined, param[2])
+                      ];
+                    }), sign$1.csig_vars),
+              csig_concr: sign$1.csig_concr,
+              csig_inher: Stdlib__List.map((function (param) {
+                      return [
+                        param[0],
+                        Stdlib__List.map(simple_copy, param[1])
+                      ];
+                    }), sign$1.csig_inher)
+            }
+          };
       case /* Cty_arrow */2 :
           return {
-                  TAG: /* Cty_arrow */2,
-                  _0: sign._0,
-                  _1: copy(undefined, undefined, undefined, sign._1),
-                  _2: copy_class_type(sign._2)
-                };
+            TAG: /* Cty_arrow */2,
+            _0: sign._0,
+            _1: copy(undefined, undefined, undefined, sign._1),
+            _2: copy_class_type(sign._2)
+          };
       
     }
   };
@@ -30233,9 +30233,9 @@ function instance_class(params, cty) {
   const cty$p = copy_class_type(cty);
   cleanup_types(undefined);
   return [
-          params$p,
-          cty$p
-        ];
+    params$p,
+    cty$p
+  ];
 }
 
 function diff_list(l1, l2) {
@@ -30244,21 +30244,21 @@ function diff_list(l1, l2) {
   }
   if (l1) {
     return {
-            hd: l1.hd,
-            tl: diff_list(l1.tl, l2)
-          };
+      hd: l1.hd,
+      tl: diff_list(l1.tl, l2)
+    };
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Ctype.diff_list"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Ctype.diff_list"
+      });
 }
 
 function conflicts(free, bound) {
   const bound$1 = Stdlib__List.map(repr, bound);
   return Curry._2(exists$1, (function (t) {
-                return Stdlib__List.memq(repr(t), bound$1);
-              }), free);
+          return Stdlib__List.memq(repr(t), bound$1);
+        }), free);
 }
 
 const delayed_copy = {
@@ -30292,8 +30292,8 @@ function copy_sep(fixed, free, bound, visited, ty) {
     const dl = is_Tunivar(ty$1) ? /* [] */0 : diff_list(bound, match[1]);
     if (Caml_obj.caml_notequal(dl, /* [] */0) && conflicts(univars, dl)) {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     return match[0];
   }
@@ -30361,12 +30361,12 @@ function copy_sep(fixed, free, bound, visited, ty) {
               const bound$1 = Stdlib.$at(tl, bound);
               const visited$2 = Stdlib.$at(Stdlib__List.map2((function (ty, t) {
                           return [
-                                  ty,
-                                  [
-                                    t,
-                                    bound$1
-                                  ]
-                                ];
+                            ty,
+                            [
+                              t,
+                              bound$1
+                            ]
+                          ];
                         }), tl, tl$p), visited$1);
               tmp = {
                 TAG: /* Tpoly */10,
@@ -30392,42 +30392,42 @@ function instance_poly(keep_namesOpt, fixed, univars, sch) {
     const name = ty.desc;
     if (/* tag */typeof name === "number" || typeof name === "string") {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  31319,
-                  11
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              31319,
+              11
+            ]
+          });
     }
     if (name.TAG === /* Tunivar */9) {
       if (keep_names) {
         return newty2(current_level.contents, {
-                    TAG: /* Tvar */0,
-                    _0: name._0
-                  });
+              TAG: /* Tvar */0,
+              _0: name._0
+            });
       } else {
         return newvar(undefined, undefined);
       }
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                31319,
-                11
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            31319,
+            11
+          ]
+        });
   };
   const vars = Stdlib__List.map(copy_var, univars$1);
   const pairs = Stdlib__List.map2((function (u, v) {
           return [
-                  u,
-                  [
-                    v,
-                    /* [] */0
-                  ]
-                ];
+            u,
+            [
+              v,
+              /* [] */0
+            ]
+          ];
         }), univars$1, vars);
   delayed_copy.contents = /* [] */0;
   const ty = copy_sep(fixed, compute_univars(sch), /* [] */0, pairs, sch);
@@ -30435,9 +30435,9 @@ function instance_poly(keep_namesOpt, fixed, univars, sch) {
   delayed_copy.contents = /* [] */0;
   cleanup_types(undefined);
   return [
-          vars,
-          ty
-        ];
+    vars,
+    ty
+  ];
 }
 
 function instance_label(fixed, lbl) {
@@ -30459,27 +30459,27 @@ function instance_label(fixed, lbl) {
   }
   cleanup_types(undefined);
   return [
-          match[0],
-          match[1],
-          ty_res
-        ];
+    match[0],
+    match[1],
+    ty_res
+  ];
 }
 
 const unify$p = {
   contents: (function (env, ty1, ty2) {
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: /* [] */0
-              });
+            MEL_EXN_ID: Unify,
+            _1: /* [] */0
+          });
     })
 };
 
 function subst(env, level, priv, abbrev, ty, params, args, body) {
   if (Stdlib__List.length(params) !== Stdlib__List.length(args)) {
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   }
   const old_level = current_level.contents;
   current_level.contents = level;
@@ -30489,13 +30489,13 @@ function subst(env, level, priv, abbrev, ty, params, args, body) {
       const match = ty.desc;
       if (/* tag */typeof match === "number" || typeof match === "string") {
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/ocaml_typedtree_test.ml",
-                    31359,
-                    8
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/ocaml_typedtree_test.ml",
+                31359,
+                8
+              ]
+            });
       }
       if (match.TAG === /* Tconstr */3) {
         const path = match._0;
@@ -30503,13 +30503,13 @@ function subst(env, level, priv, abbrev, ty, params, args, body) {
         memorize_abbrev(abbrev$1, priv, path, ty, body0);
       } else {
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/ocaml_typedtree_test.ml",
-                    31359,
-                    8
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/ocaml_typedtree_test.ml",
+                31359,
+                8
+              ]
+            });
       }
     }
     abbreviations.contents = abbrev;
@@ -30551,13 +30551,13 @@ function expand_abbrev_gen(kind, find_type_expansion, env, ty) {
   const match = ty.desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                31468,
-                6
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            31468,
+            6
+          ]
+        });
   }
   if (match.TAG === /* Tconstr */3) {
     const abbrev = match._2;
@@ -30589,8 +30589,8 @@ function expand_abbrev_gen(kind, find_type_expansion, env, ty) {
       const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
       if (exn$1.MEL_EXN_ID === Stdlib.Not_found) {
         throw new Caml_js_exceptions.MelangeError(Cannot_expand, {
-                  MEL_EXN_ID: Cannot_expand
-                });
+              MEL_EXN_ID: Cannot_expand
+            });
       }
       throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
     }
@@ -30622,18 +30622,18 @@ function expand_abbrev_gen(kind, find_type_expansion, env, ty) {
       if (lv !== undefined) {
         if (level < lv) {
           throw new Caml_js_exceptions.MelangeError(Unify, {
-                    MEL_EXN_ID: Unify,
-                    _1: {
-                      hd: [
-                        ty,
-                        newty2(level, {
-                              TAG: /* Tvar */0,
-                              _0: undefined
-                            })
-                      ],
-                      tl: /* [] */0
-                    }
-                  });
+                MEL_EXN_ID: Unify,
+                _1: {
+                  hd: [
+                    ty,
+                    newty2(level, {
+                          TAG: /* Tvar */0,
+                          _0: undefined
+                        })
+                  ],
+                  tl: /* [] */0
+                }
+              });
         }
         add_gadt_instances(env, lv, {
               hd: ty,
@@ -30648,13 +30648,13 @@ function expand_abbrev_gen(kind, find_type_expansion, env, ty) {
     return ty$p;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              31468,
-              6
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          31468,
+          6
+        ]
+      });
 }
 
 function expand_abbrev(ty) {
@@ -30671,13 +30671,13 @@ function expand_head_once(env, ty) {
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Cannot_expand) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  31476,
-                  56
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              31476,
+              56
+            ]
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -30708,15 +30708,15 @@ function try_expand_once(env, ty) {
   const match = ty$1.desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError(Cannot_expand, {
-              MEL_EXN_ID: Cannot_expand
-            });
+          MEL_EXN_ID: Cannot_expand
+        });
   }
   if (match.TAG === /* Tconstr */3) {
     return repr(expand_abbrev(env)(ty$1));
   }
   throw new Caml_js_exceptions.MelangeError(Cannot_expand, {
-            MEL_EXN_ID: Cannot_expand
-          });
+        MEL_EXN_ID: Cannot_expand
+      });
 }
 
 function try_expand_safe(env, ty) {
@@ -30729,8 +30729,8 @@ function try_expand_safe(env, ty) {
     if (exn.MEL_EXN_ID === Unify) {
       backtrack(snap);
       throw new Caml_js_exceptions.MelangeError(Cannot_expand, {
-                MEL_EXN_ID: Cannot_expand
-              });
+            MEL_EXN_ID: Cannot_expand
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -30792,18 +30792,18 @@ function extract_concrete_typedecl(env, ty) {
   const match = ty$1.desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   }
   if (match.TAG === /* Tconstr */3) {
     const p = match._0;
     const decl = find_type_full(p, env)[0];
     if (Caml_obj.caml_notequal(decl.type_kind, /* Type_abstract */0)) {
       return [
-              p,
-              p,
-              decl
-            ];
+        p,
+        p,
+        decl
+      ];
     }
     let ty$2;
     try {
@@ -30813,21 +30813,21 @@ function extract_concrete_typedecl(env, ty) {
       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
       if (exn.MEL_EXN_ID === Cannot_expand) {
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
       }
       throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
     }
     const match$1 = extract_concrete_typedecl(env, ty$2);
     return [
-            p,
-            match$1[1],
-            match$1[2]
-          ];
+      p,
+      match$1[1],
+      match$1[2]
+    ];
   }
   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-            MEL_EXN_ID: Stdlib.Not_found
-          });
+        MEL_EXN_ID: Stdlib.Not_found
+      });
 }
 
 function expand_abbrev_opt(param, param$1) {
@@ -30839,15 +30839,15 @@ function try_expand_once_opt(env, ty) {
   const match = ty$1.desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError(Cannot_expand, {
-              MEL_EXN_ID: Cannot_expand
-            });
+          MEL_EXN_ID: Cannot_expand
+        });
   }
   if (match.TAG === /* Tconstr */3) {
     return repr(expand_abbrev_opt(env, ty$1));
   }
   throw new Caml_js_exceptions.MelangeError(Cannot_expand, {
-            MEL_EXN_ID: Cannot_expand
-          });
+        MEL_EXN_ID: Cannot_expand
+      });
 }
 
 function try_expand_head_opt(env, ty) {
@@ -30887,13 +30887,13 @@ function enforce_constraints(env, ty) {
   const match = ty.desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                31586,
-                6
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            31586,
+            6
+          ]
+        });
   }
   if (match.TAG === /* Tconstr */3) {
     const level = ty.level;
@@ -30916,13 +30916,13 @@ function enforce_constraints(env, ty) {
     }
   } else {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                31586,
-                6
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            31586,
+            6
+          ]
+        });
   }
 }
 
@@ -30942,12 +30942,12 @@ function full_expand(env, ty) {
   const match$2 = match$1[1];
   if (match$2 && is_Tvar(repr(match$2.hd))) {
     return newty2(ty$1.level, {
-                TAG: /* Tobject */4,
-                _0: match._0,
-                _1: {
-                  contents: undefined
-                }
-              });
+          TAG: /* Tobject */4,
+          _0: match._0,
+          _1: {
+            contents: undefined
+          }
+        });
   } else {
     return ty$1;
   }
@@ -31025,8 +31025,8 @@ const Occur = /* @__PURE__ */Caml_exceptions.create("Ocaml_typedtree_test.Ctype.
 function occur_rec(env, visited, ty0, ty) {
   if (ty === ty0) {
     throw new Caml_js_exceptions.MelangeError(Occur, {
-              MEL_EXN_ID: Occur
-            });
+          MEL_EXN_ID: Occur
+        });
   }
   const occur_ok = recursive_types.contents && is_contractive(env, ty);
   const match = ty.desc;
@@ -31036,16 +31036,16 @@ function occur_rec(env, visited, ty0, ty) {
           try {
             if (occur_ok || Stdlib__List.memq(ty, visited)) {
               throw new Caml_js_exceptions.MelangeError(Occur, {
-                        MEL_EXN_ID: Occur
-                      });
+                    MEL_EXN_ID: Occur
+                  });
             }
             const partial_arg = {
               hd: ty,
               tl: visited
             };
             return iter_type_expr((function (param) {
-                          return occur_rec(env, partial_arg, ty0, param);
-                        }), ty);
+                    return occur_rec(env, partial_arg, ty0, param);
+                  }), ty);
           }
           catch (raw_exn){
             const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -31054,8 +31054,8 @@ function occur_rec(env, visited, ty0, ty) {
                 const ty$p = try_expand_head$1(try_expand_once, env, ty);
                 if (ty$p === ty0 || Stdlib__List.memq(ty$p, visited)) {
                   throw new Caml_js_exceptions.MelangeError(Occur, {
-                            MEL_EXN_ID: Occur
-                          });
+                        MEL_EXN_ID: Occur
+                      });
                 }
                 const match$1 = ty$p.desc;
                 let exit = 0;
@@ -31079,8 +31079,8 @@ function occur_rec(env, visited, ty0, ty) {
                     tl: visited
                   };
                   return iter_type_expr((function (param) {
-                                return occur_rec(env, partial_arg$1, ty0, param);
-                              }), ty$p);
+                          return occur_rec(env, partial_arg$1, ty0, param);
+                        }), ty$p);
                 }
                 
               }
@@ -31091,8 +31091,8 @@ function occur_rec(env, visited, ty0, ty) {
                     return ;
                   }
                   throw new Caml_js_exceptions.MelangeError(Occur, {
-                            MEL_EXN_ID: Occur
-                          });
+                        MEL_EXN_ID: Occur
+                      });
                 }
                 throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
               }
@@ -31110,8 +31110,8 @@ function occur_rec(env, visited, ty0, ty) {
   }
   if (!occur_ok) {
     return iter_type_expr((function (param) {
-                  return occur_rec(env, visited, ty0, param);
-                }), ty);
+            return occur_rec(env, visited, ty0, param);
+          }), ty);
   }
   
 }
@@ -31140,14 +31140,14 @@ function occur(env, ty0, ty) {
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     merge$2(type_changed, old);
     throw new Caml_js_exceptions.MelangeError((
-              exn.MEL_EXN_ID === Occur ? ({
-                    MEL_EXN_ID: Unify,
-                    _1: /* [] */0
-                  }) : exn
-            ).MEL_EXN_ID, exn.MEL_EXN_ID === Occur ? ({
-                  MEL_EXN_ID: Unify,
-                  _1: /* [] */0
-                }) : exn);
+          exn.MEL_EXN_ID === Occur ? ({
+              MEL_EXN_ID: Unify,
+              _1: /* [] */0
+            }) : exn
+        ).MEL_EXN_ID, exn.MEL_EXN_ID === Occur ? ({
+            MEL_EXN_ID: Unify,
+            _1: /* [] */0
+          }) : exn);
   }
 }
 
@@ -31195,44 +31195,44 @@ function unify_univar(t1, t2, _param) {
               return ;
             }
             throw new Caml_js_exceptions.MelangeError(Unify, {
-                      MEL_EXN_ID: Unify,
-                      _1: /* [] */0
-                    });
+                  MEL_EXN_ID: Unify,
+                  _1: /* [] */0
+                });
           }
           throw new Caml_js_exceptions.MelangeError(Unify, {
-                    MEL_EXN_ID: Unify,
-                    _1: /* [] */0
-                  });
+                MEL_EXN_ID: Unify,
+                _1: /* [] */0
+              });
         }
         if (match$2 !== undefined) {
           const match$3 = match$2.contents;
           if (match$3 !== undefined) {
             throw new Caml_js_exceptions.MelangeError(Unify, {
-                      MEL_EXN_ID: Unify,
-                      _1: /* [] */0
-                    });
+                  MEL_EXN_ID: Unify,
+                  _1: /* [] */0
+                });
           }
           set_univar(match$1, t2);
           return set_univar(match$2, t1);
         }
         throw new Caml_js_exceptions.MelangeError(Unify, {
-                  MEL_EXN_ID: Unify,
-                  _1: /* [] */0
-                });
+              MEL_EXN_ID: Unify,
+              _1: /* [] */0
+            });
       }
       if (match$2 !== undefined) {
         throw new Caml_js_exceptions.MelangeError(Unify, {
-                  MEL_EXN_ID: Unify,
-                  _1: /* [] */0
-                });
+              MEL_EXN_ID: Unify,
+              _1: /* [] */0
+            });
       }
       _param = param.tl;
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   };
 }
 
@@ -31281,8 +31281,8 @@ function occur_univar(env, ty) {
       const match = ty$1.desc;
       if (/* tag */typeof match === "number" || typeof match === "string") {
         return iter_type_expr((function (param) {
-                      return occur_rec(bound, param);
-                    }), ty$1);
+                return occur_rec(bound, param);
+              }), ty$1);
       }
       switch (match.TAG) {
         case /* Tconstr */3 :
@@ -31293,18 +31293,18 @@ function occur_univar(env, ty) {
             try {
               const td = find_type_full(match._0, env)[0];
               return Stdlib__List.iter2((function (t, v) {
-                            if (Curry._2(Types_Variance.mem, /* May_pos */0, v) || Curry._2(Types_Variance.mem, /* May_neg */1, v)) {
-                              return occur_rec(bound, t);
-                            }
-                            
-                          }), tl, td.type_variance);
+                      if (Curry._2(Types_Variance.mem, /* May_pos */0, v) || Curry._2(Types_Variance.mem, /* May_neg */1, v)) {
+                        return occur_rec(bound, t);
+                      }
+                      
+                    }), tl, td.type_variance);
             }
             catch (raw_exn$1){
               const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
               if (exn$1.MEL_EXN_ID === Stdlib.Not_found) {
                 return Stdlib__List.iter((function (param) {
-                              return occur_rec(bound, param);
-                            }), tl);
+                        return occur_rec(bound, param);
+                      }), tl);
               }
               throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
             }
@@ -31313,18 +31313,18 @@ function occur_univar(env, ty) {
               return ;
             }
             throw new Caml_js_exceptions.MelangeError(Unify, {
-                      MEL_EXN_ID: Unify,
-                      _1: {
-                        hd: [
-                          ty$1,
-                          newty2(100000000, {
-                                TAG: /* Tvar */0,
-                                _0: undefined
-                              })
-                        ],
-                        tl: /* [] */0
-                      }
-                    });
+                  MEL_EXN_ID: Unify,
+                  _1: {
+                    hd: [
+                      ty$1,
+                      newty2(100000000, {
+                            TAG: /* Tvar */0,
+                            _0: undefined
+                          })
+                    ],
+                    tl: /* [] */0
+                  }
+                });
         case /* Tpoly */10 :
             const bound$1 = Stdlib__List.fold_right(add$3, Stdlib__List.map(repr, match._1), bound);
             _ty = match._0;
@@ -31332,8 +31332,8 @@ function occur_univar(env, ty) {
             continue ;
         default:
           return iter_type_expr((function (param) {
-                        return occur_rec(bound, param);
-                      }), ty$1);
+                  return occur_rec(bound, param);
+                }), ty$1);
       }
     };
   };
@@ -31349,8 +31349,8 @@ function occur_univar(env, ty) {
 
 function add_univars(param, param$1) {
   return Stdlib__List.fold_left((function (s, param) {
-                return Curry._2(add$3, repr(param[0]), s);
-              }), param, param$1);
+          return Curry._2(add$3, repr(param[0]), s);
+        }), param, param$1);
 }
 
 function get_univar_family(univar_pairs, univars) {
@@ -31397,11 +31397,11 @@ function univars_escape(env, univar_pairs, vl, ty) {
             try {
               const td = find_type_full(match._0, env)[0];
               return Stdlib__List.iter2((function (t, v) {
-                            if (Curry._2(Types_Variance.mem, /* May_pos */0, v) || Curry._2(Types_Variance.mem, /* May_neg */1, v)) {
-                              return occur(t);
-                            }
-                            
-                          }), tl, td.type_variance);
+                      if (Curry._2(Types_Variance.mem, /* May_pos */0, v) || Curry._2(Types_Variance.mem, /* May_neg */1, v)) {
+                        return occur(t);
+                      }
+                      
+                    }), tl, td.type_variance);
             }
             catch (raw_exn){
               const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -31415,8 +31415,8 @@ function univars_escape(env, univar_pairs, vl, ty) {
               return ;
             }
             throw new Caml_js_exceptions.MelangeError(Occur, {
-                      MEL_EXN_ID: Occur
-                    });
+                  MEL_EXN_ID: Occur
+                });
         case /* Tpoly */10 :
             if (Stdlib__List.exists((function (t) {
                       return Curry._2(mem$3, repr(t), family);
@@ -31464,25 +31464,25 @@ function enter_poly(env, univar_pairs, t1, tl1, t2, tl2, f) {
               _1: tl1$1
             }))) {
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   }
   const cl1 = Stdlib__List.map((function (t) {
           return [
-                  t,
-                  {
-                    contents: undefined
-                  }
-                ];
+            t,
+            {
+              contents: undefined
+            }
+          ];
         }), tl1$1);
   const cl2 = Stdlib__List.map((function (t) {
           return [
-                  t,
-                  {
-                    contents: undefined
-                  }
-                ];
+            t,
+            {
+              contents: undefined
+            }
+          ];
         }), tl2$1);
   univar_pairs.contents = {
     hd: [
@@ -31532,36 +31532,36 @@ function has_cached_expansion(p, _abbrev) {
 
 function expand_trace(env, trace) {
   return Stdlib__List.fold_right((function (param, rem) {
-                const t2 = param[1];
-                const t1 = param[0];
-                return {
-                        hd: [
-                          repr(t1),
-                          full_expand(env, t1)
-                        ],
-                        tl: {
-                          hd: [
-                            repr(t2),
-                            full_expand(env, t2)
-                          ],
-                          tl: rem
-                        }
-                      };
-              }), trace, /* [] */0);
+          const t2 = param[1];
+          const t1 = param[0];
+          return {
+            hd: [
+              repr(t1),
+              full_expand(env, t1)
+            ],
+            tl: {
+              hd: [
+                repr(t2),
+                full_expand(env, t2)
+              ],
+              tl: rem
+            }
+          };
+        }), trace, /* [] */0);
 }
 
 function mkvariant(fields, closed) {
   return newty2(100000000, {
-              TAG: /* Tvariant */8,
-              _0: {
-                row_fields: fields,
-                row_more: newvar(undefined, undefined),
-                row_bound: undefined,
-                row_closed: closed,
-                row_fixed: false,
-                row_name: undefined
-              }
-            });
+        TAG: /* Tvariant */8,
+        _0: {
+          row_fields: fields,
+          row_more: newvar(undefined, undefined),
+          row_bound: undefined,
+          row_closed: closed,
+          row_fixed: false,
+          row_name: undefined
+        }
+      });
 }
 
 const rigid_variants = {
@@ -31576,8 +31576,8 @@ function deep_occur(t0, ty) {
     }
     if (ty$1 === t0) {
       throw new Caml_js_exceptions.MelangeError(Occur, {
-                MEL_EXN_ID: Occur
-              });
+            MEL_EXN_ID: Occur
+          });
     }
     ty$1.level = pivot_level - ty$1.level | 0;
     iter_type_expr(occur_rec, ty$1);
@@ -31607,13 +31607,13 @@ function get_newtype_level(param) {
     return x;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              31961,
-              12
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          31961,
+          12
+        ]
+      });
 }
 
 function reify(env, t) {
@@ -31674,13 +31674,13 @@ function reify(env, t) {
               const o$2 = m.desc;
               if (/* tag */typeof o$2 === "number" || typeof o$2 === "string") {
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            31999,
-                            19
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        31999,
+                        19
+                      ]
+                    });
               }
               if (o$2.TAG === /* Tvar */0) {
                 const o$3 = o$2._0;
@@ -31703,13 +31703,13 @@ function reify(env, t) {
                         }));
               } else {
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            31999,
-                            19
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        31999,
+                        19
+                      ]
+                    });
               }
             }
           }
@@ -31846,9 +31846,9 @@ function mcomp(type_pairs, env, _t1, _t2) {
       }
       try {
         return Curry._2(TypePairs.find, type_pairs, [
-                    t1$p$1,
-                    t2$p$1
-                  ]);
+              t1$p$1,
+              t2$p$1
+            ]);
       }
       catch (raw_exn){
         const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -31870,46 +31870,46 @@ function mcomp(type_pairs, env, _t1, _t2) {
               exit$3 = 3;
             } else {
               throw new Caml_js_exceptions.MelangeError(Unify, {
-                        MEL_EXN_ID: Unify,
-                        _1: /* [] */0
-                      });
+                    MEL_EXN_ID: Unify,
+                    _1: /* [] */0
+                  });
             }
           } else {
             switch (match$2.TAG) {
               case /* Tvar */0 :
                   if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                   switch (match$3.TAG) {
                     case /* Tvar */0 :
                         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                  MEL_EXN_ID: "Assert_failure",
-                                  _1: [
-                                    "jscomp/test/ocaml_typedtree_test.ml",
-                                    32063,
-                                    30
-                                  ]
-                                });
+                              MEL_EXN_ID: "Assert_failure",
+                              _1: [
+                                "jscomp/test/ocaml_typedtree_test.ml",
+                                32063,
+                                30
+                              ]
+                            });
                     case /* Tconstr */3 :
                         exit$3 = 3;
                         break;
                     default:
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                   }
                   break;
               case /* Tarrow */1 :
                   const l1 = match$2._0;
                   if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                   switch (match$3.TAG) {
                     case /* Tarrow */1 :
@@ -31921,25 +31921,25 @@ function mcomp(type_pairs, env, _t1, _t2) {
                           continue ;
                         }
                         throw new Caml_js_exceptions.MelangeError(Unify, {
-                                  MEL_EXN_ID: Unify,
-                                  _1: /* [] */0
-                                });
+                              MEL_EXN_ID: Unify,
+                              _1: /* [] */0
+                            });
                     case /* Tconstr */3 :
                         exit$3 = 3;
                         break;
                     default:
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                   }
                   break;
               case /* Ttuple */2 :
                   if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                   switch (match$3.TAG) {
                     case /* Ttuple */2 :
@@ -31949,9 +31949,9 @@ function mcomp(type_pairs, env, _t1, _t2) {
                         break;
                     default:
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                   }
                   break;
               case /* Tconstr */3 :
@@ -31983,17 +31983,17 @@ function mcomp(type_pairs, env, _t1, _t2) {
                             }
                           }
                           return Stdlib__List.iter2((function (i, param) {
-                                        if (i) {
-                                          return mcomp(type_pairs, env, param[0], param[1]);
-                                        }
-                                        
-                                      }), inj, Stdlib__List.combine(tl1, tl2));
+                                  if (i) {
+                                    return mcomp(type_pairs, env, param[0], param[1]);
+                                  }
+                                  
+                                }), inj, Stdlib__List.combine(tl1, tl2));
                         }
                         if (non_aliasable(p1, decl) && non_aliasable(p2, decl$p)) {
                           throw new Caml_js_exceptions.MelangeError(Unify, {
-                                    MEL_EXN_ID: Unify,
-                                    _1: /* [] */0
-                                  });
+                                MEL_EXN_ID: Unify,
+                                _1: /* [] */0
+                              });
                         }
                         const match$4 = decl.type_kind;
                         const match$5 = decl$p.type_kind;
@@ -32024,14 +32024,14 @@ function mcomp(type_pairs, env, _t1, _t2) {
                           } else {
                             if (match$5.TAG === /* Type_record */0) {
                               throw new Caml_js_exceptions.MelangeError(Unify, {
-                                        MEL_EXN_ID: Unify,
-                                        _1: /* [] */0
-                                      });
+                                    MEL_EXN_ID: Unify,
+                                    _1: /* [] */0
+                                  });
                             }
                             throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
+                                  MEL_EXN_ID: Unify,
+                                  _1: /* [] */0
+                                });
                           }
                         } else if (match$4.TAG === /* Type_record */0) {
                           if (/* tag */typeof match$5 === "number" || typeof match$5 === "string") {
@@ -32039,9 +32039,9 @@ function mcomp(type_pairs, env, _t1, _t2) {
                               exit$4 = 1;
                             } else {
                               throw new Caml_js_exceptions.MelangeError(Unify, {
-                                        MEL_EXN_ID: Unify,
-                                        _1: /* [] */0
-                                      });
+                                    MEL_EXN_ID: Unify,
+                                    _1: /* [] */0
+                                  });
                             }
                           } else {
                             if (match$5.TAG === /* Type_record */0) {
@@ -32050,30 +32050,30 @@ function mcomp(type_pairs, env, _t1, _t2) {
                                 return mcomp_record_description(type_pairs, env)(match$4._0, match$5._0);
                               }
                               throw new Caml_js_exceptions.MelangeError(Unify, {
-                                        MEL_EXN_ID: Unify,
-                                        _1: /* [] */0
-                                      });
+                                    MEL_EXN_ID: Unify,
+                                    _1: /* [] */0
+                                  });
                             }
                             throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
+                                  MEL_EXN_ID: Unify,
+                                  _1: /* [] */0
+                                });
                           }
                         } else if (/* tag */typeof match$5 === "number" || typeof match$5 === "string") {
                           if (match$5 === /* Type_abstract */0) {
                             exit$4 = 1;
                           } else {
                             throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
+                                  MEL_EXN_ID: Unify,
+                                  _1: /* [] */0
+                                });
                           }
                         } else {
                           if (match$5.TAG === /* Type_record */0) {
                             throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
+                                  MEL_EXN_ID: Unify,
+                                  _1: /* [] */0
+                                });
                           }
                           mcomp_list(type_pairs, env, tl1, tl2);
                           let xs = match$4._0;
@@ -32095,22 +32095,22 @@ function mcomp(type_pairs, env, _t1, _t2) {
                                   continue ;
                                 }
                                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                                          MEL_EXN_ID: Unify,
-                                          _1: /* [] */0
-                                        });
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
                               }
                               throw new Caml_js_exceptions.MelangeError(Unify, {
-                                        MEL_EXN_ID: Unify,
-                                        _1: /* [] */0
-                                      });
+                                    MEL_EXN_ID: Unify,
+                                    _1: /* [] */0
+                                  });
                             }
                             if (!y) {
                               return ;
                             }
                             throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
+                                  MEL_EXN_ID: Unify,
+                                  _1: /* [] */0
+                                });
                           };
                         }
                         if (exit$4 === 1) {
@@ -32120,19 +32120,19 @@ function mcomp(type_pairs, env, _t1, _t2) {
                                 return ;
                               }
                               throw new Caml_js_exceptions.MelangeError(Unify, {
-                                        MEL_EXN_ID: Unify,
-                                        _1: /* [] */0
-                                      });
+                                    MEL_EXN_ID: Unify,
+                                    _1: /* [] */0
+                                  });
                             }
                             throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
+                                  MEL_EXN_ID: Unify,
+                                  _1: /* [] */0
+                                });
                           } else {
                             throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
+                                  MEL_EXN_ID: Unify,
+                                  _1: /* [] */0
+                                });
                           }
                         }
                         
@@ -32152,9 +32152,9 @@ function mcomp(type_pairs, env, _t1, _t2) {
               case /* Tobject */4 :
                   if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                   switch (match$3.TAG) {
                     case /* Tconstr */3 :
@@ -32164,17 +32164,17 @@ function mcomp(type_pairs, env, _t1, _t2) {
                         return mcomp_fields(type_pairs, env, match$2._0, match$3._0);
                     default:
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                   }
                   break;
               case /* Tfield */5 :
                   if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                   switch (match$3.TAG) {
                     case /* Tconstr */3 :
@@ -32184,9 +32184,9 @@ function mcomp(type_pairs, env, _t1, _t2) {
                         return mcomp_fields(type_pairs, env, t1$p$1, t2$p$1);
                     default:
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                   }
                   break;
               case /* Tlink */6 :
@@ -32196,9 +32196,9 @@ function mcomp(type_pairs, env, _t1, _t2) {
               case /* Tvariant */8 :
                   if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                   switch (match$3.TAG) {
                     case /* Tconstr */3 :
@@ -32220,149 +32220,149 @@ function mcomp(type_pairs, env, _t1, _t2) {
                         };
                         if (row1$1.row_closed && Stdlib__List.exists(cannot_erase, match$6[1]) || row2$1.row_closed && Stdlib__List.exists(cannot_erase, match$6[0])) {
                           throw new Caml_js_exceptions.MelangeError(Unify, {
-                                    MEL_EXN_ID: Unify,
-                                    _1: /* [] */0
-                                  });
+                                MEL_EXN_ID: Unify,
+                                _1: /* [] */0
+                              });
                         }
                         return Stdlib__List.iter((function (param) {
-                                      const match = row_field_repr_aux(/* [] */0, param[1]);
-                                      const match$1 = row_field_repr_aux(/* [] */0, param[2]);
-                                      let exit = 0;
-                                      let exit$1 = 0;
-                                      if (/* tag */typeof match === "number" || typeof match === "string") {
-                                        exit$1 = 2;
-                                      } else if (match.TAG === /* Rpresent */0) {
-                                        const t1 = match._0;
-                                        if (t1 !== undefined) {
-                                          if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                      MEL_EXN_ID: Unify,
-                                                      _1: /* [] */0
-                                                    });
-                                          }
-                                          if (match$1.TAG === /* Rpresent */0) {
-                                            const t2 = match$1._0;
-                                            if (t2 !== undefined) {
-                                              return mcomp(type_pairs, env, t1, t2);
-                                            }
-                                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                      MEL_EXN_ID: Unify,
-                                                      _1: /* [] */0
-                                                    });
-                                          }
-                                          if (match$1._0) {
-                                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                      MEL_EXN_ID: Unify,
-                                                      _1: /* [] */0
-                                                    });
-                                          }
-                                          return Stdlib__List.iter((function (param) {
-                                                        return mcomp(type_pairs, env, t1, param);
-                                                      }), match$1._1);
-                                        } else {
-                                          if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                      MEL_EXN_ID: Unify,
-                                                      _1: /* [] */0
-                                                    });
-                                          }
-                                          if (match$1.TAG === /* Rpresent */0) {
-                                            if (match$1._0 === undefined) {
-                                              return ;
-                                            }
-                                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                      MEL_EXN_ID: Unify,
-                                                      _1: /* [] */0
-                                                    });
-                                          }
-                                          if (!match$1._1) {
-                                            return ;
-                                          }
-                                          throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                    MEL_EXN_ID: Unify,
-                                                    _1: /* [] */0
-                                                  });
-                                        }
-                                      } else {
-                                        let exit$2 = 0;
-                                        if (match._0 || /* tag */typeof match$1 === "number" || typeof match$1 === "string" || match$1.TAG !== /* Rpresent */0) {
-                                          exit$2 = 3;
-                                        } else {
-                                          const t2$1 = match$1._0;
-                                          if (t2$1 !== undefined) {
-                                            return Stdlib__List.iter((function (param) {
-                                                          return mcomp(type_pairs, env, t2$1, param);
-                                                        }), match._1);
-                                          }
-                                          exit$2 = 3;
-                                        }
-                                        if (exit$2 === 3) {
-                                          if (match._1) {
-                                            exit$1 = 2;
-                                          } else {
-                                            exit = 1;
-                                          }
-                                        }
-                                        
-                                      }
-                                      if (exit$1 === 2) {
-                                        if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                          return ;
-                                        }
-                                        if (match$1.TAG !== /* Rpresent */0) {
-                                          return ;
-                                        }
-                                        if (match$1._0 !== undefined) {
-                                          exit = 1;
-                                        } else {
-                                          throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                    MEL_EXN_ID: Unify,
-                                                    _1: /* [] */0
-                                                  });
-                                        }
+                                const match = row_field_repr_aux(/* [] */0, param[1]);
+                                const match$1 = row_field_repr_aux(/* [] */0, param[2]);
+                                let exit = 0;
+                                let exit$1 = 0;
+                                if (/* tag */typeof match === "number" || typeof match === "string") {
+                                  exit$1 = 2;
+                                } else if (match.TAG === /* Rpresent */0) {
+                                  const t1 = match._0;
+                                  if (t1 !== undefined) {
+                                    if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                                            MEL_EXN_ID: Unify,
+                                            _1: /* [] */0
+                                          });
+                                    }
+                                    if (match$1.TAG === /* Rpresent */0) {
+                                      const t2 = match$1._0;
+                                      if (t2 !== undefined) {
+                                        return mcomp(type_pairs, env, t1, t2);
                                       }
-                                      if (exit === 1) {
-                                        let exit$3 = 0;
-                                        if (/* tag */typeof match === "number" || typeof match === "string") {
-                                          exit$3 = 2;
-                                        } else {
-                                          if (!match._0) {
-                                            return ;
-                                          }
-                                          exit$3 = 2;
-                                        }
-                                        if (exit$3 === 2) {
-                                          if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                            return ;
-                                          }
-                                          if (match$1.TAG !== /* Rpresent */0) {
-                                            return ;
-                                          }
-                                          if (match$1._0 === undefined) {
-                                            return ;
-                                          }
-                                          throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                    MEL_EXN_ID: Unify,
-                                                    _1: /* [] */0
-                                                  });
-                                        }
-                                        
+                                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                                            MEL_EXN_ID: Unify,
+                                            _1: /* [] */0
+                                          });
+                                    }
+                                    if (match$1._0) {
+                                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                                            MEL_EXN_ID: Unify,
+                                            _1: /* [] */0
+                                          });
+                                    }
+                                    return Stdlib__List.iter((function (param) {
+                                            return mcomp(type_pairs, env, t1, param);
+                                          }), match$1._1);
+                                  } else {
+                                    if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                                            MEL_EXN_ID: Unify,
+                                            _1: /* [] */0
+                                          });
+                                    }
+                                    if (match$1.TAG === /* Rpresent */0) {
+                                      if (match$1._0 === undefined) {
+                                        return ;
                                       }
-                                      
-                                    }), match$6[2]);
+                                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                                            MEL_EXN_ID: Unify,
+                                            _1: /* [] */0
+                                          });
+                                    }
+                                    if (!match$1._1) {
+                                      return ;
+                                    }
+                                    throw new Caml_js_exceptions.MelangeError(Unify, {
+                                          MEL_EXN_ID: Unify,
+                                          _1: /* [] */0
+                                        });
+                                  }
+                                } else {
+                                  let exit$2 = 0;
+                                  if (match._0 || /* tag */typeof match$1 === "number" || typeof match$1 === "string" || match$1.TAG !== /* Rpresent */0) {
+                                    exit$2 = 3;
+                                  } else {
+                                    const t2$1 = match$1._0;
+                                    if (t2$1 !== undefined) {
+                                      return Stdlib__List.iter((function (param) {
+                                              return mcomp(type_pairs, env, t2$1, param);
+                                            }), match._1);
+                                    }
+                                    exit$2 = 3;
+                                  }
+                                  if (exit$2 === 3) {
+                                    if (match._1) {
+                                      exit$1 = 2;
+                                    } else {
+                                      exit = 1;
+                                    }
+                                  }
+                                  
+                                }
+                                if (exit$1 === 2) {
+                                  if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                    return ;
+                                  }
+                                  if (match$1.TAG !== /* Rpresent */0) {
+                                    return ;
+                                  }
+                                  if (match$1._0 !== undefined) {
+                                    exit = 1;
+                                  } else {
+                                    throw new Caml_js_exceptions.MelangeError(Unify, {
+                                          MEL_EXN_ID: Unify,
+                                          _1: /* [] */0
+                                        });
+                                  }
+                                }
+                                if (exit === 1) {
+                                  let exit$3 = 0;
+                                  if (/* tag */typeof match === "number" || typeof match === "string") {
+                                    exit$3 = 2;
+                                  } else {
+                                    if (!match._0) {
+                                      return ;
+                                    }
+                                    exit$3 = 2;
+                                  }
+                                  if (exit$3 === 2) {
+                                    if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                      return ;
+                                    }
+                                    if (match$1.TAG !== /* Rpresent */0) {
+                                      return ;
+                                    }
+                                    if (match$1._0 === undefined) {
+                                      return ;
+                                    }
+                                    throw new Caml_js_exceptions.MelangeError(Unify, {
+                                          MEL_EXN_ID: Unify,
+                                          _1: /* [] */0
+                                        });
+                                  }
+                                  
+                                }
+                                
+                              }), match$6[2]);
                     default:
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                   }
                   break;
               case /* Tunivar */9 :
                   if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                   switch (match$3.TAG) {
                     case /* Tconstr */3 :
@@ -32372,9 +32372,9 @@ function mcomp(type_pairs, env, _t1, _t2) {
                         return unify_univar(t1$p$1, t2$p$1, univar_pairs.contents);
                     default:
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                   }
                   break;
               case /* Tpoly */10 :
@@ -32386,9 +32386,9 @@ function mcomp(type_pairs, env, _t1, _t2) {
                   } else {
                     if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                     }
                     switch (match$3.TAG) {
                       case /* Tconstr */3 :
@@ -32405,17 +32405,17 @@ function mcomp(type_pairs, env, _t1, _t2) {
                           break;
                       default:
                         throw new Caml_js_exceptions.MelangeError(Unify, {
-                                  MEL_EXN_ID: Unify,
-                                  _1: /* [] */0
-                                });
+                              MEL_EXN_ID: Unify,
+                              _1: /* [] */0
+                            });
                     }
                   }
                   if (exit$6 === 4) {
                     if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                     }
                     switch (match$3.TAG) {
                       case /* Tconstr */3 :
@@ -32423,22 +32423,22 @@ function mcomp(type_pairs, env, _t1, _t2) {
                           break;
                       case /* Tpoly */10 :
                           return enter_poly(env, univar_pairs, t1$2, tl1$1, match$3._0, match$3._1, (function (param, param$1) {
-                                        return mcomp(type_pairs, env, param, param$1);
-                                      }));
+                                  return mcomp(type_pairs, env, param, param$1);
+                                }));
                       default:
                         throw new Caml_js_exceptions.MelangeError(Unify, {
-                                  MEL_EXN_ID: Unify,
-                                  _1: /* [] */0
-                                });
+                              MEL_EXN_ID: Unify,
+                              _1: /* [] */0
+                            });
                     }
                   }
                   break;
               case /* Tpackage */11 :
                   if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                   switch (match$3.TAG) {
                     case /* Tconstr */3 :
@@ -32448,9 +32448,9 @@ function mcomp(type_pairs, env, _t1, _t2) {
                         return ;
                     default:
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                   }
                   break;
               
@@ -32459,18 +32459,18 @@ function mcomp(type_pairs, env, _t1, _t2) {
           if (exit$3 === 3) {
             if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
               throw new Caml_js_exceptions.MelangeError(Unify, {
-                        MEL_EXN_ID: Unify,
-                        _1: /* [] */0
-                      });
+                    MEL_EXN_ID: Unify,
+                    _1: /* [] */0
+                  });
             }
             if (match$3.TAG === /* Tconstr */3) {
               p = match$3._0;
               exit$2 = 2;
             } else {
               throw new Caml_js_exceptions.MelangeError(Unify, {
-                        MEL_EXN_ID: Unify,
-                        _1: /* [] */0
-                      });
+                    MEL_EXN_ID: Unify,
+                    _1: /* [] */0
+                  });
             }
           }
           if (exit$2 === 2) {
@@ -32480,9 +32480,9 @@ function mcomp(type_pairs, env, _t1, _t2) {
                 return ;
               }
               throw new Caml_js_exceptions.MelangeError(Unify, {
-                        MEL_EXN_ID: Unify,
-                        _1: /* [] */0
-                      });
+                    MEL_EXN_ID: Unify,
+                    _1: /* [] */0
+                  });
             }
             catch (raw_exn$3){
               const exn$3 = Caml_js_exceptions.internalToOCamlException(raw_exn$3);
@@ -32505,9 +32505,9 @@ function mcomp(type_pairs, env, _t1, _t2) {
 function mcomp_list(type_pairs, env, tl1, tl2) {
   if (Stdlib__List.length(tl1) !== Stdlib__List.length(tl2)) {
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   }
   Stdlib__List.iter2((function (param, param$1) {
           return mcomp(type_pairs, env, param, param$1);
@@ -32517,13 +32517,13 @@ function mcomp_list(type_pairs, env, tl1, tl2) {
 function mcomp_fields(type_pairs, env, ty1, ty2) {
   if (!(concrete_object(ty1) && concrete_object(ty2))) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                32108,
-                59
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            32108,
+            59
+          ]
+        });
   }
   const match = flatten_fields(ty2);
   const match$1 = flatten_fields(ty1);
@@ -32531,9 +32531,9 @@ function mcomp_fields(type_pairs, env, ty1, ty2) {
   mcomp(type_pairs, env, match$1[1], match[1]);
   if (Caml_obj.caml_notequal(match$2[1], /* [] */0) && Caml_obj.caml_equal(object_row(ty1).desc, /* Tnil */0) || Caml_obj.caml_notequal(match$2[2], /* [] */0) && Caml_obj.caml_equal(object_row(ty2).desc, /* Tnil */0)) {
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   }
   Stdlib__List.iter((function (param) {
           mcomp_kind(param[1], param[3]);
@@ -32551,20 +32551,20 @@ function mcomp_kind(k1, k2) {
           return ;
         }
         throw new Caml_js_exceptions.MelangeError(Unify, {
-                  MEL_EXN_ID: Unify,
-                  _1: /* [] */0
-                });
+              MEL_EXN_ID: Unify,
+              _1: /* [] */0
+            });
       } else {
         throw new Caml_js_exceptions.MelangeError(Unify, {
-                  MEL_EXN_ID: Unify,
-                  _1: /* [] */0
-                });
+              MEL_EXN_ID: Unify,
+              _1: /* [] */0
+            });
       }
     } else {
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: /* [] */0
-              });
+            MEL_EXN_ID: Unify,
+            _1: /* [] */0
+          });
     }
   } else {
     if (!/* tag */(typeof k2$1 === "number" || typeof k2$1 === "string")) {
@@ -32572,14 +32572,14 @@ function mcomp_kind(k1, k2) {
     }
     if (k2$1 === /* Fpresent */0) {
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: /* [] */0
-              });
+            MEL_EXN_ID: Unify,
+            _1: /* [] */0
+          });
     }
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   }
 }
 
@@ -32589,17 +32589,17 @@ function mcomp_type_option(type_pairs, env, t, t$p) {
       return mcomp(type_pairs, env, t, t$p);
     }
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   }
   if (t$p === undefined) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError(Unify, {
-            MEL_EXN_ID: Unify,
-            _1: /* [] */0
-          });
+        MEL_EXN_ID: Unify,
+        _1: /* [] */0
+      });
 }
 
 function mcomp_record_description(type_pairs, env) {
@@ -32618,22 +32618,22 @@ function mcomp_record_description(type_pairs, env) {
             continue ;
           }
           throw new Caml_js_exceptions.MelangeError(Unify, {
-                    MEL_EXN_ID: Unify,
-                    _1: /* [] */0
-                  });
+                MEL_EXN_ID: Unify,
+                _1: /* [] */0
+              });
         }
         throw new Caml_js_exceptions.MelangeError(Unify, {
-                  MEL_EXN_ID: Unify,
-                  _1: /* [] */0
-                });
+              MEL_EXN_ID: Unify,
+              _1: /* [] */0
+            });
       }
       if (!y) {
         return ;
       }
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: /* [] */0
-              });
+            MEL_EXN_ID: Unify,
+            _1: /* [] */0
+          });
     };
   };
   return iter;
@@ -32670,25 +32670,25 @@ function find_newtype_level(env, path) {
       return x;
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                32239,
-                12
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            32239,
+            12
+          ]
+        });
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Stdlib.Not_found) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  32240,
-                  20
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              32240,
+              20
+            ]
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -32711,14 +32711,14 @@ const unify_eq_set = Curry._1(TypePairs.create, 11);
 function order_type_pair(t1, t2) {
   if (t1.id <= t2.id) {
     return [
-            t1,
-            t2
-          ];
+      t1,
+      t2
+    ];
   } else {
     return [
-            t2,
-            t1
-          ];
+      t2,
+      t1
+    ];
   }
 }
 
@@ -32737,26 +32737,26 @@ function eq_package_path(env, p1, p2) {
 const nondep_type$p = {
   contents: (function (param, param$1, param$2) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  32262,
-                  37
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              32262,
+              37
+            ]
+          });
     })
 };
 
 const package_subtype = {
   contents: (function (param, param$1, param$2, param$3, param$4, param$5, param$6) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  32263,
-                  48
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              32263,
+              48
+            ]
+          });
     })
 };
 
@@ -32765,22 +32765,22 @@ function concat_longident(lid1) {
     switch (s.TAG) {
       case /* Lident */0 :
           return {
-                  TAG: /* Ldot */1,
-                  _0: lid1,
-                  _1: s._0
-                };
+            TAG: /* Ldot */1,
+            _0: lid1,
+            _1: s._0
+          };
       case /* Ldot */1 :
           return {
-                  TAG: /* Ldot */1,
-                  _0: concat_longident(lid1)(s._0),
-                  _1: s._1
-                };
+            TAG: /* Ldot */1,
+            _0: concat_longident(lid1)(s._0),
+            _1: s._1
+          };
       case /* Lapply */2 :
           return {
-                  TAG: /* Lapply */2,
-                  _0: concat_longident(lid1)(s._0),
-                  _1: s._1
-                };
+            TAG: /* Lapply */2,
+            _0: concat_longident(lid1)(s._0),
+            _1: s._1
+          };
       
     }
   };
@@ -32815,9 +32815,9 @@ function complete_type_list(allow_absentOpt, env, nl1, lv2, mty2, nl2, tl2) {
         const n2 = nt2[0];
         if (Caml_obj.caml_greaterequal(n, n2)) {
           return {
-                  hd: nt2,
-                  tl: complete(Caml_obj.caml_equal(n, n2) ? nl1.tl : nl1, ntl2.tl)
-                };
+            hd: nt2,
+            tl: complete(Caml_obj.caml_equal(n, n2) ? nl1.tl : nl1, ntl2.tl)
+          };
         }
         exit = 1;
       } else {
@@ -32833,41 +32833,41 @@ function complete_type_list(allow_absentOpt, env, nl1, lv2, mty2, nl2, tl2) {
           const decl = match[1];
           if (decl.type_arity !== 0) {
             throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                      MEL_EXN_ID: Stdlib.Exit
-                    });
+                  MEL_EXN_ID: Stdlib.Exit
+                });
           }
           let tmp = decl.type_kind;
           if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
             if (tmp === /* Type_abstract */0) {
               if (decl.type_private === /* Private */0) {
                 throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                          MEL_EXN_ID: Stdlib.Exit
-                        });
+                      MEL_EXN_ID: Stdlib.Exit
+                    });
               }
               const t2 = decl.type_manifest;
               if (t2 !== undefined) {
                 return {
-                        hd: [
-                          n,
-                          nondep_instance(env$p, lv2, id2, t2)
-                        ],
-                        tl: complete(nl, ntl2)
-                      };
+                  hd: [
+                    n,
+                    nondep_instance(env$p, lv2, id2, t2)
+                  ],
+                  tl: complete(nl, ntl2)
+                };
               }
               if (allow_absent) {
                 return complete(nl, ntl2);
               }
               throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                        MEL_EXN_ID: Stdlib.Exit
-                      });
+                    MEL_EXN_ID: Stdlib.Exit
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                      MEL_EXN_ID: Stdlib.Exit
-                    });
+                  MEL_EXN_ID: Stdlib.Exit
+                });
           } else {
             throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                      MEL_EXN_ID: Stdlib.Exit
-                    });
+                  MEL_EXN_ID: Stdlib.Exit
+                });
           }
         }
         catch (raw_exn){
@@ -32885,8 +32885,8 @@ function complete_type_list(allow_absentOpt, env, nl1, lv2, mty2, nl2, tl2) {
           if (exit$1 === 2) {
             if (exn.MEL_EXN_ID === Stdlib.Exit) {
               throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                        MEL_EXN_ID: Stdlib.Not_found
-                      });
+                    MEL_EXN_ID: Stdlib.Not_found
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
           }
@@ -32917,8 +32917,8 @@ function unify_package(env, unify_list, lv1, p1, n1, tl1, lv2, p2, n2, tl2) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-            MEL_EXN_ID: Stdlib.Not_found
-          });
+        MEL_EXN_ID: Stdlib.Not_found
+      });
 }
 
 function unify_eq(env, t1, t2) {
@@ -33061,15 +33061,15 @@ function unify(env, t1, t2) {
     if (trace.MEL_EXN_ID === Unify) {
       reset_trace_gadt_instances(reset_tracing);
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: {
-                  hd: [
-                    t1$1,
-                    t2$1
-                  ],
-                  tl: trace._1
-                }
-              });
+            MEL_EXN_ID: Unify,
+            _1: {
+              hd: [
+                t1$1,
+                t2$1
+              ],
+              tl: trace._1
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
   }
@@ -33084,9 +33084,9 @@ function unify2(env, t1, t2) {
       const t2$p = expand_head_unif(env.contents, t2);
       if (unify_eq(env.contents, t1$p, t1$p$p) && unify_eq(env.contents, t2$p, t2$p$p)) {
         return [
-                t1$p,
-                t2$p
-              ];
+          t1$p,
+          t2$p
+        ];
       }
       _t2$p$p = t2$p;
       _t1$p$p = t1$p;
@@ -33152,14 +33152,14 @@ function unify2(env, t1, t2) {
     const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
     if (trace.MEL_EXN_ID === Unify) {
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: Stdlib__List.map((function (param) {
-                        return [
-                                param[1],
-                                param[0]
-                              ];
-                      }), trace._1)
-              });
+            MEL_EXN_ID: Unify,
+            _1: Stdlib__List.map((function (param) {
+                    return [
+                      param[1],
+                      param[0]
+                    ];
+                  }), trace._1)
+          });
     }
     throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
   }
@@ -33168,9 +33168,9 @@ function unify2(env, t1, t2) {
 function unify_list(env, tl1, tl2) {
   if (Stdlib__List.length(tl1) !== Stdlib__List.length(tl2)) {
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   }
   Stdlib__List.iter2((function (param, param$1) {
           return unify(env, param, param$1);
@@ -33194,51 +33194,51 @@ function unify_fields(env, ty1, ty2) {
     unify(env, build_fields(l1)(miss1, va), rest2);
     unify(env, rest1, build_fields(l2)(miss2, va));
     return Stdlib__List.iter((function (param) {
-                  const t2 = param[4];
-                  const k2 = param[3];
-                  const t1 = param[2];
-                  const k1 = param[1];
-                  const n = param[0];
-                  unify_kind(k1, k2);
-                  try {
-                    if (trace_gadt_instances.contents) {
-                      update_level(env.contents, va.level, t1);
-                    }
-                    return unify(env, t1, t2);
-                  }
-                  catch (raw_trace){
-                    const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
-                    if (trace.MEL_EXN_ID === Unify) {
-                      const desc_3 = newty2(current_level.contents, /* Tnil */0);
-                      const desc = {
-                        TAG: /* Tfield */5,
-                        _0: n,
-                        _1: k1,
-                        _2: t1,
-                        _3: desc_3
-                      };
-                      const desc_3$1 = newty2(current_level.contents, /* Tnil */0);
-                      const desc$1 = {
-                        TAG: /* Tfield */5,
-                        _0: n,
-                        _1: k2,
-                        _2: t2,
-                        _3: desc_3$1
-                      };
-                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: {
-                                  hd: [
-                                    newty2(current_level.contents, desc),
-                                    newty2(current_level.contents, desc$1)
-                                  ],
-                                  tl: trace._1
-                                }
-                              });
-                    }
-                    throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
-                  }
-                }), match$2[0]);
+            const t2 = param[4];
+            const k2 = param[3];
+            const t1 = param[2];
+            const k1 = param[1];
+            const n = param[0];
+            unify_kind(k1, k2);
+            try {
+              if (trace_gadt_instances.contents) {
+                update_level(env.contents, va.level, t1);
+              }
+              return unify(env, t1, t2);
+            }
+            catch (raw_trace){
+              const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
+              if (trace.MEL_EXN_ID === Unify) {
+                const desc_3 = newty2(current_level.contents, /* Tnil */0);
+                const desc = {
+                  TAG: /* Tfield */5,
+                  _0: n,
+                  _1: k1,
+                  _2: t1,
+                  _3: desc_3
+                };
+                const desc_3$1 = newty2(current_level.contents, /* Tnil */0);
+                const desc$1 = {
+                  TAG: /* Tfield */5,
+                  _0: n,
+                  _1: k2,
+                  _2: t2,
+                  _3: desc_3$1
+                };
+                throw new Caml_js_exceptions.MelangeError(Unify, {
+                      MEL_EXN_ID: Unify,
+                      _1: {
+                        hd: [
+                          newty2(current_level.contents, desc),
+                          newty2(current_level.contents, desc$1)
+                        ],
+                        tl: trace._1
+                      }
+                    });
+              }
+              throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
+            }
+          }), match$2[0]);
   }
   catch (exn){
     log_type(rest1);
@@ -33271,10 +33271,10 @@ function unify_row(env, row1, row2) {
             const l = param[0];
             try {
               throw new Caml_js_exceptions.MelangeError(Tags, {
-                        MEL_EXN_ID: Tags,
-                        _1: l,
-                        _2: Stdlib__Hashtbl.find(ht, hash_variant(l))
-                      });
+                    MEL_EXN_ID: Tags,
+                    _1: l,
+                    _2: Stdlib__Hashtbl.find(ht, hash_variant(l))
+                  });
             }
             catch (raw_exn){
               const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -33297,18 +33297,18 @@ function unify_row(env, row1, row2) {
   const closed = row1$1.row_closed || row2$1.row_closed;
   const keep = function ($$switch) {
     return Stdlib__List.for_all((function (param) {
-                  const match = Curry._2($$switch, param[1], param[2]);
-                  if (Caml_obj.caml_equal(row_field_repr_aux(/* [] */0, match[0]), /* Rabsent */0)) {
-                    return true;
-                  } else {
-                    return Caml_obj.caml_notequal(row_field_repr_aux(/* [] */0, match[1]), /* Rabsent */0);
-                  }
-                }), pairs);
+            const match = Curry._2($$switch, param[1], param[2]);
+            if (Caml_obj.caml_equal(row_field_repr_aux(/* [] */0, match[0]), /* Rabsent */0)) {
+              return true;
+            } else {
+              return Caml_obj.caml_notequal(row_field_repr_aux(/* [] */0, match[1]), /* Rabsent */0);
+            }
+          }), pairs);
   };
   const empty = function (fields) {
     return Stdlib__List.for_all((function (param) {
-                  return Caml_obj.caml_equal(row_field_repr_aux(/* [] */0, param[1]), /* Rabsent */0);
-                }), fields);
+            return Caml_obj.caml_equal(row_field_repr_aux(/* [] */0, param[1]), /* Rabsent */0);
+          }), fields);
   };
   if (closed && (empty(r1) || row2$1.row_closed) && (empty(r2) || row1$1.row_closed) && Stdlib__List.for_all((function (param) {
             if (Caml_obj.caml_equal(row_field_repr_aux(/* [] */0, param[1]), /* Rabsent */0)) {
@@ -33318,27 +33318,27 @@ function unify_row(env, row1, row2) {
             }
           }), pairs)) {
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: {
-                hd: [
-                  mkvariant(/* [] */0, true),
-                  mkvariant(/* [] */0, true)
-                ],
-                tl: /* [] */0
-              }
-            });
+          MEL_EXN_ID: Unify,
+          _1: {
+            hd: [
+              mkvariant(/* [] */0, true),
+              mkvariant(/* [] */0, true)
+            ],
+            tl: /* [] */0
+          }
+        });
   }
   const name = row1$1.row_name !== undefined && (row1$1.row_closed || empty(r2)) && (!row2$1.row_closed || keep(function (f1, f2) {
           return [
-                  f1,
-                  f2
-                ];
+            f1,
+            f2
+          ];
         }) && empty(r1)) ? row1$1.row_name : (
       row2$1.row_name !== undefined && (row2$1.row_closed || empty(r1)) && (!row1$1.row_closed || keep(function (f1, f2) {
               return [
-                      f2,
-                      f1
-                    ];
+                f2,
+                f1
+              ];
             }) && empty(r2)) ? row2$1.row_name : undefined
     );
   const set_more = function (row, rest) {
@@ -33347,18 +33347,18 @@ function unify_row(env, row1, row2) {
       const t1 = mkvariant(/* [] */0, true);
       const t2 = mkvariant(rest$1, false);
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: {
-                  hd: row === row1$1 ? [
-                      t1,
-                      t2
-                    ] : [
-                      t2,
-                      t1
-                    ],
-                  tl: /* [] */0
-                }
-              });
+            MEL_EXN_ID: Unify,
+            _1: {
+              hd: row === row1$1 ? [
+                  t1,
+                  t2
+                ] : [
+                  t2,
+                  t1
+                ],
+              tl: /* [] */0
+            }
+          });
     }
     const rm = row_more(row);
     if (trace_gadt_instances.contents && Caml_obj.caml_equal(rm.desc, /* Tnil */0) || !trace_gadt_instances.contents) {
@@ -33398,307 +33398,307 @@ function unify_row(env, row1, row2) {
     set_more(row2$1, r1);
     set_more(row1$1, r2);
     return Stdlib__List.iter((function (param) {
-                  const f2 = param[2];
-                  const f1 = param[1];
-                  const l = param[0];
-                  try {
-                    let _f1 = f1;
-                    let _f2 = f2;
-                    while(true) {
-                      const f2$1 = _f2;
-                      const f1$1 = _f1;
-                      const f1$2 = row_field_repr_aux(/* [] */0, f1$1);
-                      const f2$2 = row_field_repr_aux(/* [] */0, f2$1);
-                      if (f1$2 === f2$2) {
+            const f2 = param[2];
+            const f1 = param[1];
+            const l = param[0];
+            try {
+              let _f1 = f1;
+              let _f2 = f2;
+              while(true) {
+                const f2$1 = _f2;
+                const f1$1 = _f1;
+                const f1$2 = row_field_repr_aux(/* [] */0, f1$1);
+                const f2$2 = row_field_repr_aux(/* [] */0, f2$1);
+                if (f1$2 === f2$2) {
+                  return ;
+                }
+                if (/* tag */typeof f1$2 === "number" || typeof f1$2 === "string") {
+                  if (/* tag */typeof f2$2 === "number" || typeof f2$2 === "string") {
+                    return ;
+                  }
+                  if (f2$2.TAG === /* Rpresent */0) {
+                    throw new Caml_js_exceptions.MelangeError(Unify, {
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
+                  }
+                  if (f2$2._2) {
+                    throw new Caml_js_exceptions.MelangeError(Unify, {
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
+                  }
+                  if (!fixed2) {
+                    return set_row_field(f2$2._3, f1$2);
+                  }
+                  throw new Caml_js_exceptions.MelangeError(Unify, {
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
+                } else if (f1$2.TAG === /* Rpresent */0) {
+                  const t1 = f1$2._0;
+                  if (t1 !== undefined) {
+                    if (/* tag */typeof f2$2 === "number" || typeof f2$2 === "string") {
+                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
+                    }
+                    if (f2$2.TAG === /* Rpresent */0) {
+                      const t2 = f2$2._0;
+                      if (t2 !== undefined) {
+                        return unify(env, t1, t2);
+                      }
+                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
+                    }
+                    if (f2$2._0) {
+                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
+                    }
+                    if (fixed2) {
+                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
+                    }
+                    const e2 = f2$2._3;
+                    set_row_field(e2, f1$2);
+                    update_level(env.contents, repr(more).level, t1);
+                    try {
+                      return Stdlib__List.iter((function (param) {
+                              return unify(env, t1, param);
+                            }), f2$2._1);
+                    }
+                    catch (exn){
+                      e2.contents = undefined;
+                      throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
+                    }
+                  } else {
+                    if (/* tag */typeof f2$2 === "number" || typeof f2$2 === "string") {
+                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
+                    }
+                    if (f2$2.TAG === /* Rpresent */0) {
+                      if (f2$2._0 === undefined) {
                         return ;
                       }
-                      if (/* tag */typeof f1$2 === "number" || typeof f1$2 === "string") {
-                        if (/* tag */typeof f2$2 === "number" || typeof f2$2 === "string") {
-                          return ;
-                        }
-                        if (f2$2.TAG === /* Rpresent */0) {
-                          throw new Caml_js_exceptions.MelangeError(Unify, {
-                                    MEL_EXN_ID: Unify,
-                                    _1: /* [] */0
-                                  });
-                        }
-                        if (f2$2._2) {
-                          throw new Caml_js_exceptions.MelangeError(Unify, {
-                                    MEL_EXN_ID: Unify,
-                                    _1: /* [] */0
-                                  });
-                        }
-                        if (!fixed2) {
-                          return set_row_field(f2$2._3, f1$2);
-                        }
+                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
+                    }
+                    if (f2$2._0) {
+                      if (f2$2._1) {
                         throw new Caml_js_exceptions.MelangeError(Unify, {
-                                  MEL_EXN_ID: Unify,
-                                  _1: /* [] */0
-                                });
-                      } else if (f1$2.TAG === /* Rpresent */0) {
-                        const t1 = f1$2._0;
-                        if (t1 !== undefined) {
-                          if (/* tag */typeof f2$2 === "number" || typeof f2$2 === "string") {
-                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
-                          }
-                          if (f2$2.TAG === /* Rpresent */0) {
-                            const t2 = f2$2._0;
-                            if (t2 !== undefined) {
-                              return unify(env, t1, t2);
-                            }
-                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
-                          }
-                          if (f2$2._0) {
-                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
-                          }
-                          if (fixed2) {
-                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
-                          }
-                          const e2 = f2$2._3;
-                          set_row_field(e2, f1$2);
-                          update_level(env.contents, repr(more).level, t1);
-                          try {
-                            return Stdlib__List.iter((function (param) {
-                                          return unify(env, t1, param);
-                                        }), f2$2._1);
-                          }
-                          catch (exn){
-                            e2.contents = undefined;
-                            throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
-                          }
-                        } else {
-                          if (/* tag */typeof f2$2 === "number" || typeof f2$2 === "string") {
-                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
-                          }
-                          if (f2$2.TAG === /* Rpresent */0) {
-                            if (f2$2._0 === undefined) {
-                              return ;
-                            }
-                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
-                          }
-                          if (f2$2._0) {
-                            if (f2$2._1) {
-                              throw new Caml_js_exceptions.MelangeError(Unify, {
-                                        MEL_EXN_ID: Unify,
-                                        _1: /* [] */0
-                                      });
-                            }
-                            if (!fixed2) {
-                              return set_row_field(f2$2._3, f1$2);
-                            }
-                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
-                          }
+                              MEL_EXN_ID: Unify,
+                              _1: /* [] */0
+                            });
+                      }
+                      if (!fixed2) {
+                        return set_row_field(f2$2._3, f1$2);
+                      }
+                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
+                    }
+                    throw new Caml_js_exceptions.MelangeError(Unify, {
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
+                  }
+                } else {
+                  const c1 = f1$2._0;
+                  const m1 = f1$2._2;
+                  const tl1 = f1$2._1;
+                  const e1 = f1$2._3;
+                  if (/* tag */typeof f2$2 === "number" || typeof f2$2 === "string") {
+                    if (m1) {
+                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
+                    }
+                    if (!fixed1) {
+                      return set_row_field(f1$2._3, f2$2);
+                    }
+                    throw new Caml_js_exceptions.MelangeError(Unify, {
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
+                  }
+                  if (f2$2.TAG === /* Rpresent */0) {
+                    if (c1) {
+                      if (f1$2._1) {
+                        throw new Caml_js_exceptions.MelangeError(Unify, {
+                              MEL_EXN_ID: Unify,
+                              _1: /* [] */0
+                            });
+                      }
+                      if (f2$2._0 !== undefined) {
+                        throw new Caml_js_exceptions.MelangeError(Unify, {
+                              MEL_EXN_ID: Unify,
+                              _1: /* [] */0
+                            });
+                      }
+                      if (!fixed1) {
+                        return set_row_field(f1$2._3, f2$2);
+                      }
+                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
+                    }
+                    const t2$1 = f2$2._0;
+                    if (t2$1 !== undefined) {
+                      if (fixed1) {
+                        throw new Caml_js_exceptions.MelangeError(Unify, {
+                              MEL_EXN_ID: Unify,
+                              _1: /* [] */0
+                            });
+                      }
+                      const e1$1 = f1$2._3;
+                      set_row_field(e1$1, f2$2);
+                      update_level(env.contents, repr(more).level, t2$1);
+                      try {
+                        return Stdlib__List.iter((function (t1) {
+                                unify(env, t1, t2$1);
+                              }), f1$2._1);
+                      }
+                      catch (exn$1){
+                        e1$1.contents = undefined;
+                        throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
+                      }
+                    } else {
+                      throw new Caml_js_exceptions.MelangeError(Unify, {
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
+                    }
+                  } else {
+                    const e2$1 = f2$2._3;
+                    if (e1 === e2$1) {
+                      return ;
+                    }
+                    const m2 = f2$2._2;
+                    const tl2 = f2$2._1;
+                    const c2 = f2$2._0;
+                    let redo = false;
+                    if (m1 || m2 || fixed1 || fixed2 || rigid_variants.contents && (Stdlib__List.length(tl1) === 1 || Stdlib__List.length(tl2) === 1)) {
+                      const match = Stdlib.$at(tl1, tl2);
+                      let tmp;
+                      if (match) {
+                        const t1$1 = match.hd;
+                        if (c1 || c2) {
                           throw new Caml_js_exceptions.MelangeError(Unify, {
-                                    MEL_EXN_ID: Unify,
-                                    _1: /* [] */0
-                                  });
+                                MEL_EXN_ID: Unify,
+                                _1: /* [] */0
+                              });
                         }
+                        Stdlib__List.iter((function (param) {
+                                return unify(env, t1$1, param);
+                              }), match.tl);
+                        tmp = e1.contents !== undefined || e2$1.contents !== undefined;
                       } else {
-                        const c1 = f1$2._0;
-                        const m1 = f1$2._2;
-                        const tl1 = f1$2._1;
-                        const e1 = f1$2._3;
-                        if (/* tag */typeof f2$2 === "number" || typeof f2$2 === "string") {
-                          if (m1) {
-                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
-                          }
-                          if (!fixed1) {
-                            return set_row_field(f1$2._3, f2$2);
-                          }
-                          throw new Caml_js_exceptions.MelangeError(Unify, {
-                                    MEL_EXN_ID: Unify,
-                                    _1: /* [] */0
-                                  });
+                        tmp = false;
+                      }
+                      redo = tmp;
+                    }
+                    if (redo) {
+                      _f2 = f2$2;
+                      _f1 = f1$2;
+                      continue ;
+                    }
+                    const tl1$1 = Stdlib__List.map(repr, tl1);
+                    const tl2$1 = Stdlib__List.map(repr, tl2);
+                    const remq = function (tl, _param) {
+                      while(true) {
+                        const param = _param;
+                        if (!param) {
+                          return /* [] */0;
                         }
-                        if (f2$2.TAG === /* Rpresent */0) {
-                          if (c1) {
-                            if (f1$2._1) {
-                              throw new Caml_js_exceptions.MelangeError(Unify, {
-                                        MEL_EXN_ID: Unify,
-                                        _1: /* [] */0
-                                      });
-                            }
-                            if (f2$2._0 !== undefined) {
-                              throw new Caml_js_exceptions.MelangeError(Unify, {
-                                        MEL_EXN_ID: Unify,
-                                        _1: /* [] */0
-                                      });
-                            }
-                            if (!fixed1) {
-                              return set_row_field(f1$2._3, f2$2);
-                            }
-                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
-                          }
-                          const t2$1 = f2$2._0;
-                          if (t2$1 !== undefined) {
-                            if (fixed1) {
-                              throw new Caml_js_exceptions.MelangeError(Unify, {
-                                        MEL_EXN_ID: Unify,
-                                        _1: /* [] */0
-                                      });
-                            }
-                            const e1$1 = f1$2._3;
-                            set_row_field(e1$1, f2$2);
-                            update_level(env.contents, repr(more).level, t2$1);
-                            try {
-                              return Stdlib__List.iter((function (t1) {
-                                            unify(env, t1, t2$1);
-                                          }), f1$2._1);
-                            }
-                            catch (exn$1){
-                              e1$1.contents = undefined;
-                              throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
-                            }
-                          } else {
-                            throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
-                          }
-                        } else {
-                          const e2$1 = f2$2._3;
-                          if (e1 === e2$1) {
-                            return ;
-                          }
-                          const m2 = f2$2._2;
-                          const tl2 = f2$2._1;
-                          const c2 = f2$2._0;
-                          let redo = false;
-                          if (m1 || m2 || fixed1 || fixed2 || rigid_variants.contents && (Stdlib__List.length(tl1) === 1 || Stdlib__List.length(tl2) === 1)) {
-                            const match = Stdlib.$at(tl1, tl2);
-                            let tmp;
-                            if (match) {
-                              const t1$1 = match.hd;
-                              if (c1 || c2) {
-                                throw new Caml_js_exceptions.MelangeError(Unify, {
-                                          MEL_EXN_ID: Unify,
-                                          _1: /* [] */0
-                                        });
-                              }
-                              Stdlib__List.iter((function (param) {
-                                      return unify(env, t1$1, param);
-                                    }), match.tl);
-                              tmp = e1.contents !== undefined || e2$1.contents !== undefined;
-                            } else {
-                              tmp = false;
-                            }
-                            redo = tmp;
-                          }
-                          if (redo) {
-                            _f2 = f2$2;
-                            _f1 = f1$2;
-                            continue ;
-                          }
-                          const tl1$1 = Stdlib__List.map(repr, tl1);
-                          const tl2$1 = Stdlib__List.map(repr, tl2);
-                          const remq = function (tl, _param) {
-                            while(true) {
-                              const param = _param;
-                              if (!param) {
-                                return /* [] */0;
-                              }
-                              const tl$p = param.tl;
-                              const ty = param.hd;
-                              if (!Stdlib__List.memq(ty, tl)) {
-                                return {
-                                        hd: ty,
-                                        tl: remq(tl, tl$p)
-                                      };
-                              }
-                              _param = tl$p;
-                              continue ;
-                            };
-                          };
-                          const tl2$p = remq(tl2$1, tl1$1);
-                          const tl1$p = remq(tl1$1, tl2$1);
-                          const partial_arg = repr(more).level;
-                          const partial_arg$1 = env.contents;
-                          Stdlib__List.iter((function (param) {
-                                  return update_level(partial_arg$1, partial_arg, param);
-                                }), Stdlib.$at(tl1$p, tl2$p));
-                          const e = {
-                            contents: undefined
-                          };
-                          const f1$p_0 = c1 || c2;
-                          const f1$p_2 = m1 || m2;
-                          const f1$p = {
-                            TAG: /* Reither */1,
-                            _0: f1$p_0,
-                            _1: tl1$p,
-                            _2: f1$p_2,
-                            _3: e
-                          };
-                          const f2$p_0 = c1 || c2;
-                          const f2$p_2 = m1 || m2;
-                          const f2$p = {
-                            TAG: /* Reither */1,
-                            _0: f2$p_0,
-                            _1: tl2$p,
-                            _2: f2$p_2,
-                            _3: e
+                        const tl$p = param.tl;
+                        const ty = param.hd;
+                        if (!Stdlib__List.memq(ty, tl)) {
+                          return {
+                            hd: ty,
+                            tl: remq(tl, tl$p)
                           };
-                          set_row_field(e1, f1$p);
-                          return set_row_field(e2$1, f2$p);
                         }
-                      }
+                        _param = tl$p;
+                        continue ;
+                      };
                     };
+                    const tl2$p = remq(tl2$1, tl1$1);
+                    const tl1$p = remq(tl1$1, tl2$1);
+                    const partial_arg = repr(more).level;
+                    const partial_arg$1 = env.contents;
+                    Stdlib__List.iter((function (param) {
+                            return update_level(partial_arg$1, partial_arg, param);
+                          }), Stdlib.$at(tl1$p, tl2$p));
+                    const e = {
+                      contents: undefined
+                    };
+                    const f1$p_0 = c1 || c2;
+                    const f1$p_2 = m1 || m2;
+                    const f1$p = {
+                      TAG: /* Reither */1,
+                      _0: f1$p_0,
+                      _1: tl1$p,
+                      _2: f1$p_2,
+                      _3: e
+                    };
+                    const f2$p_0 = c1 || c2;
+                    const f2$p_2 = m1 || m2;
+                    const f2$p = {
+                      TAG: /* Reither */1,
+                      _0: f2$p_0,
+                      _1: tl2$p,
+                      _2: f2$p_2,
+                      _3: e
+                    };
+                    set_row_field(e1, f1$p);
+                    return set_row_field(e2$1, f2$p);
                   }
-                  catch (raw_trace){
-                    const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
-                    if (trace.MEL_EXN_ID === Unify) {
-                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: {
-                                  hd: [
-                                    mkvariant({
-                                          hd: [
-                                            l,
-                                            f1
-                                          ],
-                                          tl: /* [] */0
-                                        }, true),
-                                    mkvariant({
-                                          hd: [
-                                            l,
-                                            f2
-                                          ],
-                                          tl: /* [] */0
-                                        }, true)
-                                  ],
-                                  tl: trace._1
-                                }
-                              });
-                    }
-                    throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
-                  }
-                }), pairs);
+                }
+              };
+            }
+            catch (raw_trace){
+              const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
+              if (trace.MEL_EXN_ID === Unify) {
+                throw new Caml_js_exceptions.MelangeError(Unify, {
+                      MEL_EXN_ID: Unify,
+                      _1: {
+                        hd: [
+                          mkvariant({
+                                hd: [
+                                  l,
+                                  f1
+                                ],
+                                tl: /* [] */0
+                              }, true),
+                          mkvariant({
+                                hd: [
+                                  l,
+                                  f2
+                                ],
+                                tl: /* [] */0
+                              }, true)
+                        ],
+                        tl: trace._1
+                      }
+                    });
+              }
+              throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
+            }
+          }), pairs);
   }
   catch (exn){
     log_type(rm1);
@@ -33737,13 +33737,13 @@ function unify_kind(k1, k2) {
     
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              32636,
-              37
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          32636,
+          37
+        ]
+      });
 }
 
 function make_rowvar(level, use1, rest1, use2, rest2) {
@@ -33812,9 +33812,9 @@ function make_rowvar(level, use1, rest1, use2, rest2) {
     return rest2;
   } else {
     return newty2(level, {
-                TAG: /* Tvar */0,
-                _0: name
-              });
+          TAG: /* Tvar */0,
+          _0: name
+        });
   }
 }
 
@@ -33908,9 +33908,9 @@ function unify3(env, t1, t1$p, t2, t2$p) {
                 break;
             default:
               throw new Caml_js_exceptions.MelangeError(Unify, {
-                        MEL_EXN_ID: Unify,
-                        _1: /* [] */0
-                      });
+                    MEL_EXN_ID: Unify,
+                    _1: /* [] */0
+                  });
           }
         }
         
@@ -33920,9 +33920,9 @@ function unify3(env, t1, t1$p, t2, t2$p) {
               const l1 = d1._0;
               if (/* tag */typeof d2 === "number" || typeof d2 === "string") {
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
               }
               switch (d2.TAG) {
                 case /* Tarrow */1 :
@@ -33948,9 +33948,9 @@ function unify3(env, t1, t1$p, t2, t2$p) {
                       
                     } else {
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                     }
                     break;
                 case /* Tconstr */3 :
@@ -33958,17 +33958,17 @@ function unify3(env, t1, t1$p, t2, t2$p) {
                     break;
                 default:
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
               }
               break;
           case /* Ttuple */2 :
               if (/* tag */typeof d2 === "number" || typeof d2 === "string") {
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
               }
               switch (d2.TAG) {
                 case /* Ttuple */2 :
@@ -33979,9 +33979,9 @@ function unify3(env, t1, t1$p, t2, t2$p) {
                     break;
                 default:
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
               }
               break;
           case /* Tconstr */3 :
@@ -34040,20 +34040,20 @@ function unify3(env, t1, t1$p, t2, t2$p) {
                                 return unify(env, t1, t2);
                               } else {
                                 return set_mode_pattern(false, false, (function (param) {
-                                              const snap = snapshot(undefined);
-                                              try {
-                                                return unify(env, t1, t2);
-                                              }
-                                              catch (raw_exn){
-                                                const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-                                                if (exn.MEL_EXN_ID === Unify) {
-                                                  backtrack(snap);
-                                                  reify(env, t1);
-                                                  return reify(env, t2);
-                                                }
-                                                throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
-                                              }
-                                            }));
+                                        const snap = snapshot(undefined);
+                                        try {
+                                          return unify(env, t1, t2);
+                                        }
+                                        catch (raw_exn){
+                                          const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
+                                          if (exn.MEL_EXN_ID === Unify) {
+                                            backtrack(snap);
+                                            reify(env, t1);
+                                            return reify(env, t2);
+                                          }
+                                          throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
+                                        }
+                                      }));
                               }
                             }), inj, Stdlib__List.combine(tl1, tl2));
                     }
@@ -34118,9 +34118,9 @@ function unify3(env, t1, t1$p, t2, t2$p) {
           case /* Tobject */4 :
               if (/* tag */typeof d2 === "number" || typeof d2 === "string") {
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
               }
               switch (d2.TAG) {
                 case /* Tconstr */3 :
@@ -34167,9 +34167,9 @@ function unify3(env, t1, t1$p, t2, t2$p) {
                     break;
                 default:
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
               }
               break;
           case /* Tfield */5 :
@@ -34182,18 +34182,18 @@ function unify3(env, t1, t1$p, t2, t2$p) {
                 exit$4 = 5;
               } else {
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
               }
               break;
           case /* Tvariant */8 :
               const row1 = d1._0;
               if (/* tag */typeof d2 === "number" || typeof d2 === "string") {
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
               }
               switch (d2.TAG) {
                 case /* Tconstr */3 :
@@ -34226,10 +34226,10 @@ function unify3(env, t1, t1$p, t2, t2$p) {
                     break;
                 default:
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
-              }
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
+              }
               break;
           case /* Tpoly */10 :
               const tl1$1 = d1._1;
@@ -34240,9 +34240,9 @@ function unify3(env, t1, t1$p, t2, t2$p) {
               } else {
                 if (/* tag */typeof d2 === "number" || typeof d2 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 switch (d2.TAG) {
                   case /* Tconstr */3 :
@@ -34257,17 +34257,17 @@ function unify3(env, t1, t1$p, t2, t2$p) {
                       break;
                   default:
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                 }
               }
               if (exit$9 === 6) {
                 if (/* tag */typeof d2 === "number" || typeof d2 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 switch (d2.TAG) {
                   case /* Tconstr */3 :
@@ -34280,9 +34280,9 @@ function unify3(env, t1, t1$p, t2, t2$p) {
                       break;
                   default:
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                 }
               }
               break;
@@ -34290,9 +34290,9 @@ function unify3(env, t1, t1$p, t2, t2$p) {
               const tl1$2 = d1._2;
               if (/* tag */typeof d2 === "number" || typeof d2 === "string") {
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
               }
               switch (d2.TAG) {
                 case /* Tconstr */3 :
@@ -34310,9 +34310,9 @@ function unify3(env, t1, t1$p, t2, t2$p) {
                       if (exn$2.MEL_EXN_ID === Stdlib.Not_found) {
                         if (umode.contents === /* Expression */0) {
                           throw new Caml_js_exceptions.MelangeError(Unify, {
-                                    MEL_EXN_ID: Unify,
-                                    _1: /* [] */0
-                                  });
+                                MEL_EXN_ID: Unify,
+                                _1: /* [] */0
+                              });
                         }
                         Stdlib__List.iter((function (param) {
                                 return reify(env, param);
@@ -34324,9 +34324,9 @@ function unify3(env, t1, t1$p, t2, t2$p) {
                     break;
                 default:
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
               }
               break;
           default:
@@ -34358,17 +34358,17 @@ function unify3(env, t1, t1$p, t2, t2$p) {
       if (exit$3 === 4) {
         if (/* tag */typeof d1 === "number" || typeof d1 === "string") {
           throw new Caml_js_exceptions.MelangeError(Unify, {
-                    MEL_EXN_ID: Unify,
-                    _1: /* [] */0
-                  });
+                MEL_EXN_ID: Unify,
+                _1: /* [] */0
+              });
         }
         if (d1.TAG === /* Tconstr */3) {
           exit$2 = 2;
         } else {
           throw new Caml_js_exceptions.MelangeError(Unify, {
-                    MEL_EXN_ID: Unify,
-                    _1: /* [] */0
-                  });
+                MEL_EXN_ID: Unify,
+                _1: /* [] */0
+              });
         }
       }
       switch (exit$2) {
@@ -34382,9 +34382,9 @@ function unify3(env, t1, t1$p, t2, t2$p) {
               
             } else {
               throw new Caml_js_exceptions.MelangeError(Unify, {
-                        MEL_EXN_ID: Unify,
-                        _1: /* [] */0
-                      });
+                    MEL_EXN_ID: Unify,
+                    _1: /* [] */0
+                  });
             }
             break;
         case 3 :
@@ -34392,14 +34392,14 @@ function unify3(env, t1, t1$p, t2, t2$p) {
             if (/* tag */typeof r === "number" || typeof r === "string") {
               if (r === /* Fpresent */0) {
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(Unify, {
-                        MEL_EXN_ID: Unify,
-                        _1: /* [] */0
-                      });
+                    MEL_EXN_ID: Unify,
+                    _1: /* [] */0
+                  });
             } else if (f !== dummy_method) {
               set_kind(r._0, /* Fabsent */1);
               if (Caml_obj.caml_equal(d2, /* Tnil */0)) {
@@ -34409,9 +34409,9 @@ function unify3(env, t1, t1$p, t2, t2$p) {
               }
             } else {
               throw new Caml_js_exceptions.MelangeError(Unify, {
-                        MEL_EXN_ID: Unify,
-                        _1: /* [] */0
-                      });
+                    MEL_EXN_ID: Unify,
+                    _1: /* [] */0
+                  });
             }
             break;
         
@@ -34439,9 +34439,9 @@ function unify3(env, t1, t1$p, t2, t2$p) {
       if (trace.MEL_EXN_ID === Unify) {
         t1$p.desc = d1;
         throw new Caml_js_exceptions.MelangeError(Unify, {
-                  MEL_EXN_ID: Unify,
-                  _1: trace._1
-                });
+              MEL_EXN_ID: Unify,
+              _1: trace._1
+            });
       }
       throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
     }
@@ -34457,21 +34457,21 @@ function unify$1(env, ty1, ty2) {
     const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
     if (trace.MEL_EXN_ID === Unify) {
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: expand_trace(env.contents, trace._1)
-              });
+            MEL_EXN_ID: Unify,
+            _1: expand_trace(env.contents, trace._1)
+          });
     }
     if (trace.MEL_EXN_ID === Recursive_abbrev) {
       throw new Caml_js_exceptions.MelangeError(Unification_recursive_abbrev, {
-                MEL_EXN_ID: Unification_recursive_abbrev,
-                _1: expand_trace(env.contents, {
-                      hd: [
-                        ty1,
-                        ty2
-                      ],
-                      tl: /* [] */0
-                    })
-              });
+            MEL_EXN_ID: Unification_recursive_abbrev,
+            _1: expand_trace(env.contents, {
+                  hd: [
+                    ty1,
+                    ty2
+                  ],
+                  tl: /* [] */0
+                })
+          });
     }
     throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
   }
@@ -34486,13 +34486,13 @@ function unify_var(env, t1, t2) {
   const match = t1$1.desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     return unify$1({
-                contents: env
-              }, t1$1, t2$1);
+          contents: env
+        }, t1$1, t2$1);
   }
   if (match.TAG !== /* Tvar */0) {
     return unify$1({
-                contents: env
-              }, t1$1, t2$1);
+          contents: env
+        }, t1$1, t2$1);
   }
   const reset_tracing = check_trace_gadt_instances(env);
   try {
@@ -34513,9 +34513,9 @@ function unify_var(env, t1, t2) {
             tl: trace._1
           });
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: expanded_trace
-              });
+            MEL_EXN_ID: Unify,
+            _1: expanded_trace
+          });
     }
     throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
   }
@@ -34546,9 +34546,9 @@ function filter_arrow(env, t, l) {
   const match = t$1.desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   }
   switch (match.TAG) {
     case /* Tvar */0 :
@@ -34570,26 +34570,26 @@ function filter_arrow(env, t, l) {
             });
         link_type(t$1, t$p);
         return [
-                t1,
-                t2
-              ];
+          t1,
+          t2
+        ];
     case /* Tarrow */1 :
         const l$p = match._0;
         if (l === l$p || classic.contents && l === "" && !is_optional(l$p)) {
           return [
-                  match._1,
-                  match._2
-                ];
+            match._1,
+            match._2
+          ];
         }
         throw new Caml_js_exceptions.MelangeError(Unify, {
-                  MEL_EXN_ID: Unify,
-                  _1: /* [] */0
-                });
+              MEL_EXN_ID: Unify,
+              _1: /* [] */0
+            });
     default:
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: /* [] */0
-              });
+            MEL_EXN_ID: Unify,
+            _1: /* [] */0
+          });
   }
 }
 
@@ -34600,9 +34600,9 @@ function filter_method_field(env, name, priv, _ty) {
     const match = ty$1.desc;
     if (/* tag */typeof match === "number" || typeof match === "string") {
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: /* [] */0
-              });
+            MEL_EXN_ID: Unify,
+            _1: /* [] */0
+          });
     }
     switch (match.TAG) {
       case /* Tvar */0 :
@@ -34617,11 +34617,11 @@ function filter_method_field(env, name, priv, _ty) {
               });
           let tmp;
           tmp = priv === /* Private */0 ? ({
-                TAG: /* Fvar */0,
-                _0: {
-                  contents: undefined
-                }
-              }) : /* Fpresent */0;
+              TAG: /* Fvar */0,
+              _0: {
+                contents: undefined
+              }
+            }) : /* Fpresent */0;
           const ty$p = newty2(level, {
                 TAG: /* Tfield */5,
                 _0: name,
@@ -34643,9 +34643,9 @@ function filter_method_field(env, name, priv, _ty) {
           continue ;
       default:
         throw new Caml_js_exceptions.MelangeError(Unify, {
-                  MEL_EXN_ID: Unify,
-                  _1: /* [] */0
-                });
+              MEL_EXN_ID: Unify,
+              _1: /* [] */0
+            });
     }
   };
 }
@@ -34655,9 +34655,9 @@ function filter_method(env, name, priv, ty) {
   const match = ty$1.desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   }
   switch (match.TAG) {
     case /* Tvar */0 :
@@ -34670,9 +34670,9 @@ function filter_method(env, name, priv, ty) {
         return filter_method_field(env, name, priv, match._0);
     default:
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: /* [] */0
-              });
+            MEL_EXN_ID: Unify,
+            _1: /* [] */0
+          });
   }
 }
 
@@ -34704,8 +34704,8 @@ function moregen_occur(env, level, ty) {
     }
     if (is_Tvar(ty$1) && ty$1.level >= 99999999) {
       throw new Caml_js_exceptions.MelangeError(Occur, {
-                MEL_EXN_ID: Occur
-              });
+            MEL_EXN_ID: Occur
+          });
     }
     ty$1.level = pivot_level - ty$1.level | 0;
     const row = ty$1.desc;
@@ -34731,9 +34731,9 @@ function moregen_occur(env, level, ty) {
     if (exn.MEL_EXN_ID === Occur) {
       unmark_type(ty);
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: /* [] */0
-              });
+            MEL_EXN_ID: Unify,
+            _1: /* [] */0
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -34798,9 +34798,9 @@ function moregen(inst_nongen, type_pairs, env, t1, t2) {
       }
       try {
         return Curry._2(TypePairs.find, type_pairs, [
-                    t1$p$1,
-                    t2$p$1
-                  ]);
+              t1$p$1,
+              t2$p$1
+            ]);
       }
       catch (raw_exn){
         const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -34816,9 +34816,9 @@ function moregen(inst_nongen, type_pairs, env, t1, t2) {
               return ;
             }
             throw new Caml_js_exceptions.MelangeError(Unify, {
-                      MEL_EXN_ID: Unify,
-                      _1: /* [] */0
-                    });
+                  MEL_EXN_ID: Unify,
+                  _1: /* [] */0
+                });
           }
           switch (match$2.TAG) {
             case /* Tvar */0 :
@@ -34827,15 +34827,15 @@ function moregen(inst_nongen, type_pairs, env, t1, t2) {
                   return link_type(t1$p$1, t2$1);
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tarrow */1 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tarrow */1) {
                   const l2 = match$3._0;
@@ -34845,88 +34845,88 @@ function moregen(inst_nongen, type_pairs, env, t1, t2) {
                     return moregen(inst_nongen, type_pairs, env, match$2._2, match$3._2);
                   }
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Ttuple */2 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Ttuple */2) {
                   return moregen_list(inst_nongen, type_pairs, env, match$2._0, match$3._0);
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tconstr */3 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tconstr */3) {
                   if (same(match$2._0, match$3._0)) {
                     return moregen_list(inst_nongen, type_pairs, env, match$2._1, match$3._1);
                   }
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tobject */4 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tobject */4) {
                   return moregen_fields(inst_nongen, type_pairs, env, match$2._0, match$3._0);
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tfield */5 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tfield */5) {
                   return moregen_fields(inst_nongen, type_pairs, env, t1$p$1, t2$p$1);
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tlink */6 :
             case /* Tsubst */7 :
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tvariant */8 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tvariant */8) {
                   let row1 = match$2._0;
@@ -34952,9 +34952,9 @@ function moregen(inst_nongen, type_pairs, env, t1, t2) {
                   const r2$1 = match$5[1];
                   if (Caml_obj.caml_notequal(match$5[0], /* [] */0) || row1$1.row_closed && (!row2$1.row_closed || Caml_obj.caml_notequal(r2$1, /* [] */0))) {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                   const match$6 = rm1.desc;
                   const match$7 = rm2.desc;
@@ -34965,17 +34965,17 @@ function moregen(inst_nongen, type_pairs, env, t1, t2) {
                   } else {
                     if (/* tag */typeof match$7 === "number" || typeof match$7 === "string") {
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                     }
                     if (match$7.TAG === /* Tunivar */9) {
                       unify_univar(rm1, rm2, univar_pairs.contents);
                     } else {
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                     }
                   }
                   if (exit$2 === 2) {
@@ -34984,9 +34984,9 @@ function moregen(inst_nongen, type_pairs, env, t1, t2) {
                     } else {
                       if (match$7.TAG === /* Tunivar */9) {
                         throw new Caml_js_exceptions.MelangeError(Unify, {
-                                  MEL_EXN_ID: Unify,
-                                  _1: /* [] */0
-                                });
+                              MEL_EXN_ID: Unify,
+                              _1: /* [] */0
+                            });
                       }
                       exit$1 = 1;
                     }
@@ -35009,210 +35009,210 @@ function moregen(inst_nongen, type_pairs, env, t1, t2) {
                     } else {
                       if (/* tag */typeof match$6 === "number" || typeof match$6 === "string") {
                         throw new Caml_js_exceptions.MelangeError(Unify, {
-                                  MEL_EXN_ID: Unify,
-                                  _1: /* [] */0
-                                });
+                              MEL_EXN_ID: Unify,
+                              _1: /* [] */0
+                            });
                       }
                       if (match$6.TAG === /* Tconstr */3) {
                         if (/* tag */typeof match$7 === "number" || typeof match$7 === "string") {
                           throw new Caml_js_exceptions.MelangeError(Unify, {
-                                    MEL_EXN_ID: Unify,
-                                    _1: /* [] */0
-                                  });
+                                MEL_EXN_ID: Unify,
+                                _1: /* [] */0
+                              });
                         }
                         if (match$7.TAG === /* Tconstr */3) {
                           moregen(inst_nongen, type_pairs, env, rm1, rm2);
                         } else {
                           throw new Caml_js_exceptions.MelangeError(Unify, {
-                                    MEL_EXN_ID: Unify,
-                                    _1: /* [] */0
-                                  });
+                                MEL_EXN_ID: Unify,
+                                _1: /* [] */0
+                              });
                         }
                       } else {
                         throw new Caml_js_exceptions.MelangeError(Unify, {
-                                  MEL_EXN_ID: Unify,
-                                  _1: /* [] */0
-                                });
+                              MEL_EXN_ID: Unify,
+                              _1: /* [] */0
+                            });
                       }
                     }
                   }
                   return Stdlib__List.iter((function (param) {
-                                const f1 = row_field_repr_aux(/* [] */0, param[1]);
-                                const f2 = row_field_repr_aux(/* [] */0, param[2]);
-                                if (f1 === f2) {
+                          const f1 = row_field_repr_aux(/* [] */0, param[1]);
+                          const f2 = row_field_repr_aux(/* [] */0, param[2]);
+                          if (f1 === f2) {
+                            return ;
+                          }
+                          if (/* tag */typeof f1 === "number" || typeof f1 === "string") {
+                            if (/* tag */typeof f2 === "number" || typeof f2 === "string") {
+                              return ;
+                            }
+                            if (f2.TAG === /* Rpresent */0) {
+                              throw new Caml_js_exceptions.MelangeError(Unify, {
+                                    MEL_EXN_ID: Unify,
+                                    _1: /* [] */0
+                                  });
+                            }
+                            throw new Caml_js_exceptions.MelangeError(Unify, {
+                                  MEL_EXN_ID: Unify,
+                                  _1: /* [] */0
+                                });
+                          } else if (f1.TAG === /* Rpresent */0) {
+                            const t1 = f1._0;
+                            if (t1 !== undefined) {
+                              if (/* tag */typeof f2 === "number" || typeof f2 === "string") {
+                                throw new Caml_js_exceptions.MelangeError(Unify, {
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
+                              }
+                              if (f2.TAG === /* Rpresent */0) {
+                                const t2 = f2._0;
+                                if (t2 !== undefined) {
+                                  return moregen(inst_nongen, type_pairs, env, t1, t2);
+                                }
+                                throw new Caml_js_exceptions.MelangeError(Unify, {
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
+                              }
+                              throw new Caml_js_exceptions.MelangeError(Unify, {
+                                    MEL_EXN_ID: Unify,
+                                    _1: /* [] */0
+                                  });
+                            } else {
+                              if (/* tag */typeof f2 === "number" || typeof f2 === "string") {
+                                throw new Caml_js_exceptions.MelangeError(Unify, {
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
+                              }
+                              if (f2.TAG === /* Rpresent */0) {
+                                if (f2._0 === undefined) {
                                   return ;
                                 }
-                                if (/* tag */typeof f1 === "number" || typeof f1 === "string") {
-                                  if (/* tag */typeof f2 === "number" || typeof f2 === "string") {
-                                    return ;
-                                  }
-                                  if (f2.TAG === /* Rpresent */0) {
-                                    throw new Caml_js_exceptions.MelangeError(Unify, {
-                                              MEL_EXN_ID: Unify,
-                                              _1: /* [] */0
-                                            });
-                                  }
+                                throw new Caml_js_exceptions.MelangeError(Unify, {
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
+                              }
+                              throw new Caml_js_exceptions.MelangeError(Unify, {
+                                    MEL_EXN_ID: Unify,
+                                    _1: /* [] */0
+                                  });
+                            }
+                          } else {
+                            const c1 = f1._0;
+                            if (c1) {
+                              if (!f1._1 && !/* tag */(typeof f2 === "number" || typeof f2 === "string") && f2.TAG === /* Rpresent */0) {
+                                if (f2._0 !== undefined) {
                                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                                            MEL_EXN_ID: Unify,
-                                            _1: /* [] */0
-                                          });
-                                } else if (f1.TAG === /* Rpresent */0) {
-                                  const t1 = f1._0;
-                                  if (t1 !== undefined) {
-                                    if (/* tag */typeof f2 === "number" || typeof f2 === "string") {
-                                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                MEL_EXN_ID: Unify,
-                                                _1: /* [] */0
-                                              });
-                                    }
-                                    if (f2.TAG === /* Rpresent */0) {
-                                      const t2 = f2._0;
-                                      if (t2 !== undefined) {
-                                        return moregen(inst_nongen, type_pairs, env, t1, t2);
-                                      }
-                                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                MEL_EXN_ID: Unify,
-                                                _1: /* [] */0
-                                              });
-                                    }
-                                    throw new Caml_js_exceptions.MelangeError(Unify, {
-                                              MEL_EXN_ID: Unify,
-                                              _1: /* [] */0
-                                            });
-                                  } else {
-                                    if (/* tag */typeof f2 === "number" || typeof f2 === "string") {
-                                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                MEL_EXN_ID: Unify,
-                                                _1: /* [] */0
-                                              });
-                                    }
-                                    if (f2.TAG === /* Rpresent */0) {
-                                      if (f2._0 === undefined) {
-                                        return ;
-                                      }
-                                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                MEL_EXN_ID: Unify,
-                                                _1: /* [] */0
-                                              });
-                                    }
-                                    throw new Caml_js_exceptions.MelangeError(Unify, {
-                                              MEL_EXN_ID: Unify,
-                                              _1: /* [] */0
-                                            });
-                                  }
-                                } else {
-                                  const c1 = f1._0;
-                                  if (c1) {
-                                    if (!f1._1 && !/* tag */(typeof f2 === "number" || typeof f2 === "string") && f2.TAG === /* Rpresent */0) {
-                                      if (f2._0 !== undefined) {
-                                        throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                  MEL_EXN_ID: Unify,
-                                                  _1: /* [] */0
-                                                });
-                                      }
-                                      if (may_inst) {
-                                        return set_row_field(f1._3, f2);
-                                      }
-                                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                MEL_EXN_ID: Unify,
-                                                _1: /* [] */0
-                                              });
-                                    }
-                                    
-                                  } else if (!/* tag */(typeof f2 === "number" || typeof f2 === "string") && f2.TAG === /* Rpresent */0) {
-                                    const t2$1 = f2._0;
-                                    if (t2$1 !== undefined) {
-                                      if (may_inst) {
-                                        set_row_field(f1._3, f2);
-                                        return Stdlib__List.iter((function (t1) {
-                                                      moregen(inst_nongen, type_pairs, env, t1, t2$1);
-                                                    }), f1._1);
-                                      }
-                                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                MEL_EXN_ID: Unify,
-                                                _1: /* [] */0
-                                              });
-                                    }
-                                    throw new Caml_js_exceptions.MelangeError(Unify, {
-                                              MEL_EXN_ID: Unify,
-                                              _1: /* [] */0
-                                            });
-                                  }
-                                  const e1 = f1._3;
-                                  const tl1 = f1._1;
-                                  if (/* tag */typeof f2 === "number" || typeof f2 === "string") {
-                                    if (may_inst) {
-                                      return set_row_field(e1, f2);
-                                    }
-                                    throw new Caml_js_exceptions.MelangeError(Unify, {
-                                              MEL_EXN_ID: Unify,
-                                              _1: /* [] */0
-                                            });
-                                  }
-                                  if (f2.TAG === /* Rpresent */0) {
-                                    throw new Caml_js_exceptions.MelangeError(Unify, {
-                                              MEL_EXN_ID: Unify,
-                                              _1: /* [] */0
-                                            });
-                                  }
-                                  const e2 = f2._3;
-                                  if (e1 === e2) {
-                                    return ;
-                                  }
-                                  const tl2 = f2._1;
-                                  const c2 = f2._0;
-                                  if (c1 && !c2) {
-                                    throw new Caml_js_exceptions.MelangeError(Unify, {
-                                              MEL_EXN_ID: Unify,
-                                              _1: /* [] */0
-                                            });
-                                  }
-                                  set_row_field(e1, {
-                                        TAG: /* Reither */1,
-                                        _0: c2,
-                                        _1: /* [] */0,
-                                        _2: f2._2,
-                                        _3: e2
+                                        MEL_EXN_ID: Unify,
+                                        _1: /* [] */0
                                       });
-                                  if (Stdlib__List.length(tl1) === Stdlib__List.length(tl2)) {
-                                    return Stdlib__List.iter2((function (param, param$1) {
-                                                  return moregen(inst_nongen, type_pairs, env, param, param$1);
-                                                }), tl1, tl2);
-                                  }
-                                  if (tl2) {
-                                    const t2$2 = tl2.hd;
-                                    return Stdlib__List.iter((function (t1) {
-                                                  moregen(inst_nongen, type_pairs, env, t1, t2$2);
-                                                }), tl1);
-                                  }
-                                  if (!Caml_obj.caml_notequal(tl1, /* [] */0)) {
-                                    return ;
-                                  }
-                                  throw new Caml_js_exceptions.MelangeError(Unify, {
-                                            MEL_EXN_ID: Unify,
-                                            _1: /* [] */0
-                                          });
                                 }
-                              }), match$4[2]);
+                                if (may_inst) {
+                                  return set_row_field(f1._3, f2);
+                                }
+                                throw new Caml_js_exceptions.MelangeError(Unify, {
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
+                              }
+                              
+                            } else if (!/* tag */(typeof f2 === "number" || typeof f2 === "string") && f2.TAG === /* Rpresent */0) {
+                              const t2$1 = f2._0;
+                              if (t2$1 !== undefined) {
+                                if (may_inst) {
+                                  set_row_field(f1._3, f2);
+                                  return Stdlib__List.iter((function (t1) {
+                                          moregen(inst_nongen, type_pairs, env, t1, t2$1);
+                                        }), f1._1);
+                                }
+                                throw new Caml_js_exceptions.MelangeError(Unify, {
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
+                              }
+                              throw new Caml_js_exceptions.MelangeError(Unify, {
+                                    MEL_EXN_ID: Unify,
+                                    _1: /* [] */0
+                                  });
+                            }
+                            const e1 = f1._3;
+                            const tl1 = f1._1;
+                            if (/* tag */typeof f2 === "number" || typeof f2 === "string") {
+                              if (may_inst) {
+                                return set_row_field(e1, f2);
+                              }
+                              throw new Caml_js_exceptions.MelangeError(Unify, {
+                                    MEL_EXN_ID: Unify,
+                                    _1: /* [] */0
+                                  });
+                            }
+                            if (f2.TAG === /* Rpresent */0) {
+                              throw new Caml_js_exceptions.MelangeError(Unify, {
+                                    MEL_EXN_ID: Unify,
+                                    _1: /* [] */0
+                                  });
+                            }
+                            const e2 = f2._3;
+                            if (e1 === e2) {
+                              return ;
+                            }
+                            const tl2 = f2._1;
+                            const c2 = f2._0;
+                            if (c1 && !c2) {
+                              throw new Caml_js_exceptions.MelangeError(Unify, {
+                                    MEL_EXN_ID: Unify,
+                                    _1: /* [] */0
+                                  });
+                            }
+                            set_row_field(e1, {
+                                  TAG: /* Reither */1,
+                                  _0: c2,
+                                  _1: /* [] */0,
+                                  _2: f2._2,
+                                  _3: e2
+                                });
+                            if (Stdlib__List.length(tl1) === Stdlib__List.length(tl2)) {
+                              return Stdlib__List.iter2((function (param, param$1) {
+                                      return moregen(inst_nongen, type_pairs, env, param, param$1);
+                                    }), tl1, tl2);
+                            }
+                            if (tl2) {
+                              const t2$2 = tl2.hd;
+                              return Stdlib__List.iter((function (t1) {
+                                      moregen(inst_nongen, type_pairs, env, t1, t2$2);
+                                    }), tl1);
+                            }
+                            if (!Caml_obj.caml_notequal(tl1, /* [] */0)) {
+                              return ;
+                            }
+                            throw new Caml_js_exceptions.MelangeError(Unify, {
+                                  MEL_EXN_ID: Unify,
+                                  _1: /* [] */0
+                                });
+                          }
+                        }), match$4[2]);
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tunivar */9 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tunivar */9) {
                   return unify_univar(t1$p$1, t2$p$1, univar_pairs.contents);
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tpoly */10 :
                 const tl1 = match$2._1;
                 const t1$2 = match$2._0;
@@ -35222,9 +35222,9 @@ function moregen(inst_nongen, type_pairs, env, t1, t2) {
                 } else {
                   if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                   if (match$3.TAG === /* Tpoly */10) {
                     if (!match$3._1) {
@@ -35233,57 +35233,57 @@ function moregen(inst_nongen, type_pairs, env, t1, t2) {
                     exit$3 = 2;
                   } else {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                 }
                 if (exit$3 === 2) {
                   if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                   if (match$3.TAG === /* Tpoly */10) {
                     return enter_poly(env, univar_pairs, t1$2, tl1, match$3._0, match$3._1, (function (param, param$1) {
-                                  return moregen(inst_nongen, type_pairs, env, param, param$1);
-                                }));
+                            return moregen(inst_nongen, type_pairs, env, param, param$1);
+                          }));
                   }
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 break;
             case /* Tpackage */11 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tpackage */11) {
                   try {
                     return unify_package(env, (function (param, param$1) {
-                                  return moregen_list(inst_nongen, type_pairs, env, param, param$1);
-                                }), t1$p$1.level, match$2._0, match$2._1, match$2._2, t2$p$1.level, match$3._0, match$3._1, match$3._2);
+                            return moregen_list(inst_nongen, type_pairs, env, param, param$1);
+                          }), t1$p$1.level, match$2._0, match$2._1, match$2._2, t2$p$1.level, match$3._0, match$3._1, match$3._2);
                   }
                   catch (raw_exn$1){
                     const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
                     if (exn$1.MEL_EXN_ID === Stdlib.Not_found) {
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                     }
                     throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
                   }
                 } else {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
             
           }
@@ -35298,15 +35298,15 @@ function moregen(inst_nongen, type_pairs, env, t1, t2) {
     const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
     if (trace.MEL_EXN_ID === Unify) {
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: {
-                  hd: [
-                    t1$1,
-                    t2$1
-                  ],
-                  tl: trace._1
-                }
-              });
+            MEL_EXN_ID: Unify,
+            _1: {
+              hd: [
+                t1$1,
+                t2$1
+              ],
+              tl: trace._1
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
   }
@@ -35315,9 +35315,9 @@ function moregen(inst_nongen, type_pairs, env, t1, t2) {
 function moregen_list(inst_nongen, type_pairs, env, tl1, tl2) {
   if (Stdlib__List.length(tl1) !== Stdlib__List.length(tl2)) {
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   }
   Stdlib__List.iter2((function (param, param$1) {
           return moregen(inst_nongen, type_pairs, env, param, param$1);
@@ -35331,9 +35331,9 @@ function moregen_fields(inst_nongen, type_pairs, env, ty1, ty2) {
   const match$2 = associate_fields(match[0], match$1[0]);
   if (Caml_obj.caml_notequal(match$2[1], /* [] */0)) {
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   }
   moregen(inst_nongen, type_pairs, env, match[1], build_fields(repr(ty2).level)(match$2[2], rest2));
   Stdlib__List.iter((function (param) {
@@ -35350,27 +35350,27 @@ function moregen_fields(inst_nongen, type_pairs, env, ty1, ty2) {
             const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
             if (trace.MEL_EXN_ID === Unify) {
               throw new Caml_js_exceptions.MelangeError(Unify, {
-                        MEL_EXN_ID: Unify,
-                        _1: {
-                          hd: [
-                            newty2(current_level.contents, {
-                                  TAG: /* Tfield */5,
-                                  _0: n,
-                                  _1: k1,
-                                  _2: t1,
-                                  _3: rest2
-                                }),
-                            newty2(current_level.contents, {
-                                  TAG: /* Tfield */5,
-                                  _0: n,
-                                  _1: k2,
-                                  _2: t2,
-                                  _3: rest2
-                                })
-                          ],
-                          tl: trace._1
-                        }
-                      });
+                    MEL_EXN_ID: Unify,
+                    _1: {
+                      hd: [
+                        newty2(current_level.contents, {
+                              TAG: /* Tfield */5,
+                              _0: n,
+                              _1: k1,
+                              _2: t1,
+                              _3: rest2
+                            }),
+                        newty2(current_level.contents, {
+                              TAG: /* Tfield */5,
+                              _0: n,
+                              _1: k2,
+                              _2: t2,
+                              _3: rest2
+                            })
+                      ],
+                      tl: trace._1
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
           }
@@ -35390,20 +35390,20 @@ function moregen_kind(k1, k2) {
           return ;
         }
         throw new Caml_js_exceptions.MelangeError(Unify, {
-                  MEL_EXN_ID: Unify,
-                  _1: /* [] */0
-                });
+              MEL_EXN_ID: Unify,
+              _1: /* [] */0
+            });
       } else {
         throw new Caml_js_exceptions.MelangeError(Unify, {
-                  MEL_EXN_ID: Unify,
-                  _1: /* [] */0
-                });
+              MEL_EXN_ID: Unify,
+              _1: /* [] */0
+            });
       }
     } else {
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: /* [] */0
-              });
+            MEL_EXN_ID: Unify,
+            _1: /* [] */0
+          });
     }
   } else {
     const r = k1$1._0;
@@ -35414,9 +35414,9 @@ function moregen_kind(k1, k2) {
       return set_kind(r, k2$1);
     }
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   }
 }
 
@@ -35460,8 +35460,8 @@ function rigidify_rec(vars, _ty) {
     const row = ty$1.desc;
     if (/* tag */typeof row === "number" || typeof row === "string") {
       return iter_type_expr((function (param) {
-                    return rigidify_rec(vars, param);
-                  }), ty$1);
+              return rigidify_rec(vars, param);
+            }), ty$1);
     }
     switch (row.TAG) {
       case /* Tvar */0 :
@@ -35505,8 +35505,8 @@ function rigidify_rec(vars, _ty) {
           continue ;
       default:
         return iter_type_expr((function (param) {
-                      return rigidify_rec(vars, param);
-                    }), ty$1);
+                return rigidify_rec(vars, param);
+              }), ty$1);
     }
   };
 }
@@ -35525,17 +35525,17 @@ function all_distinct_vars(env, vars) {
     contents: /* [] */0
   };
   return Stdlib__List.for_all((function (ty) {
-                const ty$1 = expand_head(env, ty);
-                if (Stdlib__List.memq(ty$1, tyl.contents)) {
-                  return false;
-                } else {
-                  tyl.contents = {
-                    hd: ty$1,
-                    tl: tyl.contents
-                  };
-                  return is_Tvar(ty$1);
-                }
-              }), vars);
+          const ty$1 = expand_head(env, ty);
+          if (Stdlib__List.memq(ty$1, tyl.contents)) {
+            return false;
+          } else {
+            tyl.contents = {
+              hd: ty$1,
+              tl: tyl.contents
+            };
+            return is_Tvar(ty$1);
+          }
+        }), vars);
 }
 
 function matches(env, ty, ty$p) {
@@ -35578,9 +35578,9 @@ function normalize_subst(subst) {
           }), subst.contents)) {
     subst.contents = Stdlib__List.map((function (param) {
             return [
-                    repr(param[0]),
-                    repr(param[1])
-                  ];
+              repr(param[0]),
+              repr(param[1])
+            ];
           }), subst.contents);
     return ;
   }
@@ -35614,9 +35614,9 @@ function eqtype(rename, type_pairs, subst, env, t1, t2) {
                   return ;
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
               }
               catch (raw_exn){
                 const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -35625,9 +35625,9 @@ function eqtype(rename, type_pairs, subst, env, t1, t2) {
                             return param[1] === t2$1;
                           }), subst.contents)) {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                   subst.contents = {
                     hd: [
@@ -35666,9 +35666,9 @@ function eqtype(rename, type_pairs, subst, env, t1, t2) {
       }
       try {
         return Curry._2(TypePairs.find, type_pairs, [
-                    t1$p$1,
-                    t2$p$1
-                  ]);
+              t1$p$1,
+              t2$p$1
+            ]);
       }
       catch (raw_exn$1){
         const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
@@ -35684,17 +35684,17 @@ function eqtype(rename, type_pairs, subst, env, t1, t2) {
               return ;
             }
             throw new Caml_js_exceptions.MelangeError(Unify, {
-                      MEL_EXN_ID: Unify,
-                      _1: /* [] */0
-                    });
+                  MEL_EXN_ID: Unify,
+                  _1: /* [] */0
+                });
           }
           switch (match$2.TAG) {
             case /* Tvar */0 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tvar */0) {
                   if (rename) {
@@ -35704,9 +35704,9 @@ function eqtype(rename, type_pairs, subst, env, t1, t2) {
                         return ;
                       }
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                     }
                     catch (raw_exn$2){
                       const exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn$2);
@@ -35715,9 +35715,9 @@ function eqtype(rename, type_pairs, subst, env, t1, t2) {
                                   return param[1] === t2$p$1;
                                 }), subst.contents)) {
                           throw new Caml_js_exceptions.MelangeError(Unify, {
-                                    MEL_EXN_ID: Unify,
-                                    _1: /* [] */0
-                                  });
+                                MEL_EXN_ID: Unify,
+                                _1: /* [] */0
+                              });
                         }
                         subst.contents = {
                           hd: [
@@ -35732,22 +35732,22 @@ function eqtype(rename, type_pairs, subst, env, t1, t2) {
                     }
                   } else {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                 } else {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
             case /* Tarrow */1 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tarrow */1) {
                   const l2 = match$3._0;
@@ -35757,88 +35757,88 @@ function eqtype(rename, type_pairs, subst, env, t1, t2) {
                     return eqtype(rename, type_pairs, subst, env, match$2._2, match$3._2);
                   }
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Ttuple */2 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Ttuple */2) {
                   return eqtype_list(rename, type_pairs, subst, env, match$2._0, match$3._0);
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tconstr */3 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tconstr */3) {
                   if (same(match$2._0, match$3._0)) {
                     return eqtype_list(rename, type_pairs, subst, env, match$2._1, match$3._1);
                   }
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tobject */4 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tobject */4) {
                   return eqtype_fields(rename, type_pairs, subst, env, match$2._0, match$3._0);
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tfield */5 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tfield */5) {
                   return eqtype_fields(rename, type_pairs, subst, env, t1$p$1, t2$p$1);
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tlink */6 :
             case /* Tsubst */7 :
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tvariant */8 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tvariant */8) {
                   let row1 = match$2._0;
@@ -35858,179 +35858,179 @@ function eqtype(rename, type_pairs, subst, env, t1, t2) {
                     const r1 = match$5[0];
                     if (row1$1.row_closed !== row2$2.row_closed || !row1$1.row_closed && (Caml_obj.caml_notequal(r1, /* [] */0) || Caml_obj.caml_notequal(r2, /* [] */0)) || Caml_obj.caml_notequal(filter_row_fields(false, Stdlib.$at(r1, r2)), /* [] */0)) {
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                     }
                     if (!static_row(row1$1)) {
                       eqtype(rename, type_pairs, subst, env, row1$1.row_more, row2$2.row_more);
                     }
                     return Stdlib__List.iter((function (param) {
-                                  const match = row_field_repr_aux(/* [] */0, param[1]);
-                                  const match$1 = row_field_repr_aux(/* [] */0, param[2]);
-                                  if (/* tag */typeof match === "number" || typeof match === "string") {
-                                    if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                      return ;
-                                    }
-                                    if (match$1.TAG === /* Rpresent */0) {
-                                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                MEL_EXN_ID: Unify,
-                                                _1: /* [] */0
-                                              });
-                                    }
-                                    throw new Caml_js_exceptions.MelangeError(Unify, {
-                                              MEL_EXN_ID: Unify,
-                                              _1: /* [] */0
-                                            });
-                                  } else if (match.TAG === /* Rpresent */0) {
-                                    const t1 = match._0;
-                                    if (t1 !== undefined) {
-                                      if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                        throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                  MEL_EXN_ID: Unify,
-                                                  _1: /* [] */0
-                                                });
-                                      }
-                                      if (match$1.TAG === /* Rpresent */0) {
-                                        const t2 = match$1._0;
-                                        if (t2 !== undefined) {
-                                          return eqtype(rename, type_pairs, subst, env, t1, t2);
-                                        }
-                                        throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                  MEL_EXN_ID: Unify,
-                                                  _1: /* [] */0
-                                                });
-                                      }
-                                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                MEL_EXN_ID: Unify,
-                                                _1: /* [] */0
-                                              });
-                                    } else {
-                                      if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                        throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                  MEL_EXN_ID: Unify,
-                                                  _1: /* [] */0
-                                                });
-                                      }
-                                      if (match$1.TAG === /* Rpresent */0) {
-                                        if (match$1._0 === undefined) {
-                                          return ;
-                                        }
-                                        throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                  MEL_EXN_ID: Unify,
-                                                  _1: /* [] */0
-                                                });
-                                      }
-                                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                MEL_EXN_ID: Unify,
-                                                _1: /* [] */0
-                                              });
-                                    }
-                                  } else if (match._0) {
-                                    if (match._1) {
-                                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                MEL_EXN_ID: Unify,
-                                                _1: /* [] */0
-                                              });
-                                    }
-                                    if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                MEL_EXN_ID: Unify,
-                                                _1: /* [] */0
-                                              });
-                                    }
-                                    if (match$1.TAG === /* Rpresent */0) {
-                                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                MEL_EXN_ID: Unify,
-                                                _1: /* [] */0
-                                              });
-                                    }
-                                    if (match$1._0) {
-                                      if (match$1._1) {
-                                        throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                  MEL_EXN_ID: Unify,
-                                                  _1: /* [] */0
-                                                });
-                                      }
-                                      return ;
-                                    }
-                                    throw new Caml_js_exceptions.MelangeError(Unify, {
-                                              MEL_EXN_ID: Unify,
-                                              _1: /* [] */0
-                                            });
+                            const match = row_field_repr_aux(/* [] */0, param[1]);
+                            const match$1 = row_field_repr_aux(/* [] */0, param[2]);
+                            if (/* tag */typeof match === "number" || typeof match === "string") {
+                              if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                return ;
+                              }
+                              if (match$1.TAG === /* Rpresent */0) {
+                                throw new Caml_js_exceptions.MelangeError(Unify, {
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
+                              }
+                              throw new Caml_js_exceptions.MelangeError(Unify, {
+                                    MEL_EXN_ID: Unify,
+                                    _1: /* [] */0
+                                  });
+                            } else if (match.TAG === /* Rpresent */0) {
+                              const t1 = match._0;
+                              if (t1 !== undefined) {
+                                if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                  throw new Caml_js_exceptions.MelangeError(Unify, {
+                                        MEL_EXN_ID: Unify,
+                                        _1: /* [] */0
+                                      });
+                                }
+                                if (match$1.TAG === /* Rpresent */0) {
+                                  const t2 = match$1._0;
+                                  if (t2 !== undefined) {
+                                    return eqtype(rename, type_pairs, subst, env, t1, t2);
+                                  }
+                                  throw new Caml_js_exceptions.MelangeError(Unify, {
+                                        MEL_EXN_ID: Unify,
+                                        _1: /* [] */0
+                                      });
+                                }
+                                throw new Caml_js_exceptions.MelangeError(Unify, {
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
+                              } else {
+                                if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                  throw new Caml_js_exceptions.MelangeError(Unify, {
+                                        MEL_EXN_ID: Unify,
+                                        _1: /* [] */0
+                                      });
+                                }
+                                if (match$1.TAG === /* Rpresent */0) {
+                                  if (match$1._0 === undefined) {
+                                    return ;
+                                  }
+                                  throw new Caml_js_exceptions.MelangeError(Unify, {
+                                        MEL_EXN_ID: Unify,
+                                        _1: /* [] */0
+                                      });
+                                }
+                                throw new Caml_js_exceptions.MelangeError(Unify, {
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
+                              }
+                            } else if (match._0) {
+                              if (match._1) {
+                                throw new Caml_js_exceptions.MelangeError(Unify, {
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
+                              }
+                              if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                throw new Caml_js_exceptions.MelangeError(Unify, {
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
+                              }
+                              if (match$1.TAG === /* Rpresent */0) {
+                                throw new Caml_js_exceptions.MelangeError(Unify, {
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
+                              }
+                              if (match$1._0) {
+                                if (match$1._1) {
+                                  throw new Caml_js_exceptions.MelangeError(Unify, {
+                                        MEL_EXN_ID: Unify,
+                                        _1: /* [] */0
+                                      });
+                                }
+                                return ;
+                              }
+                              throw new Caml_js_exceptions.MelangeError(Unify, {
+                                    MEL_EXN_ID: Unify,
+                                    _1: /* [] */0
+                                  });
+                            } else {
+                              const match$2 = match._1;
+                              if (match$2) {
+                                const tl1 = match$2.tl;
+                                const t1$1 = match$2.hd;
+                                if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                  throw new Caml_js_exceptions.MelangeError(Unify, {
+                                        MEL_EXN_ID: Unify,
+                                        _1: /* [] */0
+                                      });
+                                }
+                                if (match$1.TAG === /* Rpresent */0) {
+                                  throw new Caml_js_exceptions.MelangeError(Unify, {
+                                        MEL_EXN_ID: Unify,
+                                        _1: /* [] */0
+                                      });
+                                }
+                                if (match$1._0) {
+                                  throw new Caml_js_exceptions.MelangeError(Unify, {
+                                        MEL_EXN_ID: Unify,
+                                        _1: /* [] */0
+                                      });
+                                }
+                                const match$3 = match$1._1;
+                                if (match$3) {
+                                  const tl2 = match$3.tl;
+                                  const t2$1 = match$3.hd;
+                                  eqtype(rename, type_pairs, subst, env, t1$1, t2$1);
+                                  if (Stdlib__List.length(tl1) === Stdlib__List.length(tl2)) {
+                                    return Stdlib__List.iter2((function (param, param$1) {
+                                            return eqtype(rename, type_pairs, subst, env, param, param$1);
+                                          }), tl1, tl2);
                                   } else {
-                                    const match$2 = match._1;
-                                    if (match$2) {
-                                      const tl1 = match$2.tl;
-                                      const t1$1 = match$2.hd;
-                                      if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                        throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                  MEL_EXN_ID: Unify,
-                                                  _1: /* [] */0
-                                                });
-                                      }
-                                      if (match$1.TAG === /* Rpresent */0) {
-                                        throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                  MEL_EXN_ID: Unify,
-                                                  _1: /* [] */0
-                                                });
-                                      }
-                                      if (match$1._0) {
-                                        throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                  MEL_EXN_ID: Unify,
-                                                  _1: /* [] */0
-                                                });
-                                      }
-                                      const match$3 = match$1._1;
-                                      if (match$3) {
-                                        const tl2 = match$3.tl;
-                                        const t2$1 = match$3.hd;
-                                        eqtype(rename, type_pairs, subst, env, t1$1, t2$1);
-                                        if (Stdlib__List.length(tl1) === Stdlib__List.length(tl2)) {
-                                          return Stdlib__List.iter2((function (param, param$1) {
-                                                        return eqtype(rename, type_pairs, subst, env, param, param$1);
-                                                      }), tl1, tl2);
-                                        } else {
-                                          Stdlib__List.iter((function (param) {
-                                                  return eqtype(rename, type_pairs, subst, env, t1$1, param);
-                                                }), tl2);
-                                          return Stdlib__List.iter((function (t1) {
-                                                        eqtype(rename, type_pairs, subst, env, t1, t2$1);
-                                                      }), tl1);
-                                        }
-                                      }
-                                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                MEL_EXN_ID: Unify,
-                                                _1: /* [] */0
-                                              });
-                                    } else {
-                                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                                MEL_EXN_ID: Unify,
-                                                _1: /* [] */0
-                                              });
-                                    }
+                                    Stdlib__List.iter((function (param) {
+                                            return eqtype(rename, type_pairs, subst, env, t1$1, param);
+                                          }), tl2);
+                                    return Stdlib__List.iter((function (t1) {
+                                            eqtype(rename, type_pairs, subst, env, t1, t2$1);
+                                          }), tl1);
                                   }
-                                }), match$5[2]);
+                                }
+                                throw new Caml_js_exceptions.MelangeError(Unify, {
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
+                              } else {
+                                throw new Caml_js_exceptions.MelangeError(Unify, {
+                                      MEL_EXN_ID: Unify,
+                                      _1: /* [] */0
+                                    });
+                              }
+                            }
+                          }), match$5[2]);
                   };
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tunivar */9 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tunivar */9) {
                   return unify_univar(t1$p$1, t2$p$1, univar_pairs.contents);
                 }
                 throw new Caml_js_exceptions.MelangeError(Unify, {
-                          MEL_EXN_ID: Unify,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Unify,
+                      _1: /* [] */0
+                    });
             case /* Tpoly */10 :
                 const tl1 = match$2._1;
                 const t1$2 = match$2._0;
@@ -36040,9 +36040,9 @@ function eqtype(rename, type_pairs, subst, env, t1, t2) {
                 } else {
                   if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                   if (match$3.TAG === /* Tpoly */10) {
                     if (!match$3._1) {
@@ -36051,57 +36051,57 @@ function eqtype(rename, type_pairs, subst, env, t1, t2) {
                     exit$1 = 2;
                   } else {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                 }
                 if (exit$1 === 2) {
                   if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                     throw new Caml_js_exceptions.MelangeError(Unify, {
-                              MEL_EXN_ID: Unify,
-                              _1: /* [] */0
-                            });
+                          MEL_EXN_ID: Unify,
+                          _1: /* [] */0
+                        });
                   }
                   if (match$3.TAG === /* Tpoly */10) {
                     return enter_poly(env, univar_pairs, t1$2, tl1, match$3._0, match$3._1, (function (param, param$1) {
-                                  return eqtype(rename, type_pairs, subst, env, param, param$1);
-                                }));
+                            return eqtype(rename, type_pairs, subst, env, param, param$1);
+                          }));
                   }
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 break;
             case /* Tpackage */11 :
                 if (/* tag */typeof match$3 === "number" || typeof match$3 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
                 if (match$3.TAG === /* Tpackage */11) {
                   try {
                     return unify_package(env, (function (param, param$1) {
-                                  return eqtype_list(rename, type_pairs, subst, env, param, param$1);
-                                }), t1$p$1.level, match$2._0, match$2._1, match$2._2, t2$p$1.level, match$3._0, match$3._1, match$3._2);
+                            return eqtype_list(rename, type_pairs, subst, env, param, param$1);
+                          }), t1$p$1.level, match$2._0, match$2._1, match$2._2, t2$p$1.level, match$3._0, match$3._1, match$3._2);
                   }
                   catch (raw_exn$3){
                     const exn$3 = Caml_js_exceptions.internalToOCamlException(raw_exn$3);
                     if (exn$3.MEL_EXN_ID === Stdlib.Not_found) {
                       throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: /* [] */0
-                              });
+                            MEL_EXN_ID: Unify,
+                            _1: /* [] */0
+                          });
                     }
                     throw new Caml_js_exceptions.MelangeError(exn$3.MEL_EXN_ID, exn$3);
                   }
                 } else {
                   throw new Caml_js_exceptions.MelangeError(Unify, {
-                            MEL_EXN_ID: Unify,
-                            _1: /* [] */0
-                          });
+                        MEL_EXN_ID: Unify,
+                        _1: /* [] */0
+                      });
                 }
             
           }
@@ -36116,15 +36116,15 @@ function eqtype(rename, type_pairs, subst, env, t1, t2) {
     const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
     if (trace.MEL_EXN_ID === Unify) {
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: {
-                  hd: [
-                    t1$1,
-                    t2$1
-                  ],
-                  tl: trace._1
-                }
-              });
+            MEL_EXN_ID: Unify,
+            _1: {
+              hd: [
+                t1$1,
+                t2$1
+              ],
+              tl: trace._1
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
   }
@@ -36133,9 +36133,9 @@ function eqtype(rename, type_pairs, subst, env, t1, t2) {
 function eqtype_list(rename, type_pairs, subst, env, tl1, tl2) {
   if (Stdlib__List.length(tl1) !== Stdlib__List.length(tl2)) {
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   }
   Stdlib__List.iter2((function (param, param$1) {
           return eqtype(rename, type_pairs, subst, env, param, param$1);
@@ -36169,49 +36169,49 @@ function eqtype_fields(rename, type_pairs, subst, env, ty1, _ty2) {
     eqtype(rename, type_pairs, subst, env, rest1, rest2);
     if (Caml_obj.caml_notequal(match$4[1], /* [] */0) || Caml_obj.caml_notequal(match$4[2], /* [] */0)) {
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: /* [] */0
-              });
+            MEL_EXN_ID: Unify,
+            _1: /* [] */0
+          });
     }
     return Stdlib__List.iter((function (param) {
-                  const t2 = param[4];
-                  const k2 = param[3];
-                  const t1 = param[2];
-                  const k1 = param[1];
-                  const n = param[0];
-                  eqtype_kind(k1, k2);
-                  try {
-                    return eqtype(rename, type_pairs, subst, env, t1, t2);
-                  }
-                  catch (raw_trace){
-                    const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
-                    if (trace.MEL_EXN_ID === Unify) {
-                      throw new Caml_js_exceptions.MelangeError(Unify, {
-                                MEL_EXN_ID: Unify,
-                                _1: {
-                                  hd: [
-                                    newty2(current_level.contents, {
-                                          TAG: /* Tfield */5,
-                                          _0: n,
-                                          _1: k1,
-                                          _2: t1,
-                                          _3: rest2
-                                        }),
-                                    newty2(current_level.contents, {
-                                          TAG: /* Tfield */5,
-                                          _0: n,
-                                          _1: k2,
-                                          _2: t2,
-                                          _3: rest2
-                                        })
-                                  ],
-                                  tl: trace._1
-                                }
-                              });
-                    }
-                    throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
-                  }
-                }), match$4[0]);
+            const t2 = param[4];
+            const k2 = param[3];
+            const t1 = param[2];
+            const k1 = param[1];
+            const n = param[0];
+            eqtype_kind(k1, k2);
+            try {
+              return eqtype(rename, type_pairs, subst, env, t1, t2);
+            }
+            catch (raw_trace){
+              const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
+              if (trace.MEL_EXN_ID === Unify) {
+                throw new Caml_js_exceptions.MelangeError(Unify, {
+                      MEL_EXN_ID: Unify,
+                      _1: {
+                        hd: [
+                          newty2(current_level.contents, {
+                                TAG: /* Tfield */5,
+                                _0: n,
+                                _1: k1,
+                                _2: t1,
+                                _3: rest2
+                              }),
+                          newty2(current_level.contents, {
+                                TAG: /* Tfield */5,
+                                _0: n,
+                                _1: k2,
+                                _2: t2,
+                                _3: rest2
+                              })
+                        ],
+                        tl: trace._1
+                      }
+                    });
+              }
+              throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
+            }
+          }), match$4[0]);
   };
 }
 
@@ -36225,20 +36225,20 @@ function eqtype_kind(k1, k2) {
           return ;
         }
         throw new Caml_js_exceptions.MelangeError(Unify, {
-                  MEL_EXN_ID: Unify,
-                  _1: /* [] */0
-                });
+              MEL_EXN_ID: Unify,
+              _1: /* [] */0
+            });
       } else {
         throw new Caml_js_exceptions.MelangeError(Unify, {
-                  MEL_EXN_ID: Unify,
-                  _1: /* [] */0
-                });
+              MEL_EXN_ID: Unify,
+              _1: /* [] */0
+            });
       }
     } else {
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: /* [] */0
-              });
+            MEL_EXN_ID: Unify,
+            _1: /* [] */0
+          });
     }
   } else {
     if (!/* tag */(typeof k2$1 === "number" || typeof k2$1 === "string")) {
@@ -36246,14 +36246,14 @@ function eqtype_kind(k1, k2) {
     }
     if (k2$1 === /* Fpresent */0) {
       throw new Caml_js_exceptions.MelangeError(Unify, {
-                MEL_EXN_ID: Unify,
-                _1: /* [] */0
-              });
+            MEL_EXN_ID: Unify,
+            _1: /* [] */0
+          });
     }
     throw new Caml_js_exceptions.MelangeError(Unify, {
-              MEL_EXN_ID: Unify,
-              _1: /* [] */0
-            });
+          MEL_EXN_ID: Unify,
+          _1: /* [] */0
+        });
   }
 }
 
@@ -36308,50 +36308,50 @@ function moregen_clty(trace, type_pairs, env, cty1, cty2) {
                           const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
                           if (trace.MEL_EXN_ID === Unify) {
                             throw new Caml_js_exceptions.MelangeError(Failure, {
-                                      MEL_EXN_ID: Failure,
-                                      _1: {
-                                        hd: {
-                                          TAG: /* CM_Meth_type_mismatch */5,
-                                          _0: param[0],
-                                          _1: env,
-                                          _2: expand_trace(env, trace._1)
-                                        },
-                                        tl: /* [] */0
-                                      }
-                                    });
+                                  MEL_EXN_ID: Failure,
+                                  _1: {
+                                    hd: {
+                                      TAG: /* CM_Meth_type_mismatch */5,
+                                      _0: param[0],
+                                      _1: env,
+                                      _2: expand_trace(env, trace._1)
+                                    },
+                                    tl: /* [] */0
+                                  }
+                                });
                           }
                           throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
                         }
                       }), match$2[0]);
                 return Curry._2(Meths.iter, (function (lab, param) {
-                              const match = Curry._2(Meths.find, lab, sign1.csig_vars);
-                              try {
-                                return moregen$1(true, type_pairs, env, match[2], param[2]);
-                              }
-                              catch (raw_trace){
-                                const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
-                                if (trace.MEL_EXN_ID === Unify) {
-                                  throw new Caml_js_exceptions.MelangeError(Failure, {
-                                            MEL_EXN_ID: Failure,
-                                            _1: {
-                                              hd: {
-                                                TAG: /* CM_Val_type_mismatch */4,
-                                                _0: lab,
-                                                _1: env,
-                                                _2: expand_trace(env, trace._1)
-                                              },
-                                              tl: /* [] */0
-                                            }
-                                          });
-                                }
-                                throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
-                              }
-                            }), sign2.csig_vars);
+                        const match = Curry._2(Meths.find, lab, sign1.csig_vars);
+                        try {
+                          return moregen$1(true, type_pairs, env, match[2], param[2]);
+                        }
+                        catch (raw_trace){
+                          const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
+                          if (trace.MEL_EXN_ID === Unify) {
+                            throw new Caml_js_exceptions.MelangeError(Failure, {
+                                  MEL_EXN_ID: Failure,
+                                  _1: {
+                                    hd: {
+                                      TAG: /* CM_Val_type_mismatch */4,
+                                      _0: lab,
+                                      _1: env,
+                                      _2: expand_trace(env, trace._1)
+                                    },
+                                    tl: /* [] */0
+                                  }
+                                });
+                          }
+                          throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
+                        }
+                      }), sign2.csig_vars);
             case /* Cty_arrow */2 :
                 throw new Caml_js_exceptions.MelangeError(Failure, {
-                          MEL_EXN_ID: Failure,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Failure,
+                      _1: /* [] */0
+                    });
             
           }
           break;
@@ -36362,9 +36362,9 @@ function moregen_clty(trace, type_pairs, env, cty1, cty2) {
                 break;
             case /* Cty_signature */1 :
                 throw new Caml_js_exceptions.MelangeError(Failure, {
-                          MEL_EXN_ID: Failure,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Failure,
+                      _1: /* [] */0
+                    });
             case /* Cty_arrow */2 :
                 if (cty1._0 === cty2._0) {
                   try {
@@ -36374,25 +36374,25 @@ function moregen_clty(trace, type_pairs, env, cty1, cty2) {
                     const trace$1 = Caml_js_exceptions.internalToOCamlException(raw_trace);
                     if (trace$1.MEL_EXN_ID === Unify) {
                       throw new Caml_js_exceptions.MelangeError(Failure, {
-                                MEL_EXN_ID: Failure,
-                                _1: {
-                                  hd: {
-                                    TAG: /* CM_Parameter_mismatch */3,
-                                    _0: env,
-                                    _1: expand_trace(env, trace$1._1)
-                                  },
-                                  tl: /* [] */0
-                                }
-                              });
+                            MEL_EXN_ID: Failure,
+                            _1: {
+                              hd: {
+                                TAG: /* CM_Parameter_mismatch */3,
+                                _0: env,
+                                _1: expand_trace(env, trace$1._1)
+                              },
+                              tl: /* [] */0
+                            }
+                          });
                     }
                     throw new Caml_js_exceptions.MelangeError(trace$1.MEL_EXN_ID, trace$1);
                   }
                   return moregen_clty(false, type_pairs, env, cty1._2, cty2._2);
                 }
                 throw new Caml_js_exceptions.MelangeError(Failure, {
-                          MEL_EXN_ID: Failure,
-                          _1: /* [] */0
-                        });
+                      MEL_EXN_ID: Failure,
+                      _1: /* [] */0
+                    });
             
           }
           break;
@@ -36409,17 +36409,17 @@ function moregen_clty(trace, type_pairs, env, cty1, cty2) {
       const error$1 = error._1;
       if (trace || Caml_obj.caml_equal(error$1, /* [] */0)) {
         throw new Caml_js_exceptions.MelangeError(Failure, {
-                  MEL_EXN_ID: Failure,
-                  _1: {
-                    hd: {
-                      TAG: /* CM_Class_type_mismatch */2,
-                      _0: env,
-                      _1: cty1,
-                      _2: cty2
-                    },
-                    tl: error$1
-                  }
-                });
+              MEL_EXN_ID: Failure,
+              _1: {
+                hd: {
+                  TAG: /* CM_Class_type_mismatch */2,
+                  _0: env,
+                  _1: cty1,
+                  _2: cty2
+                },
+                tl: error$1
+              }
+            });
       }
       throw new Caml_js_exceptions.MelangeError(error.MEL_EXN_ID, error);
     }
@@ -36468,13 +36468,13 @@ function match_class_types(traceOpt, env, pat_sch, subj_sch) {
             return err$1;
           } else {
             return {
-                    hd: {
-                      TAG: /* CM_Hide_virtual */11,
-                      _0: "method",
-                      _1: lab
-                    },
-                    tl: err$1
-                  };
+              hd: {
+                TAG: /* CM_Hide_virtual */11,
+                _0: "method",
+                _1: lab
+              },
+              tl: err$1
+            };
           }
         }), match$4[1], /* [] */0);
   const missing_method = Stdlib__List.map((function (param) {
@@ -36482,9 +36482,9 @@ function match_class_types(traceOpt, env, pat_sch, subj_sch) {
         }), match$4[2]);
   const error$1 = Stdlib.$at(Stdlib__List.map((function (m) {
               return {
-                      TAG: /* CM_Missing_method */9,
-                      _0: m
-                    };
+                TAG: /* CM_Missing_method */9,
+                _0: m
+              };
             }), missing_method), error);
   moregen$1(true, type_pairs, env, match$2[1], match$3[1]);
   const error$2 = Stdlib__List.fold_right((function (param, err) {
@@ -36496,12 +36496,12 @@ function match_class_types(traceOpt, env, pat_sch, subj_sch) {
             const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn.MEL_EXN_ID === Unify) {
               return {
-                      hd: {
-                        TAG: /* CM_Public_method */12,
-                        _0: param[0]
-                      },
-                      tl: err
-                    };
+                hd: {
+                  TAG: /* CM_Public_method */12,
+                  _0: param[0]
+                },
+                tl: err
+              };
             }
             throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
           }
@@ -36511,20 +36511,20 @@ function match_class_types(traceOpt, env, pat_sch, subj_sch) {
             const match = Curry._2(Meths.find, lab, sign1.csig_vars);
             if (param[0] === /* Mutable */1 && match[0] !== /* Mutable */1) {
               return {
-                      hd: {
-                        TAG: /* CM_Non_mutable_value */6,
-                        _0: lab
-                      },
-                      tl: err
-                    };
+                hd: {
+                  TAG: /* CM_Non_mutable_value */6,
+                  _0: lab
+                },
+                tl: err
+              };
             } else if (param[1] === /* Concrete */1 && match[1] !== /* Concrete */1) {
               return {
-                      hd: {
-                        TAG: /* CM_Non_concrete_value */7,
-                        _0: lab
-                      },
-                      tl: err
-                    };
+                hd: {
+                  TAG: /* CM_Non_concrete_value */7,
+                  _0: lab
+                },
+                tl: err
+              };
             } else {
               return err;
             }
@@ -36533,12 +36533,12 @@ function match_class_types(traceOpt, env, pat_sch, subj_sch) {
             const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn.MEL_EXN_ID === Stdlib.Not_found) {
               return {
-                      hd: {
-                        TAG: /* CM_Missing_value */8,
-                        _0: lab
-                      },
-                      tl: err
-                    };
+                hd: {
+                  TAG: /* CM_Missing_value */8,
+                  _0: lab
+                },
+                tl: err
+              };
             }
             throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
           }
@@ -36546,13 +36546,13 @@ function match_class_types(traceOpt, env, pat_sch, subj_sch) {
   const error$4 = Curry._3(Meths.fold, (function (lab, param, err) {
           if (param[1] === /* Virtual */0 && !Curry._2(Meths.mem, lab, sign2.csig_vars)) {
             return {
-                    hd: {
-                      TAG: /* CM_Hide_virtual */11,
-                      _0: "instance variable",
-                      _1: lab
-                    },
-                    tl: err
-                  };
+              hd: {
+                TAG: /* CM_Hide_virtual */11,
+                _0: "instance variable",
+                _1: lab
+              },
+              tl: err
+            };
           } else {
             return err;
           }
@@ -36562,12 +36562,12 @@ function match_class_types(traceOpt, env, pat_sch, subj_sch) {
             return l;
           } else {
             return {
-                    hd: {
-                      TAG: /* CM_Virtual_method */14,
-                      _0: e
-                    },
-                    tl: l
-                  };
+              hd: {
+                TAG: /* CM_Virtual_method */14,
+                _0: e
+              },
+              tl: l
+            };
           }
         }), Curry._1(elements, Curry._2(diff, sign2.csig_concr, sign1.csig_concr)), error$4);
   let res;
@@ -36639,45 +36639,45 @@ function equal_clty(trace, type_pairs, subst, env, cty1, cty2) {
                           const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
                           if (trace.MEL_EXN_ID === Unify) {
                             throw new Caml_js_exceptions.MelangeError(Failure, {
-                                      MEL_EXN_ID: Failure,
-                                      _1: {
-                                        hd: {
-                                          TAG: /* CM_Meth_type_mismatch */5,
-                                          _0: param[0],
-                                          _1: env,
-                                          _2: expand_trace(env, trace._1)
-                                        },
-                                        tl: /* [] */0
-                                      }
-                                    });
+                                  MEL_EXN_ID: Failure,
+                                  _1: {
+                                    hd: {
+                                      TAG: /* CM_Meth_type_mismatch */5,
+                                      _0: param[0],
+                                      _1: env,
+                                      _2: expand_trace(env, trace._1)
+                                    },
+                                    tl: /* [] */0
+                                  }
+                                });
                           }
                           throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
                         }
                       }), match$2[0]);
                 return Curry._2(Meths.iter, (function (lab, param) {
-                              const match = Curry._2(Meths.find, lab, sign1.csig_vars);
-                              try {
-                                return eqtype$1(true, type_pairs, subst, env, match[2], param[2]);
-                              }
-                              catch (raw_trace){
-                                const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
-                                if (trace.MEL_EXN_ID === Unify) {
-                                  throw new Caml_js_exceptions.MelangeError(Failure, {
-                                            MEL_EXN_ID: Failure,
-                                            _1: {
-                                              hd: {
-                                                TAG: /* CM_Val_type_mismatch */4,
-                                                _0: lab,
-                                                _1: env,
-                                                _2: expand_trace(env, trace._1)
-                                              },
-                                              tl: /* [] */0
-                                            }
-                                          });
-                                }
-                                throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
-                              }
-                            }), sign2.csig_vars);
+                        const match = Curry._2(Meths.find, lab, sign1.csig_vars);
+                        try {
+                          return eqtype$1(true, type_pairs, subst, env, match[2], param[2]);
+                        }
+                        catch (raw_trace){
+                          const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
+                          if (trace.MEL_EXN_ID === Unify) {
+                            throw new Caml_js_exceptions.MelangeError(Failure, {
+                                  MEL_EXN_ID: Failure,
+                                  _1: {
+                                    hd: {
+                                      TAG: /* CM_Val_type_mismatch */4,
+                                      _0: lab,
+                                      _1: env,
+                                      _2: expand_trace(env, trace._1)
+                                    },
+                                    tl: /* [] */0
+                                  }
+                                });
+                          }
+                          throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
+                        }
+                      }), sign2.csig_vars);
             case /* Cty_arrow */2 :
                 exit = 2;
                 break;
@@ -36701,16 +36701,16 @@ function equal_clty(trace, type_pairs, subst, env, cty1, cty2) {
                     const trace$1 = Caml_js_exceptions.internalToOCamlException(raw_trace);
                     if (trace$1.MEL_EXN_ID === Unify) {
                       throw new Caml_js_exceptions.MelangeError(Failure, {
-                                MEL_EXN_ID: Failure,
-                                _1: {
-                                  hd: {
-                                    TAG: /* CM_Parameter_mismatch */3,
-                                    _0: env,
-                                    _1: expand_trace(env, trace$1._1)
-                                  },
-                                  tl: /* [] */0
-                                }
-                              });
+                            MEL_EXN_ID: Failure,
+                            _1: {
+                              hd: {
+                                TAG: /* CM_Parameter_mismatch */3,
+                                _0: env,
+                                _1: expand_trace(env, trace$1._1)
+                              },
+                              tl: /* [] */0
+                            }
+                          });
                     }
                     throw new Caml_js_exceptions.MelangeError(trace$1.MEL_EXN_ID, trace$1);
                   }
@@ -36728,17 +36728,17 @@ function equal_clty(trace, type_pairs, subst, env, cty1, cty2) {
           return equal_clty(true, type_pairs, subst, env, cty1, cty2._2);
       case 2 :
           throw new Caml_js_exceptions.MelangeError(Failure, {
-                    MEL_EXN_ID: Failure,
-                    _1: trace ? /* [] */0 : ({
-                          hd: {
-                            TAG: /* CM_Class_type_mismatch */2,
-                            _0: env,
-                            _1: cty1,
-                            _2: cty2
-                          },
-                          tl: /* [] */0
-                        })
-                  });
+                MEL_EXN_ID: Failure,
+                _1: trace ? /* [] */0 : ({
+                    hd: {
+                      TAG: /* CM_Class_type_mismatch */2,
+                      _0: env,
+                      _1: cty1,
+                      _2: cty2
+                    },
+                    tl: /* [] */0
+                  })
+              });
       
     }
   }
@@ -36747,17 +36747,17 @@ function equal_clty(trace, type_pairs, subst, env, cty1, cty2) {
     if (error.MEL_EXN_ID === Failure) {
       if (trace) {
         throw new Caml_js_exceptions.MelangeError(Failure, {
-                  MEL_EXN_ID: Failure,
-                  _1: {
-                    hd: {
-                      TAG: /* CM_Class_type_mismatch */2,
-                      _0: env,
-                      _1: cty1,
-                      _2: cty2
-                    },
-                    tl: error._1
-                  }
-                });
+              MEL_EXN_ID: Failure,
+              _1: {
+                hd: {
+                  TAG: /* CM_Class_type_mismatch */2,
+                  _0: env,
+                  _1: cty1,
+                  _2: cty2
+                },
+                tl: error._1
+              }
+            });
       }
       throw new Caml_js_exceptions.MelangeError(error.MEL_EXN_ID, error);
     }
@@ -36786,23 +36786,23 @@ function match_class_declarations(env, patt_params, patt_type, subj_params, subj
           const k = field_kind_repr(param[1]);
           let err$1;
           err$1 = /* tag */typeof k === "number" || typeof k === "string" ? ({
-                hd: {
-                  TAG: /* CM_Hide_public */10,
-                  _0: lab
-                },
-                tl: err
-              }) : err;
+              hd: {
+                TAG: /* CM_Hide_public */10,
+                _0: lab
+              },
+              tl: err
+            }) : err;
           if (Curry._2(mem$2, lab, sign1.csig_concr)) {
             return err$1;
           } else {
             return {
-                    hd: {
-                      TAG: /* CM_Hide_virtual */11,
-                      _0: "method",
-                      _1: lab
-                    },
-                    tl: err$1
-                  };
+              hd: {
+                TAG: /* CM_Hide_virtual */11,
+                _0: "method",
+                _1: lab
+              },
+              tl: err$1
+            };
           }
         }), match$2[1], /* [] */0);
   const missing_method = Stdlib__List.map((function (param) {
@@ -36810,9 +36810,9 @@ function match_class_declarations(env, patt_params, patt_type, subj_params, subj
         }), match$2[2]);
   const error$1 = Stdlib.$at(Stdlib__List.map((function (m) {
               return {
-                      TAG: /* CM_Missing_method */9,
-                      _0: m
-                    };
+                TAG: /* CM_Missing_method */9,
+                _0: m
+              };
             }), missing_method), error);
   eqtype$1(true, type_pairs, subst, env, match[1], match$1[1]);
   const error$2 = Stdlib__List.fold_right((function (param, err) {
@@ -36823,12 +36823,12 @@ function match_class_declarations(env, patt_params, patt_type, subj_params, subj
             if (k1 === /* Fpresent */0) {
               if (!/* tag */(typeof k2 === "number" || typeof k2 === "string")) {
                 return {
-                        hd: {
-                          TAG: /* CM_Public_method */12,
-                          _0: lab
-                        },
-                        tl: err
-                      };
+                  hd: {
+                    TAG: /* CM_Public_method */12,
+                    _0: lab
+                  },
+                  tl: err
+                };
               }
               if (k2 === /* Fpresent */0) {
                 return err;
@@ -36842,43 +36842,43 @@ function match_class_declarations(env, patt_params, patt_type, subj_params, subj
             }
             if (k2 === /* Fpresent */0) {
               return {
-                      hd: {
-                        TAG: /* CM_Private_method */13,
-                        _0: lab
-                      },
-                      tl: err
-                    };
-            }
-            
-          }
+                hd: {
+                  TAG: /* CM_Private_method */13,
+                  _0: lab
+                },
+                tl: err
+              };
+            }
+            
+          }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      33612,
-                      34
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  33612,
+                  34
+                ]
+              });
         }), match$2[0], error$1);
   const error$3 = Curry._3(Meths.fold, (function (lab, param, err) {
           try {
             const match = Curry._2(Meths.find, lab, sign1.csig_vars);
             if (param[0] === /* Mutable */1 && match[0] !== /* Mutable */1) {
               return {
-                      hd: {
-                        TAG: /* CM_Non_mutable_value */6,
-                        _0: lab
-                      },
-                      tl: err
-                    };
+                hd: {
+                  TAG: /* CM_Non_mutable_value */6,
+                  _0: lab
+                },
+                tl: err
+              };
             } else if (param[1] === /* Concrete */1 && match[1] !== /* Concrete */1) {
               return {
-                      hd: {
-                        TAG: /* CM_Non_concrete_value */7,
-                        _0: lab
-                      },
-                      tl: err
-                    };
+                hd: {
+                  TAG: /* CM_Non_concrete_value */7,
+                  _0: lab
+                },
+                tl: err
+              };
             } else {
               return err;
             }
@@ -36887,12 +36887,12 @@ function match_class_declarations(env, patt_params, patt_type, subj_params, subj
             const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn.MEL_EXN_ID === Stdlib.Not_found) {
               return {
-                      hd: {
-                        TAG: /* CM_Missing_value */8,
-                        _0: lab
-                      },
-                      tl: err
-                    };
+                hd: {
+                  TAG: /* CM_Missing_value */8,
+                  _0: lab
+                },
+                tl: err
+              };
             }
             throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
           }
@@ -36900,13 +36900,13 @@ function match_class_declarations(env, patt_params, patt_type, subj_params, subj
   const error$4 = Curry._3(Meths.fold, (function (lab, param, err) {
           if (param[1] === /* Virtual */0 && !Curry._2(Meths.mem, lab, sign2.csig_vars)) {
             return {
-                    hd: {
-                      TAG: /* CM_Hide_virtual */11,
-                      _0: "instance variable",
-                      _1: lab
-                    },
-                    tl: err
-                  };
+              hd: {
+                TAG: /* CM_Hide_virtual */11,
+                _0: "instance variable",
+                _1: lab
+              },
+              tl: err
+            };
           } else {
             return err;
           }
@@ -36916,12 +36916,12 @@ function match_class_declarations(env, patt_params, patt_type, subj_params, subj
             return l;
           } else {
             return {
-                    hd: {
-                      TAG: /* CM_Virtual_method */14,
-                      _0: e
-                    },
-                    tl: l
-                  };
+              hd: {
+                TAG: /* CM_Virtual_method */14,
+                _0: e
+              },
+              tl: l
+            };
           }
         }), Curry._1(elements, Curry._2(diff, sign2.csig_concr, sign1.csig_concr)), error$4);
   if (error$5) {
@@ -36932,16 +36932,16 @@ function match_class_declarations(env, patt_params, patt_type, subj_params, subj
     const ls = Stdlib__List.length(subj_params);
     if (lp !== ls) {
       throw new Caml_js_exceptions.MelangeError(Failure, {
-                MEL_EXN_ID: Failure,
-                _1: {
-                  hd: {
-                    TAG: /* CM_Parameter_arity_mismatch */0,
-                    _0: lp,
-                    _1: ls
-                  },
-                  tl: /* [] */0
-                }
-              });
+            MEL_EXN_ID: Failure,
+            _1: {
+              hd: {
+                TAG: /* CM_Parameter_arity_mismatch */0,
+                _0: lp,
+                _1: ls
+              },
+              tl: /* [] */0
+            }
+          });
     }
     Stdlib__List.iter2((function (p, s) {
             try {
@@ -36951,16 +36951,16 @@ function match_class_declarations(env, patt_params, patt_type, subj_params, subj
               const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
               if (trace.MEL_EXN_ID === Unify) {
                 throw new Caml_js_exceptions.MelangeError(Failure, {
-                          MEL_EXN_ID: Failure,
-                          _1: {
-                            hd: {
-                              TAG: /* CM_Type_parameter_mismatch */1,
-                              _0: env,
-                              _1: expand_trace(env, trace._1)
-                            },
-                            tl: /* [] */0
-                          }
-                        });
+                      MEL_EXN_ID: Failure,
+                      _1: {
+                        hd: {
+                          TAG: /* CM_Type_parameter_mismatch */1,
+                          _0: env,
+                          _1: expand_trace(env, trace._1)
+                        },
+                        tl: /* [] */0
+                      }
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
             }
@@ -36974,13 +36974,13 @@ function match_class_declarations(env, patt_params, patt_type, subj_params, subj
         });
     const clty_params = function (param, param$1) {
       return Stdlib__List.fold_right((function (ty, cty) {
-                    return {
-                            TAG: /* Cty_arrow */2,
-                            _0: "*",
-                            _1: ty,
-                            _2: cty
-                          };
-                  }), param, param$1);
+              return {
+                TAG: /* Cty_arrow */2,
+                _0: "*",
+                _1: ty,
+                _2: cty
+              };
+            }), param, param$1);
     };
     return match_class_types(false, env, clty_params(patt_params, patt_type), clty_params(subj_params, subj_type));
   }
@@ -37015,8 +37015,8 @@ function pred_enlarge(n) {
 
 function collect(l) {
   return Stdlib__List.fold_left((function (c1, param) {
-                return Caml.caml_int_max(c1, param[1]);
-              }), /* Unchanged */0, l);
+          return Caml.caml_int_max(c1, param[1]);
+        }), /* Unchanged */0, l);
 }
 
 function filter_visited(_l) {
@@ -37055,21 +37055,21 @@ function lid_of_path(sharpOpt, id) {
   switch (id.TAG) {
     case /* Pident */0 :
         return {
-                TAG: /* Lident */0,
-                _0: sharp + id._0.name
-              };
+          TAG: /* Lident */0,
+          _0: sharp + id._0.name
+        };
     case /* Pdot */1 :
         return {
-                TAG: /* Ldot */1,
-                _0: lid_of_path(undefined, id._0),
-                _1: sharp + id._1
-              };
+          TAG: /* Ldot */1,
+          _0: lid_of_path(undefined, id._0),
+          _1: sharp + id._1
+        };
     case /* Papply */2 :
         return {
-                TAG: /* Lapply */2,
-                _0: lid_of_path(sharp, id._0),
-                _1: lid_of_path(undefined, id._1)
-              };
+          TAG: /* Lapply */2,
+          _0: lid_of_path(sharp, id._0),
+          _1: lid_of_path(undefined, id._1)
+        };
     
   }
 }
@@ -37082,38 +37082,38 @@ function find_cltype_for_path(env, p) {
     const match$1 = repr(ty).desc;
     if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     if (match$1.TAG === /* Tobject */4) {
       const match$2 = match$1._1.contents;
       if (match$2 !== undefined) {
         if (same(p, match$2[0])) {
           return [
-                  cl_abbr,
-                  ty
-                ];
+            cl_abbr,
+            ty
+          ];
         }
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
       }
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   } else {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                33719,
-                12
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            33719,
+            12
+          ]
+        });
   }
 }
 
@@ -37124,48 +37124,48 @@ function build_subtype(env, visited, loops, posi, level, t) {
     if (posi) {
       const v = newvar(undefined, undefined);
       return [
-              v,
-              /* Changed */2
-            ];
+        v,
+        /* Changed */2
+      ];
     }
     warn.contents = true;
     return [
-            t$1,
-            /* Unchanged */0
-          ];
+      t$1,
+      /* Unchanged */0
+    ];
   }
   switch (tlist.TAG) {
     case /* Tvar */0 :
         if (!posi) {
           return [
-                  t$1,
-                  /* Unchanged */0
-                ];
+            t$1,
+            /* Unchanged */0
+          ];
         }
         try {
           const t$p = Stdlib__List.assq(t$1, loops);
           warn.contents = true;
           return [
-                  t$p,
-                  /* Equiv */1
-                ];
+            t$p,
+            /* Equiv */1
+          ];
         }
         catch (raw_exn){
           const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
           if (exn.MEL_EXN_ID === Stdlib.Not_found) {
             return [
-                    t$1,
-                    /* Unchanged */0
-                  ];
+              t$1,
+              /* Unchanged */0
+            ];
           }
           throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
         }
     case /* Tarrow */1 :
         if (memq_warn(t$1, visited)) {
           return [
-                  t$1,
-                  /* Unchanged */0
-                ];
+            t$1,
+            /* Unchanged */0
+          ];
         }
         const visited$1 = {
           hd: t$1,
@@ -37176,27 +37176,27 @@ function build_subtype(env, visited, loops, posi, level, t) {
         const c = Caml.caml_int_max(match[1], match$1[1]);
         if (c > /* Unchanged */0) {
           return [
-                  newty2(current_level.contents, {
-                        TAG: /* Tarrow */1,
-                        _0: tlist._0,
-                        _1: match[0],
-                        _2: match$1[0],
-                        _3: /* Cok */0
-                      }),
-                  c
-                ];
+            newty2(current_level.contents, {
+                  TAG: /* Tarrow */1,
+                  _0: tlist._0,
+                  _1: match[0],
+                  _2: match$1[0],
+                  _3: /* Cok */0
+                }),
+            c
+          ];
         } else {
           return [
-                  t$1,
-                  /* Unchanged */0
-                ];
+            t$1,
+            /* Unchanged */0
+          ];
         }
     case /* Ttuple */2 :
         if (memq_warn(t$1, visited)) {
           return [
-                  t$1,
-                  /* Unchanged */0
-                ];
+            t$1,
+            /* Unchanged */0
+          ];
         }
         const visited$2 = {
           hd: t$1,
@@ -37208,9 +37208,9 @@ function build_subtype(env, visited, loops, posi, level, t) {
         const c$1 = collect(tlist$p);
         if (c$1 <= /* Unchanged */0) {
           return [
-                  t$1,
-                  /* Unchanged */0
-                ];
+            t$1,
+            /* Unchanged */0
+          ];
         }
         const desc = {
           TAG: /* Ttuple */2,
@@ -37219,9 +37219,9 @@ function build_subtype(env, visited, loops, posi, level, t) {
                 }), tlist$p)
         };
         return [
-                newty2(current_level.contents, desc),
-                c$1
-              ];
+          newty2(current_level.contents, desc),
+          c$1
+        ];
     case /* Tconstr */3 :
         const p = tlist._0;
         if (level > 0 && generic_abbrev(env, p) && safe_abbrev(env, t$1) && !has_constr_row(expand_abbrev(env)(t$1))) {
@@ -37231,8 +37231,8 @@ function build_subtype(env, visited, loops, posi, level, t) {
             const match$2 = t$p$1.desc;
             if (/* tag */typeof match$2 === "number" || typeof match$2 === "string") {
               throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                        MEL_EXN_ID: Stdlib.Not_found
-                      });
+                    MEL_EXN_ID: Stdlib.Not_found
+                  });
             }
             if (match$2.TAG === /* Tobject */4) {
               if (posi && !opened_object(t$p$1)) {
@@ -37243,8 +37243,8 @@ function build_subtype(env, visited, loops, posi, level, t) {
                 let match$5;
                 if (/* tag */typeof match$4 === "number" || typeof match$4 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                            MEL_EXN_ID: Stdlib.Not_found
-                          });
+                        MEL_EXN_ID: Stdlib.Not_found
+                      });
                 }
                 if (match$4.TAG === /* Tobject */4) {
                   const match$6 = match$4._1.contents;
@@ -37256,26 +37256,26 @@ function build_subtype(env, visited, loops, posi, level, t) {
                       ];
                     } else {
                       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                MEL_EXN_ID: Stdlib.Not_found
-                              });
+                            MEL_EXN_ID: Stdlib.Not_found
+                          });
                     }
                   } else {
                     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                              MEL_EXN_ID: Stdlib.Not_found
-                            });
+                          MEL_EXN_ID: Stdlib.Not_found
+                        });
                   }
                 } else {
                   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                            MEL_EXN_ID: Stdlib.Not_found
-                          });
+                        MEL_EXN_ID: Stdlib.Not_found
+                      });
                 }
                 const tl1 = match$5[1];
                 if (Stdlib__List.exists((function (param) {
                           return deep_occur(ty$1, param);
                         }), tl1)) {
                   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                            MEL_EXN_ID: Stdlib.Not_found
-                          });
+                        MEL_EXN_ID: Stdlib.Not_found
+                      });
                 }
                 ty$1.desc = {
                   TAG: /* Tvar */0,
@@ -37297,13 +37297,13 @@ function build_subtype(env, visited, loops, posi, level, t) {
                 const ty1$p = match$7[0];
                 if (!is_Tvar(t$p$p)) {
                   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                            MEL_EXN_ID: "Assert_failure",
-                            _1: [
-                              "jscomp/test/ocaml_typedtree_test.ml",
-                              33782,
-                              10
-                            ]
-                          });
+                        MEL_EXN_ID: "Assert_failure",
+                        _1: [
+                          "jscomp/test/ocaml_typedtree_test.ml",
+                          33782,
+                          10
+                        ]
+                      });
                 }
                 const nm = match$7[1] > /* Equiv */1 || deep_occur(ty$1, ty1$p) ? undefined : [
                     p,
@@ -37323,28 +37323,28 @@ function build_subtype(env, visited, loops, posi, level, t) {
                   const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
                   if (exn$1.MEL_EXN_ID === Unify) {
                     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                              MEL_EXN_ID: "Assert_failure",
-                              _1: [
-                                "jscomp/test/ocaml_typedtree_test.ml",
-                                33786,
-                                50
-                              ]
-                            });
+                          MEL_EXN_ID: "Assert_failure",
+                          _1: [
+                            "jscomp/test/ocaml_typedtree_test.ml",
+                            33786,
+                            50
+                          ]
+                        });
                   }
                   throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
                 }
                 return [
-                        t$p$p,
-                        /* Changed */2
-                      ];
+                  t$p$p,
+                  /* Changed */2
+                ];
               }
               throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                        MEL_EXN_ID: Stdlib.Not_found
-                      });
+                    MEL_EXN_ID: Stdlib.Not_found
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                      MEL_EXN_ID: Stdlib.Not_found
-                    });
+                  MEL_EXN_ID: Stdlib.Not_found
+                });
           }
           catch (raw_exn$2){
             const exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn$2);
@@ -37353,14 +37353,14 @@ function build_subtype(env, visited, loops, posi, level, t) {
               const c$2 = match$8[1];
               if (c$2 > /* Unchanged */0) {
                 return [
-                        match$8[0],
-                        c$2
-                      ];
+                  match$8[0],
+                  c$2
+                ];
               } else {
                 return [
-                        t$1,
-                        /* Unchanged */0
-                      ];
+                  t$1,
+                  /* Unchanged */0
+                ];
               }
             }
             throw new Caml_js_exceptions.MelangeError(exn$2.MEL_EXN_ID, exn$2);
@@ -37368,9 +37368,9 @@ function build_subtype(env, visited, loops, posi, level, t) {
         } else {
           if (memq_warn(t$1, visited)) {
             return [
-                    t$1,
-                    /* Unchanged */0
-                  ];
+              t$1,
+              /* Unchanged */0
+            ];
           }
           const visited$3 = {
             hd: t$1,
@@ -37387,9 +37387,9 @@ function build_subtype(env, visited, loops, posi, level, t) {
                     if (match[1]) {
                       if (co) {
                         return [
-                                t,
-                                /* Unchanged */0
-                              ];
+                          t,
+                          /* Unchanged */0
+                        ];
                       } else {
                         return build_subtype(env, visited$3, loops, !posi, level, t);
                       }
@@ -37397,33 +37397,33 @@ function build_subtype(env, visited, loops, posi, level, t) {
                       return build_subtype(env, visited$3, loops, posi, level, t);
                     } else {
                       return [
-                              newvar(undefined, undefined),
-                              /* Changed */2
-                            ];
+                        newvar(undefined, undefined),
+                        /* Changed */2
+                      ];
                     }
                   }), decl.type_variance, tlist._1);
             const c$3 = collect(tl$p);
             if (c$3 > /* Unchanged */0) {
               return [
-                      newconstr(p, Stdlib__List.map((function (prim) {
-                                  return prim[0];
-                                }), tl$p)),
-                      c$3
-                    ];
+                newconstr(p, Stdlib__List.map((function (prim) {
+                            return prim[0];
+                          }), tl$p)),
+                c$3
+              ];
             } else {
               return [
-                      t$1,
-                      /* Unchanged */0
-                    ];
+                t$1,
+                /* Unchanged */0
+              ];
             }
           }
           catch (raw_exn$3){
             const exn$3 = Caml_js_exceptions.internalToOCamlException(raw_exn$3);
             if (exn$3.MEL_EXN_ID === Stdlib.Not_found) {
               return [
-                      t$1,
-                      /* Unchanged */0
-                    ];
+                t$1,
+                /* Unchanged */0
+              ];
             }
             throw new Caml_js_exceptions.MelangeError(exn$3.MEL_EXN_ID, exn$3);
           }
@@ -37432,9 +37432,9 @@ function build_subtype(env, visited, loops, posi, level, t) {
         const t1 = tlist._0;
         if (memq_warn(t$1, visited) || opened_object(t1)) {
           return [
-                  t$1,
-                  /* Unchanged */0
-                ];
+            t$1,
+            /* Unchanged */0
+          ];
         }
         const level$p$1 = pred_enlarge(level);
         const visited_1 = level$p$1 < level ? /* [] */0 : filter_visited(visited);
@@ -37446,20 +37446,20 @@ function build_subtype(env, visited, loops, posi, level, t) {
         const c$4 = match$9[1];
         if (c$4 > /* Unchanged */0) {
           return [
-                  newty2(current_level.contents, {
-                        TAG: /* Tobject */4,
-                        _0: match$9[0],
-                        _1: {
-                          contents: undefined
-                        }
-                      }),
-                  c$4
-                ];
+            newty2(current_level.contents, {
+                  TAG: /* Tobject */4,
+                  _0: match$9[0],
+                  _1: {
+                    contents: undefined
+                  }
+                }),
+            c$4
+          ];
         } else {
           return [
-                  t$1,
-                  /* Unchanged */0
-                ];
+            t$1,
+            /* Unchanged */0
+          ];
         }
     case /* Tfield */5 :
         const match$10 = build_subtype(env, visited, loops, posi, level, tlist._2);
@@ -37467,38 +37467,38 @@ function build_subtype(env, visited, loops, posi, level, t) {
         const c$5 = Caml.caml_int_max(match$10[1], match$11[1]);
         if (c$5 > /* Unchanged */0) {
           return [
-                  newty2(current_level.contents, {
-                        TAG: /* Tfield */5,
-                        _0: tlist._0,
-                        _1: /* Fpresent */0,
-                        _2: match$10[0],
-                        _3: match$11[0]
-                      }),
-                  c$5
-                ];
+            newty2(current_level.contents, {
+                  TAG: /* Tfield */5,
+                  _0: tlist._0,
+                  _1: /* Fpresent */0,
+                  _2: match$10[0],
+                  _3: match$11[0]
+                }),
+            c$5
+          ];
         } else {
           return [
-                  t$1,
-                  /* Unchanged */0
-                ];
+            t$1,
+            /* Unchanged */0
+          ];
         }
     case /* Tlink */6 :
     case /* Tsubst */7 :
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/ocaml_typedtree_test.ml",
-                    33877,
-                    6
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/ocaml_typedtree_test.ml",
+                33877,
+                6
+              ]
+            });
     case /* Tvariant */8 :
         const row = row_repr_aux(/* [] */0, tlist._0);
         if (memq_warn(t$1, visited) || !static_row(row)) {
           return [
-                  t$1,
-                  /* Unchanged */0
-                ];
+            t$1,
+            /* Unchanged */0
+          ];
         }
         const level$p$2 = pred_enlarge(level);
         const visited_1$1 = level$p$2 < level ? /* [] */0 : filter_visited(visited);
@@ -37512,73 +37512,73 @@ function build_subtype(env, visited, loops, posi, level, t) {
                 const match = row_field_repr_aux(/* [] */0, orig[1]);
                 if (/* tag */typeof match === "number" || typeof match === "string") {
                   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                            MEL_EXN_ID: "Assert_failure",
-                            _1: [
-                              "jscomp/test/ocaml_typedtree_test.ml",
-                              33844,
-                              17
-                            ]
-                          });
+                        MEL_EXN_ID: "Assert_failure",
+                        _1: [
+                          "jscomp/test/ocaml_typedtree_test.ml",
+                          33844,
+                          17
+                        ]
+                      });
                 }
                 if (match.TAG === /* Rpresent */0) {
                   const t = match._0;
                   if (t === undefined) {
                     if (posi) {
                       return [
-                              [
-                                l,
-                                {
-                                  TAG: /* Reither */1,
-                                  _0: true,
-                                  _1: /* [] */0,
-                                  _2: false,
-                                  _3: {
-                                    contents: undefined
-                                  }
-                                }
-                              ],
-                              /* Unchanged */0
-                            ];
+                        [
+                          l,
+                          {
+                            TAG: /* Reither */1,
+                            _0: true,
+                            _1: /* [] */0,
+                            _2: false,
+                            _3: {
+                              contents: undefined
+                            }
+                          }
+                        ],
+                        /* Unchanged */0
+                      ];
                     } else {
                       return [
-                              orig,
-                              /* Unchanged */0
-                            ];
+                        orig,
+                        /* Unchanged */0
+                      ];
                     }
                   }
                   const match$1 = build_subtype(env, visited$5, loops, posi, level$p$2, t);
                   const t$p = match$1[0];
                   const f = posi && level > 0 ? ({
-                        TAG: /* Reither */1,
-                        _0: false,
-                        _1: {
-                          hd: t$p,
-                          tl: /* [] */0
-                        },
-                        _2: false,
-                        _3: {
-                          contents: undefined
-                        }
-                      }) : ({
-                        TAG: /* Rpresent */0,
-                        _0: t$p
-                      });
+                      TAG: /* Reither */1,
+                      _0: false,
+                      _1: {
+                        hd: t$p,
+                        tl: /* [] */0
+                      },
+                      _2: false,
+                      _3: {
+                        contents: undefined
+                      }
+                    }) : ({
+                      TAG: /* Rpresent */0,
+                      _0: t$p
+                    });
                   return [
-                          [
-                            l,
-                            f
-                          ],
-                          match$1[1]
-                        ];
+                    [
+                      l,
+                      f
+                    ],
+                    match$1[1]
+                  ];
                 }
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            33844,
-                            17
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        33844,
+                        17
+                      ]
+                    });
               }), fields);
         const c$6 = collect(fields$1);
         const row_row_fields = Stdlib__List.map((function (prim) {
@@ -37595,36 +37595,36 @@ function build_subtype(env, visited, loops, posi, level, t) {
           row_name: row_row_name
         };
         return [
-                newty2(current_level.contents, {
-                      TAG: /* Tvariant */8,
-                      _0: row$1
-                    }),
-                /* Changed */2
-              ];
+          newty2(current_level.contents, {
+                TAG: /* Tvariant */8,
+                _0: row$1
+              }),
+          /* Changed */2
+        ];
     case /* Tpoly */10 :
         const match$12 = build_subtype(env, visited, loops, posi, level, tlist._0);
         const c$7 = match$12[1];
         if (c$7 > /* Unchanged */0) {
           return [
-                  newty2(current_level.contents, {
-                        TAG: /* Tpoly */10,
-                        _0: match$12[0],
-                        _1: tlist._1
-                      }),
-                  c$7
-                ];
+            newty2(current_level.contents, {
+                  TAG: /* Tpoly */10,
+                  _0: match$12[0],
+                  _1: tlist._1
+                }),
+            c$7
+          ];
         } else {
           return [
-                  t$1,
-                  /* Unchanged */0
-                ];
+            t$1,
+            /* Unchanged */0
+          ];
         }
     case /* Tunivar */9 :
     case /* Tpackage */11 :
         return [
-                t$1,
-                /* Unchanged */0
-              ];
+          t$1,
+          /* Unchanged */0
+        ];
     
   }
 }
@@ -37633,19 +37633,19 @@ function enlarge_type(env, ty) {
   warn.contents = false;
   const match = build_subtype(env, /* [] */0, /* [] */0, true, 4, ty);
   return [
-          match[0],
-          warn.contents
-        ];
+    match[0],
+    warn.contents
+  ];
 }
 
 const subtypes = Curry._1(TypePairs.create, 17);
 
 function subtype_error(env, trace) {
   throw new Caml_js_exceptions.MelangeError(Subtype, {
-            MEL_EXN_ID: Subtype,
-            _1: expand_trace(env, Stdlib__List.rev(trace)),
-            _2: /* [] */0
-          });
+        MEL_EXN_ID: Subtype,
+        _1: expand_trace(env, Stdlib__List.rev(trace)),
+        _2: /* [] */0
+      });
 }
 
 function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
@@ -37747,14 +37747,14 @@ function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
                           subtype_error(env, trace);
                         }
                         return Stdlib__List.fold_left2((function (cstrs, t1, t2) {
-                                      return subtype_rec(env, {
-                                                  hd: [
-                                                    t1,
-                                                    t2
-                                                  ],
-                                                  tl: trace
-                                                }, t1, t2, cstrs);
-                                    }), cstrs, tl1, tl2);
+                                return subtype_rec(env, {
+                                      hd: [
+                                        t1,
+                                        t2
+                                      ],
+                                      tl: trace
+                                    }, t1, t2, cstrs);
+                              }), cstrs, tl1, tl2);
                     case /* Tconstr */3 :
                         exit$2 = 4;
                         break;
@@ -37804,14 +37804,14 @@ function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
                         const f2 = match$1._0;
                         if (is_Tvar(object_row(f1)) && is_Tvar(object_row(f2))) {
                           return {
-                                  hd: [
-                                    trace,
-                                    t1$1,
-                                    t2$1,
-                                    univar_pairs.contents
-                                  ],
-                                  tl: cstrs
-                                };
+                            hd: [
+                              trace,
+                              t1$1,
+                              t2$1,
+                              univar_pairs.contents
+                            ],
+                            tl: cstrs
+                          };
                         } else {
                           const match$2 = flatten_fields(f1);
                           const rest1 = match$2[1];
@@ -37828,35 +37828,35 @@ function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
                                       ],
                                       tl: trace
                                     }, rest1, rest2, cstrs) : ({
-                                    hd: [
-                                      trace,
-                                      build_fields(repr(f1).level)(miss1, rest1),
-                                      rest2,
-                                      univar_pairs.contents
-                                    ],
-                                    tl: cstrs
-                                  })
+                                  hd: [
+                                    trace,
+                                    build_fields(repr(f1).level)(miss1, rest1),
+                                    rest2,
+                                    univar_pairs.contents
+                                  ],
+                                  tl: cstrs
+                                })
                             );
                           const cstrs$3 = Caml_obj.caml_equal(miss2, /* [] */0) ? cstrs$2 : ({
-                                hd: [
-                                  trace,
-                                  rest1,
-                                  build_fields(repr(f2).level)(miss2, newvar(undefined, undefined)),
-                                  univar_pairs.contents
-                                ],
-                                tl: cstrs$2
-                              });
+                              hd: [
+                                trace,
+                                rest1,
+                                build_fields(repr(f2).level)(miss2, newvar(undefined, undefined)),
+                                univar_pairs.contents
+                              ],
+                              tl: cstrs$2
+                            });
                           return Stdlib__List.fold_left((function (cstrs, param) {
-                                        const t2 = param[4];
-                                        const t1 = param[2];
-                                        return subtype_rec(env, {
-                                                    hd: [
-                                                      t1,
-                                                      t2
-                                                    ],
-                                                    tl: trace
-                                                  }, t1, t2, cstrs);
-                                      }), cstrs$3, match$4[0]);
+                                  const t2 = param[4];
+                                  const t1 = param[2];
+                                  return subtype_rec(env, {
+                                        hd: [
+                                          t1,
+                                          t2
+                                        ],
+                                        tl: trace
+                                      }, t1, t2, cstrs);
+                                }), cstrs$3, match$4[0]);
                         }
                     default:
                       exit = 1;
@@ -37901,12 +37901,12 @@ function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
                                   } else {
                                     if (same(match$6._0, match$7._0)) {
                                       return subtype_rec(env, {
-                                                  hd: [
-                                                    more1,
-                                                    more2
-                                                  ],
-                                                  tl: trace
-                                                }, more1, more2, cstrs);
+                                            hd: [
+                                              more1,
+                                              more2
+                                            ],
+                                            tl: trace
+                                          }, more1, more2, cstrs);
                                     }
                                     exit$5 = 1;
                                   }
@@ -37914,8 +37914,8 @@ function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
                               case /* Tunivar */9 :
                                   if (/* tag */typeof match$7 === "number" || typeof match$7 === "string") {
                                     throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                              MEL_EXN_ID: Stdlib.Exit
-                                            });
+                                          MEL_EXN_ID: Stdlib.Exit
+                                        });
                                   }
                                   if (match$7.TAG === /* Tunivar */9) {
                                     if (row1$1.row_closed === row2$1.row_closed && Caml_obj.caml_equal(r1, /* [] */0) && Caml_obj.caml_equal(match$5[1], /* [] */0)) {
@@ -37927,153 +37927,153 @@ function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
                                             tl: trace
                                           }, more1, more2, cstrs);
                                       return Stdlib__List.fold_left((function (cstrs, param) {
-                                                    const match = row_field_repr_aux(/* [] */0, param[1]);
-                                                    const match$1 = row_field_repr_aux(/* [] */0, param[2]);
-                                                    let t1;
-                                                    let t2;
-                                                    if (/* tag */typeof match === "number" || typeof match === "string") {
-                                                      if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                                        return cstrs;
-                                                      }
-                                                      if (match$1.TAG === /* Rpresent */0) {
-                                                        throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                  MEL_EXN_ID: Stdlib.Exit
-                                                                });
-                                                      }
+                                              const match = row_field_repr_aux(/* [] */0, param[1]);
+                                              const match$1 = row_field_repr_aux(/* [] */0, param[2]);
+                                              let t1;
+                                              let t2;
+                                              if (/* tag */typeof match === "number" || typeof match === "string") {
+                                                if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                                  return cstrs;
+                                                }
+                                                if (match$1.TAG === /* Rpresent */0) {
+                                                  throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                        MEL_EXN_ID: Stdlib.Exit
+                                                      });
+                                                }
+                                                throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                      MEL_EXN_ID: Stdlib.Exit
+                                                    });
+                                              } else if (match.TAG === /* Rpresent */0) {
+                                                const t1$1 = match._0;
+                                                if (t1$1 !== undefined) {
+                                                  if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                          MEL_EXN_ID: Stdlib.Exit
+                                                        });
+                                                  }
+                                                  if (match$1.TAG === /* Rpresent */0) {
+                                                    const t2$1 = match$1._0;
+                                                    if (t2$1 !== undefined) {
+                                                      t1 = t1$1;
+                                                      t2 = t2$1;
+                                                    } else {
                                                       throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                MEL_EXN_ID: Stdlib.Exit
-                                                              });
-                                                    } else if (match.TAG === /* Rpresent */0) {
-                                                      const t1$1 = match._0;
-                                                      if (t1$1 !== undefined) {
-                                                        if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                                          throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                    MEL_EXN_ID: Stdlib.Exit
-                                                                  });
-                                                        }
-                                                        if (match$1.TAG === /* Rpresent */0) {
-                                                          const t2$1 = match$1._0;
-                                                          if (t2$1 !== undefined) {
-                                                            t1 = t1$1;
-                                                            t2 = t2$1;
-                                                          } else {
-                                                            throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                      MEL_EXN_ID: Stdlib.Exit
-                                                                    });
-                                                          }
-                                                        } else {
-                                                          throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                    MEL_EXN_ID: Stdlib.Exit
-                                                                  });
-                                                        }
-                                                      } else {
-                                                        if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                                          throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                    MEL_EXN_ID: Stdlib.Exit
-                                                                  });
-                                                        }
-                                                        if (match$1.TAG === /* Rpresent */0) {
-                                                          if (match$1._0 !== undefined) {
-                                                            throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                      MEL_EXN_ID: Stdlib.Exit
-                                                                    });
-                                                          }
-                                                          return cstrs;
-                                                        }
-                                                        throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                  MEL_EXN_ID: Stdlib.Exit
-                                                                });
-                                                      }
-                                                    } else if (match._0) {
-                                                      if (match._1) {
-                                                        throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                  MEL_EXN_ID: Stdlib.Exit
-                                                                });
-                                                      }
-                                                      if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                                        throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                  MEL_EXN_ID: Stdlib.Exit
-                                                                });
-                                                      }
-                                                      if (match$1.TAG === /* Rpresent */0) {
-                                                        throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                  MEL_EXN_ID: Stdlib.Exit
-                                                                });
-                                                      }
-                                                      if (match$1._0) {
-                                                        if (match$1._1) {
-                                                          throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                    MEL_EXN_ID: Stdlib.Exit
-                                                                  });
-                                                        }
-                                                        return cstrs;
-                                                      }
+                                                            MEL_EXN_ID: Stdlib.Exit
+                                                          });
+                                                    }
+                                                  } else {
+                                                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                          MEL_EXN_ID: Stdlib.Exit
+                                                        });
+                                                  }
+                                                } else {
+                                                  if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                          MEL_EXN_ID: Stdlib.Exit
+                                                        });
+                                                  }
+                                                  if (match$1.TAG === /* Rpresent */0) {
+                                                    if (match$1._0 !== undefined) {
                                                       throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                MEL_EXN_ID: Stdlib.Exit
-                                                              });
-                                                    } else {
-                                                      const match$2 = match._1;
-                                                      if (match$2) {
-                                                        if (match$2.tl) {
-                                                          throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                    MEL_EXN_ID: Stdlib.Exit
-                                                                  });
-                                                        }
-                                                        if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                                          throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                    MEL_EXN_ID: Stdlib.Exit
-                                                                  });
-                                                        }
-                                                        if (match$1.TAG === /* Rpresent */0) {
-                                                          throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                    MEL_EXN_ID: Stdlib.Exit
-                                                                  });
-                                                        }
-                                                        if (match$1._0) {
-                                                          throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                    MEL_EXN_ID: Stdlib.Exit
-                                                                  });
-                                                        }
-                                                        const match$3 = match$1._1;
-                                                        if (match$3) {
-                                                          if (match$3.tl) {
-                                                            throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                      MEL_EXN_ID: Stdlib.Exit
-                                                                    });
-                                                          }
-                                                          t1 = match$2.hd;
-                                                          t2 = match$3.hd;
-                                                        } else {
-                                                          throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                    MEL_EXN_ID: Stdlib.Exit
-                                                                  });
-                                                        }
-                                                      } else {
-                                                        throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                                  MEL_EXN_ID: Stdlib.Exit
-                                                                });
-                                                      }
+                                                            MEL_EXN_ID: Stdlib.Exit
+                                                          });
                                                     }
-                                                    return subtype_rec(env, {
-                                                                hd: [
-                                                                  t1,
-                                                                  t2
-                                                                ],
-                                                                tl: trace
-                                                              }, t1, t2, cstrs);
-                                                  }), cstrs$4, pairs);
+                                                    return cstrs;
+                                                  }
+                                                  throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                        MEL_EXN_ID: Stdlib.Exit
+                                                      });
+                                                }
+                                              } else if (match._0) {
+                                                if (match._1) {
+                                                  throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                        MEL_EXN_ID: Stdlib.Exit
+                                                      });
+                                                }
+                                                if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                                  throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                        MEL_EXN_ID: Stdlib.Exit
+                                                      });
+                                                }
+                                                if (match$1.TAG === /* Rpresent */0) {
+                                                  throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                        MEL_EXN_ID: Stdlib.Exit
+                                                      });
+                                                }
+                                                if (match$1._0) {
+                                                  if (match$1._1) {
+                                                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                          MEL_EXN_ID: Stdlib.Exit
+                                                        });
+                                                  }
+                                                  return cstrs;
+                                                }
+                                                throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                      MEL_EXN_ID: Stdlib.Exit
+                                                    });
+                                              } else {
+                                                const match$2 = match._1;
+                                                if (match$2) {
+                                                  if (match$2.tl) {
+                                                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                          MEL_EXN_ID: Stdlib.Exit
+                                                        });
+                                                  }
+                                                  if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                          MEL_EXN_ID: Stdlib.Exit
+                                                        });
+                                                  }
+                                                  if (match$1.TAG === /* Rpresent */0) {
+                                                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                          MEL_EXN_ID: Stdlib.Exit
+                                                        });
+                                                  }
+                                                  if (match$1._0) {
+                                                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                          MEL_EXN_ID: Stdlib.Exit
+                                                        });
+                                                  }
+                                                  const match$3 = match$1._1;
+                                                  if (match$3) {
+                                                    if (match$3.tl) {
+                                                      throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                            MEL_EXN_ID: Stdlib.Exit
+                                                          });
+                                                    }
+                                                    t1 = match$2.hd;
+                                                    t2 = match$3.hd;
+                                                  } else {
+                                                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                          MEL_EXN_ID: Stdlib.Exit
+                                                        });
+                                                  }
+                                                } else {
+                                                  throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                        MEL_EXN_ID: Stdlib.Exit
+                                                      });
+                                                }
+                                              }
+                                              return subtype_rec(env, {
+                                                    hd: [
+                                                      t1,
+                                                      t2
+                                                    ],
+                                                    tl: trace
+                                                  }, t1, t2, cstrs);
+                                            }), cstrs$4, pairs);
                                     }
                                     throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                              MEL_EXN_ID: Stdlib.Exit
-                                            });
+                                          MEL_EXN_ID: Stdlib.Exit
+                                        });
                                   }
                                   throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                            MEL_EXN_ID: Stdlib.Exit
-                                          });
+                                        MEL_EXN_ID: Stdlib.Exit
+                                      });
                               default:
                                 throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                          MEL_EXN_ID: Stdlib.Exit
-                                        });
+                                      MEL_EXN_ID: Stdlib.Exit
+                                    });
                             }
                           }
                           if (exit$5 === 1) {
@@ -38088,100 +38088,100 @@ function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
                                     break;
                                 default:
                                   throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                            MEL_EXN_ID: Stdlib.Exit
-                                          });
+                                        MEL_EXN_ID: Stdlib.Exit
+                                      });
                               }
                             }
                             if (exit$6 === 2) {
                               if (row1$1.row_closed && Caml_obj.caml_equal(r1, /* [] */0)) {
                                 return Stdlib__List.fold_left((function (cstrs, param) {
-                                              const match = row_field_repr_aux(/* [] */0, param[1]);
-                                              const match$1 = row_field_repr_aux(/* [] */0, param[2]);
-                                              if (/* tag */typeof match === "number" || typeof match === "string") {
-                                                return cstrs;
-                                              }
-                                              if (match.TAG === /* Rpresent */0) {
-                                                const t1 = match._0;
-                                                if (t1 !== undefined) {
-                                                  if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                              MEL_EXN_ID: Stdlib.Exit
-                                                            });
-                                                  }
-                                                  if (match$1.TAG === /* Rpresent */0) {
-                                                    const t2 = match$1._0;
-                                                    if (t2 !== undefined) {
-                                                      return subtype_rec(env, {
-                                                                  hd: [
-                                                                    t1,
-                                                                    t2
-                                                                  ],
-                                                                  tl: trace
-                                                                }, t1, t2, cstrs);
-                                                    }
-                                                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                              MEL_EXN_ID: Stdlib.Exit
-                                                            });
-                                                  }
-                                                  throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                            MEL_EXN_ID: Stdlib.Exit
-                                                          });
-                                                }
-                                                
-                                              } else if (!match._0) {
-                                                const match$2 = match._1;
-                                                if (match$2) {
-                                                  const t1$1 = match$2.hd;
-                                                  if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                              MEL_EXN_ID: Stdlib.Exit
-                                                            });
-                                                  }
-                                                  if (match$1.TAG === /* Rpresent */0) {
-                                                    const t2$1 = match$1._0;
-                                                    if (t2$1 !== undefined) {
-                                                      return subtype_rec(env, {
-                                                                  hd: [
-                                                                    t1$1,
-                                                                    t2$1
-                                                                  ],
-                                                                  tl: trace
-                                                                }, t1$1, t2$1, cstrs);
-                                                    }
-                                                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                              MEL_EXN_ID: Stdlib.Exit
-                                                            });
-                                                  }
-                                                  throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                            MEL_EXN_ID: Stdlib.Exit
-                                                          });
-                                                } else {
-                                                  throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                            MEL_EXN_ID: Stdlib.Exit
-                                                          });
-                                                }
-                                              }
-                                              if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
-                                                throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                          MEL_EXN_ID: Stdlib.Exit
-                                                        });
+                                        const match = row_field_repr_aux(/* [] */0, param[1]);
+                                        const match$1 = row_field_repr_aux(/* [] */0, param[2]);
+                                        if (/* tag */typeof match === "number" || typeof match === "string") {
+                                          return cstrs;
+                                        }
+                                        if (match.TAG === /* Rpresent */0) {
+                                          const t1 = match._0;
+                                          if (t1 !== undefined) {
+                                            if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                              throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                    MEL_EXN_ID: Stdlib.Exit
+                                                  });
+                                            }
+                                            if (match$1.TAG === /* Rpresent */0) {
+                                              const t2 = match$1._0;
+                                              if (t2 !== undefined) {
+                                                return subtype_rec(env, {
+                                                      hd: [
+                                                        t1,
+                                                        t2
+                                                      ],
+                                                      tl: trace
+                                                    }, t1, t2, cstrs);
                                               }
-                                              if (match$1.TAG === /* Rpresent */0) {
-                                                if (match$1._0 !== undefined) {
-                                                  throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                            MEL_EXN_ID: Stdlib.Exit
-                                                          });
-                                                }
-                                                return cstrs;
+                                              throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                    MEL_EXN_ID: Stdlib.Exit
+                                                  });
+                                            }
+                                            throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                  MEL_EXN_ID: Stdlib.Exit
+                                                });
+                                          }
+                                          
+                                        } else if (!match._0) {
+                                          const match$2 = match._1;
+                                          if (match$2) {
+                                            const t1$1 = match$2.hd;
+                                            if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                              throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                    MEL_EXN_ID: Stdlib.Exit
+                                                  });
+                                            }
+                                            if (match$1.TAG === /* Rpresent */0) {
+                                              const t2$1 = match$1._0;
+                                              if (t2$1 !== undefined) {
+                                                return subtype_rec(env, {
+                                                      hd: [
+                                                        t1$1,
+                                                        t2$1
+                                                      ],
+                                                      tl: trace
+                                                    }, t1$1, t2$1, cstrs);
                                               }
                                               throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                                        MEL_EXN_ID: Stdlib.Exit
-                                                      });
-                                            }), cstrs, pairs);
+                                                    MEL_EXN_ID: Stdlib.Exit
+                                                  });
+                                            }
+                                            throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                  MEL_EXN_ID: Stdlib.Exit
+                                                });
+                                          } else {
+                                            throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                  MEL_EXN_ID: Stdlib.Exit
+                                                });
+                                          }
+                                        }
+                                        if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
+                                          throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                MEL_EXN_ID: Stdlib.Exit
+                                              });
+                                        }
+                                        if (match$1.TAG === /* Rpresent */0) {
+                                          if (match$1._0 !== undefined) {
+                                            throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                                  MEL_EXN_ID: Stdlib.Exit
+                                                });
+                                          }
+                                          return cstrs;
+                                        }
+                                        throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                                              MEL_EXN_ID: Stdlib.Exit
+                                            });
+                                      }), cstrs, pairs);
                               }
                               throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                        MEL_EXN_ID: Stdlib.Exit
-                                      });
+                                    MEL_EXN_ID: Stdlib.Exit
+                                  });
                             }
                             
                           }
@@ -38191,14 +38191,14 @@ function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
                           const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
                           if (exn$1.MEL_EXN_ID === Stdlib.Exit) {
                             return {
-                                    hd: [
-                                      trace,
-                                      t1$1,
-                                      t2$1,
-                                      univar_pairs.contents
-                                    ],
-                                    tl: cstrs
-                                  };
+                              hd: [
+                                trace,
+                                t1$1,
+                                t2$1,
+                                univar_pairs.contents
+                              ],
+                              tl: cstrs
+                            };
                           }
                           throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
                         }
@@ -38252,21 +38252,21 @@ function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
                           if (match$1._1) {
                             try {
                               return enter_poly(env, univar_pairs, u1$1, tl1$1, u2$1, match$1._1, (function (t1, t2) {
-                                            return subtype_rec(env, trace, t1, t2, cstrs);
-                                          }));
+                                      return subtype_rec(env, trace, t1, t2, cstrs);
+                                    }));
                             }
                             catch (raw_exn$2){
                               const exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn$2);
                               if (exn$2.MEL_EXN_ID === Unify) {
                                 return {
-                                        hd: [
-                                          trace,
-                                          t1$1,
-                                          t2$1,
-                                          univar_pairs.contents
-                                        ],
-                                        tl: cstrs
-                                      };
+                                  hd: [
+                                    trace,
+                                    t1$1,
+                                    t2$1,
+                                    univar_pairs.contents
+                                  ],
+                                  tl: cstrs
+                                };
                               }
                               throw new Caml_js_exceptions.MelangeError(exn$2.MEL_EXN_ID, exn$2);
                             }
@@ -38311,11 +38311,11 @@ function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
                               }, nl2, tl2$1);
                           const cstrs$p = Stdlib__List.map((function (param) {
                                   return [
-                                          trace,
-                                          Stdlib__List.assoc(param[0], ntl1),
-                                          param[1],
-                                          univar_pairs.contents
-                                        ];
+                                    trace,
+                                    Stdlib__List.assoc(param[0], ntl1),
+                                    param[1],
+                                    univar_pairs.contents
+                                  ];
                                 }), ntl2);
                           if (eq_package_path(env, p1, p2)) {
                             return Stdlib.$at(cstrs$p, cstrs);
@@ -38330,17 +38330,17 @@ function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
                               return Stdlib.$at(cstrs$p, cstrs);
                             }
                             throw new Caml_js_exceptions.MelangeError(Unify, {
-                                      MEL_EXN_ID: Unify,
-                                      _1: /* [] */0
-                                    });
+                                  MEL_EXN_ID: Unify,
+                                  _1: /* [] */0
+                                });
                           }
                           catch (raw_exn$3){
                             const exn$3 = Caml_js_exceptions.internalToOCamlException(raw_exn$3);
                             if (exn$3.MEL_EXN_ID === Unify) {
                               backtrack(snap);
                               throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                        MEL_EXN_ID: Stdlib.Not_found
-                                      });
+                                    MEL_EXN_ID: Stdlib.Not_found
+                                  });
                             }
                             throw new Caml_js_exceptions.MelangeError(exn$3.MEL_EXN_ID, exn$3);
                           }
@@ -38349,14 +38349,14 @@ function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
                           const exn$4 = Caml_js_exceptions.internalToOCamlException(raw_exn$4);
                           if (exn$4.MEL_EXN_ID === Stdlib.Not_found) {
                             return {
-                                    hd: [
-                                      trace,
-                                      t1$1,
-                                      t2$1,
-                                      univar_pairs.contents
-                                    ],
-                                    tl: cstrs
-                                  };
+                              hd: [
+                                trace,
+                                t1$1,
+                                t2$1,
+                                univar_pairs.contents
+                              ],
+                              tl: cstrs
+                            };
                           }
                           throw new Caml_js_exceptions.MelangeError(exn$4.MEL_EXN_ID, exn$4);
                         }
@@ -38412,67 +38412,67 @@ function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
               try {
                 const decl = find_type_full(p1$1, env)[0];
                 return Stdlib__List.fold_left2((function (cstrs, v, param) {
-                              const t2 = param[1];
-                              const t1 = param[0];
-                              const match = Curry._1(Types_Variance.get_upper, v);
-                              const cn = match[1];
-                              if (match[0]) {
-                                if (cn) {
-                                  return {
-                                          hd: [
-                                            trace,
-                                            newty2(t1.level, {
-                                                  TAG: /* Ttuple */2,
-                                                  _0: {
-                                                    hd: t1,
-                                                    tl: /* [] */0
-                                                  }
-                                                }),
-                                            newty2(t2.level, {
-                                                  TAG: /* Ttuple */2,
-                                                  _0: {
-                                                    hd: t2,
-                                                    tl: /* [] */0
-                                                  }
-                                                }),
-                                            univar_pairs.contents
-                                          ],
-                                          tl: cstrs
-                                        };
-                                } else {
-                                  return subtype_rec(env, {
-                                              hd: [
-                                                t1,
-                                                t2
-                                              ],
-                                              tl: trace
-                                            }, t1, t2, cstrs);
-                                }
-                              } else if (cn) {
-                                return subtype_rec(env, {
-                                            hd: [
-                                              t2,
-                                              t1
-                                            ],
-                                            tl: trace
-                                          }, t2, t1, cstrs);
-                              } else {
-                                return cstrs;
-                              }
-                            }), cstrs, decl.type_variance, Stdlib__List.combine(match._1, match$1._1));
+                        const t2 = param[1];
+                        const t1 = param[0];
+                        const match = Curry._1(Types_Variance.get_upper, v);
+                        const cn = match[1];
+                        if (match[0]) {
+                          if (cn) {
+                            return {
+                              hd: [
+                                trace,
+                                newty2(t1.level, {
+                                      TAG: /* Ttuple */2,
+                                      _0: {
+                                        hd: t1,
+                                        tl: /* [] */0
+                                      }
+                                    }),
+                                newty2(t2.level, {
+                                      TAG: /* Ttuple */2,
+                                      _0: {
+                                        hd: t2,
+                                        tl: /* [] */0
+                                      }
+                                    }),
+                                univar_pairs.contents
+                              ],
+                              tl: cstrs
+                            };
+                          } else {
+                            return subtype_rec(env, {
+                                  hd: [
+                                    t1,
+                                    t2
+                                  ],
+                                  tl: trace
+                                }, t1, t2, cstrs);
+                          }
+                        } else if (cn) {
+                          return subtype_rec(env, {
+                                hd: [
+                                  t2,
+                                  t1
+                                ],
+                                tl: trace
+                              }, t2, t1, cstrs);
+                        } else {
+                          return cstrs;
+                        }
+                      }), cstrs, decl.type_variance, Stdlib__List.combine(match._1, match$1._1));
               }
               catch (raw_exn$5){
                 const exn$5 = Caml_js_exceptions.internalToOCamlException(raw_exn$5);
                 if (exn$5.MEL_EXN_ID === Stdlib.Not_found) {
                   return {
-                          hd: [
-                            trace,
-                            t1$1,
-                            t2$1,
-                            univar_pairs.contents
-                          ],
-                          tl: cstrs
-                        };
+                    hd: [
+                      trace,
+                      t1$1,
+                      t2$1,
+                      univar_pairs.contents
+                    ],
+                    tl: cstrs
+                  };
                 }
                 throw new Caml_js_exceptions.MelangeError(exn$5.MEL_EXN_ID, exn$5);
               }
@@ -38492,14 +38492,14 @@ function subtype_rec(env, _trace, _t1, _t2, _cstrs) {
           case 1 :
           case 2 :
               return {
-                      hd: [
-                        trace,
-                        t1$1,
-                        t2$1,
-                        univar_pairs.contents
-                      ],
-                      tl: cstrs
-                    };
+                hd: [
+                  trace,
+                  t1$1,
+                  t2$1,
+                  univar_pairs.contents
+                ],
+                tl: cstrs
+              };
           
         }
       } else {
@@ -38524,17 +38524,17 @@ function subtype(env, ty1, ty2) {
     Stdlib__List.iter((function (param) {
             try {
               return unify_pairs({
-                          contents: env
-                        }, param[1], param[2], param[3]);
+                    contents: env
+                  }, param[1], param[2], param[3]);
             }
             catch (raw_trace){
               const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
               if (trace.MEL_EXN_ID === Unify) {
                 throw new Caml_js_exceptions.MelangeError(Subtype, {
-                          MEL_EXN_ID: Subtype,
-                          _1: expand_trace(env, Stdlib__List.rev(param[0])),
-                          _2: Stdlib__List.tl(Stdlib__List.tl(trace._1))
-                        });
+                      MEL_EXN_ID: Subtype,
+                      _1: expand_trace(env, Stdlib__List.rev(param[0])),
+                      _2: Stdlib__List.tl(Stdlib__List.tl(trace._1))
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
             }
@@ -38553,28 +38553,28 @@ function unalias_object(ty) {
         return newty2(ty$1.level, ty$1.desc);
     case /* Tconstr */3 :
         return newty2(ty$1.level, {
-                    TAG: /* Tvar */0,
-                    _0: undefined
-                  });
+              TAG: /* Tvar */0,
+              _0: undefined
+            });
     case /* Tfield */5 :
         return newty2(ty$1.level, {
-                    TAG: /* Tfield */5,
-                    _0: match._0,
-                    _1: match._1,
-                    _2: match._2,
-                    _3: unalias_object(match._3)
-                  });
+              TAG: /* Tfield */5,
+              _0: match._0,
+              _1: match._1,
+              _2: match._2,
+              _3: unalias_object(match._3)
+            });
     case /* Tunivar */9 :
         return ty$1;
     default:
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  34141,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              34141,
+              6
+            ]
+          });
   }
 }
 
@@ -38588,24 +38588,24 @@ function unalias(ty) {
     case /* Tobject */4 :
         const ty$2 = row._0;
         return newty2(ty$2.level, {
-                    TAG: /* Tobject */4,
-                    _0: unalias_object(ty$2),
-                    _1: row._1
-                  });
+              TAG: /* Tobject */4,
+              _0: unalias_object(ty$2),
+              _1: row._1
+            });
     case /* Tvariant */8 :
         const row$1 = row_repr_aux(/* [] */0, row._0);
         const more = row$1.row_more;
         return newty2(ty$1.level, {
-                    TAG: /* Tvariant */8,
-                    _0: {
-                      row_fields: row$1.row_fields,
-                      row_more: newty2(more.level, more.desc),
-                      row_bound: row$1.row_bound,
-                      row_closed: row$1.row_closed,
-                      row_fixed: row$1.row_fixed,
-                      row_name: row$1.row_name
-                    }
-                  });
+              TAG: /* Tvariant */8,
+              _0: {
+                row_fields: row$1.row_fields,
+                row_more: newty2(more.level, more.desc),
+                row_bound: row$1.row_bound,
+                row_closed: row$1.row_closed,
+                row_fixed: row$1.row_fixed,
+                row_name: row$1.row_name
+              }
+            });
     case /* Tvar */0 :
     case /* Tunivar */9 :
         return ty$1;
@@ -38644,9 +38644,9 @@ function cyclic_abbrev(env, id, ty) {
     }
     try {
       return check_cycle({
-                  hd: ty$1,
-                  tl: seen
-                }, expand_abbrev_opt(env, ty$1));
+            hd: ty$1,
+            tl: seen
+          }, expand_abbrev_opt(env, ty$1));
     }
     catch (raw_exn){
       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -38751,31 +38751,31 @@ function normalize_type_rec(env, visited, ty) {
                         const tyl$p = Stdlib__List.fold_left((function (tyl, ty) {
                                 if (Stdlib__List.exists((function (ty$p) {
                                           return equal$5(env, false, {
-                                                      hd: ty,
-                                                      tl: /* [] */0
-                                                    }, {
-                                                      hd: ty$p,
-                                                      tl: /* [] */0
-                                                    });
+                                                hd: ty,
+                                                tl: /* [] */0
+                                              }, {
+                                                hd: ty$p,
+                                                tl: /* [] */0
+                                              });
                                         }), tyl)) {
                                   return tyl;
                                 } else {
                                   return {
-                                          hd: ty,
-                                          tl: tyl
-                                        };
+                                    hd: ty,
+                                    tl: tyl
+                                  };
                                 }
                               }), {
                               hd: match.hd,
                               tl: /* [] */0
                             }, tyl);
                         tmp = f !== f0 || Stdlib__List.length(tyl$p) < Stdlib__List.length(tyl) ? ({
-                              TAG: /* Reither */1,
-                              _0: f._0,
-                              _1: Stdlib__List.rev(tyl$p),
-                              _2: f._2,
-                              _3: f._3
-                            }) : f;
+                            TAG: /* Reither */1,
+                            _0: f._0,
+                            _1: Stdlib__List.rev(tyl$p),
+                            _2: f._2,
+                            _3: f._3
+                          }) : f;
                       } else {
                         tmp = f;
                       }
@@ -38784,9 +38784,9 @@ function normalize_type_rec(env, visited, ty) {
                     }
                   }
                   return [
-                          param[0],
-                          tmp
-                        ];
+                    param[0],
+                    tmp
+                  ];
                 }), row$1.row_fields);
           const fields$1 = Stdlib__List.sort((function (param, param$1) {
                   return Caml.caml_string_compare(param[0], param$1[0]);
@@ -38876,13 +38876,13 @@ function nondep_type_rec(env, id, _ty) {
                       const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
                       if (exn$1.MEL_EXN_ID === Cannot_expand) {
                         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                  MEL_EXN_ID: Stdlib.Not_found
-                                });
+                              MEL_EXN_ID: Stdlib.Not_found
+                            });
                       }
                       if (exn$1.MEL_EXN_ID === Unify) {
                         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                  MEL_EXN_ID: Stdlib.Not_found
-                                });
+                              MEL_EXN_ID: Stdlib.Not_found
+                            });
                       }
                       throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
                     }
@@ -38943,19 +38943,19 @@ function nondep_type_rec(env, id, _ty) {
                             }), true, row$1, true, more$p);
                       const match$1 = row$2.row_name;
                       tmp = match$1 !== undefined && isfree(id, match$1[0]) ? ({
-                            TAG: /* Tvariant */8,
-                            _0: {
-                              row_fields: row$2.row_fields,
-                              row_more: row$2.row_more,
-                              row_bound: row$2.row_bound,
-                              row_closed: row$2.row_closed,
-                              row_fixed: row$2.row_fixed,
-                              row_name: undefined
-                            }
-                          }) : ({
-                            TAG: /* Tvariant */8,
-                            _0: row$2
-                          });
+                          TAG: /* Tvariant */8,
+                          _0: {
+                            row_fields: row$2.row_fields,
+                            row_more: row$2.row_more,
+                            row_bound: row$2.row_bound,
+                            row_closed: row$2.row_closed,
+                            row_fixed: row$2.row_fixed,
+                            row_name: undefined
+                          }
+                        }) : ({
+                          TAG: /* Tvariant */8,
+                          _0: row$2
+                        });
                     } else {
                       throw new Caml_js_exceptions.MelangeError(exn$2.MEL_EXN_ID, exn$2);
                     }
@@ -38967,8 +38967,8 @@ function nondep_type_rec(env, id, _ty) {
                     const p$p = normalize_package_path(env, p$2);
                     if (isfree(id, p$p)) {
                       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                MEL_EXN_ID: Stdlib.Not_found
-                              });
+                            MEL_EXN_ID: Stdlib.Not_found
+                          });
                     }
                     tmp = {
                       TAG: /* Tpackage */11,
@@ -39014,8 +39014,8 @@ function nondep_type(env, id, ty) {
       Curry._1(TypeHash.clear, nondep_hash);
       Curry._1(TypeHash.clear, nondep_variants);
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -39058,33 +39058,33 @@ function nondep_type_decl(env, mid, id, is_covariant, decl) {
           cstrs === /* Type_abstract */0 ? /* Type_abstract */0 : /* Type_open */1
         ) : (
           cstrs.TAG === /* Type_record */0 ? ({
-                TAG: /* Type_record */0,
-                _0: Stdlib__List.map((function (l) {
-                        return {
-                                ld_id: l.ld_id,
-                                ld_mutable: l.ld_mutable,
-                                ld_type: nondep_type_rec(env, mid, l.ld_type),
-                                ld_loc: l.ld_loc,
-                                ld_attributes: l.ld_attributes
-                              };
-                      }), cstrs._0),
-                _1: cstrs._1
-              }) : ({
-                TAG: /* Type_variant */1,
-                _0: Stdlib__List.map((function (c) {
-                        return {
-                                cd_id: c.cd_id,
-                                cd_args: Stdlib__List.map((function (param) {
-                                        return nondep_type_rec(env, mid, param);
-                                      }), c.cd_args),
-                                cd_res: may_map((function (param) {
-                                        return nondep_type_rec(env, mid, param);
-                                      }), c.cd_res),
-                                cd_loc: c.cd_loc,
-                                cd_attributes: c.cd_attributes
-                              };
-                      }), cstrs._0)
-              })
+              TAG: /* Type_record */0,
+              _0: Stdlib__List.map((function (l) {
+                      return {
+                        ld_id: l.ld_id,
+                        ld_mutable: l.ld_mutable,
+                        ld_type: nondep_type_rec(env, mid, l.ld_type),
+                        ld_loc: l.ld_loc,
+                        ld_attributes: l.ld_attributes
+                      };
+                    }), cstrs._0),
+              _1: cstrs._1
+            }) : ({
+              TAG: /* Type_variant */1,
+              _0: Stdlib__List.map((function (c) {
+                      return {
+                        cd_id: c.cd_id,
+                        cd_args: Stdlib__List.map((function (param) {
+                                return nondep_type_rec(env, mid, param);
+                              }), c.cd_args),
+                        cd_res: may_map((function (param) {
+                                return nondep_type_rec(env, mid, param);
+                              }), c.cd_res),
+                        cd_loc: c.cd_loc,
+                        cd_attributes: c.cd_attributes
+                      };
+                    }), cstrs._0)
+            })
         );
     }
     catch (raw_exn){
@@ -39120,16 +39120,16 @@ function nondep_type_decl(env, mid, id, is_covariant, decl) {
     Curry._1(TypeHash.clear, nondep_variants);
     const priv = tm !== undefined && has_constr_row(tm) ? /* Private */0 : decl.type_private;
     return {
-            type_params: params,
-            type_arity: decl.type_arity,
-            type_kind: tk,
-            type_private: priv,
-            type_manifest: tm,
-            type_variance: decl.type_variance,
-            type_newtype_level: undefined,
-            type_loc: decl.type_loc,
-            type_attributes: decl.type_attributes
-          };
+      type_params: params,
+      type_arity: decl.type_arity,
+      type_kind: tk,
+      type_private: priv,
+      type_manifest: tm,
+      type_variance: decl.type_variance,
+      type_newtype_level: undefined,
+      type_loc: decl.type_loc,
+      type_attributes: decl.type_attributes
+    };
   }
   catch (raw_exn$2){
     const exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn$2);
@@ -39137,8 +39137,8 @@ function nondep_type_decl(env, mid, id, is_covariant, decl) {
       Curry._1(TypeHash.clear, nondep_hash);
       Curry._1(TypeHash.clear, nondep_variants);
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn$2.MEL_EXN_ID, exn$2);
   }
@@ -39160,8 +39160,8 @@ function nondep_extension_constructor(env, mid, ext) {
       const match$1 = repr(ty$p).desc;
       if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
       }
       if (match$1.TAG === /* Tconstr */3) {
         match = [
@@ -39170,8 +39170,8 @@ function nondep_extension_constructor(env, mid, ext) {
         ];
       } else {
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
       }
     } else {
       const type_params = Stdlib__List.map((function (param) {
@@ -39191,14 +39191,14 @@ function nondep_extension_constructor(env, mid, ext) {
     Curry._1(TypeHash.clear, nondep_hash);
     Curry._1(TypeHash.clear, nondep_variants);
     return {
-            ext_type_path: match[0],
-            ext_type_params: match[1],
-            ext_args: args,
-            ext_ret_type: ret_type,
-            ext_private: ext.ext_private,
-            ext_loc: ext.ext_loc,
-            ext_attributes: ext.ext_attributes
-          };
+      ext_type_path: match[0],
+      ext_type_params: match[1],
+      ext_args: args,
+      ext_ret_type: ret_type,
+      ext_private: ext.ext_private,
+      ext_loc: ext.ext_loc,
+      ext_attributes: ext.ext_attributes
+    };
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -39206,8 +39206,8 @@ function nondep_extension_constructor(env, mid, ext) {
       Curry._1(TypeHash.clear, nondep_hash);
       Curry._1(TypeHash.clear, nondep_variants);
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -39215,24 +39215,24 @@ function nondep_extension_constructor(env, mid, ext) {
 
 function nondep_class_signature(env, id, sign) {
   return {
-          csig_self: nondep_type_rec(env, id, sign.csig_self),
-          csig_vars: Curry._2(Meths.map, (function (param) {
-                  return [
-                          param[0],
-                          param[1],
-                          nondep_type_rec(env, id, param[2])
-                        ];
-                }), sign.csig_vars),
-          csig_concr: sign.csig_concr,
-          csig_inher: Stdlib__List.map((function (param) {
-                  return [
-                          param[0],
-                          Stdlib__List.map((function (param) {
-                                  return nondep_type_rec(env, id, param);
-                                }), param[1])
-                        ];
-                }), sign.csig_inher)
-        };
+    csig_self: nondep_type_rec(env, id, sign.csig_self),
+    csig_vars: Curry._2(Meths.map, (function (param) {
+            return [
+              param[0],
+              param[1],
+              nondep_type_rec(env, id, param[2])
+            ];
+          }), sign.csig_vars),
+    csig_concr: sign.csig_concr,
+    csig_inher: Stdlib__List.map((function (param) {
+            return [
+              param[0],
+              Stdlib__List.map((function (param) {
+                      return nondep_type_rec(env, id, param);
+                    }), param[1])
+            ];
+          }), sign.csig_inher)
+  };
 }
 
 function nondep_class_type(env, id, _sign) {
@@ -39243,28 +39243,28 @@ function nondep_class_type(env, id, _sign) {
           const p = sign._0;
           if (!isfree(id, p)) {
             return {
-                    TAG: /* Cty_constr */0,
-                    _0: p,
-                    _1: Stdlib__List.map((function (param) {
-                            return nondep_type_rec(env, id, param);
-                          }), sign._1),
-                    _2: nondep_class_type(env, id, sign._2)
-                  };
+              TAG: /* Cty_constr */0,
+              _0: p,
+              _1: Stdlib__List.map((function (param) {
+                      return nondep_type_rec(env, id, param);
+                    }), sign._1),
+              _2: nondep_class_type(env, id, sign._2)
+            };
           }
           _sign = sign._2;
           continue ;
       case /* Cty_signature */1 :
           return {
-                  TAG: /* Cty_signature */1,
-                  _0: nondep_class_signature(env, id, sign._0)
-                };
+            TAG: /* Cty_signature */1,
+            _0: nondep_class_signature(env, id, sign._0)
+          };
       case /* Cty_arrow */2 :
           return {
-                  TAG: /* Cty_arrow */2,
-                  _0: sign._0,
-                  _1: nondep_type_rec(env, id, sign._1),
-                  _2: nondep_class_type(env, id, sign._2)
-                };
+            TAG: /* Cty_arrow */2,
+            _0: sign._0,
+            _1: nondep_type_rec(env, id, sign._1),
+            _2: nondep_class_type(env, id, sign._2)
+          };
       
     }
   };
@@ -39273,13 +39273,13 @@ function nondep_class_type(env, id, _sign) {
 function nondep_class_declaration(env, id, decl) {
   if (isfree(id, decl.cty_path)) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                34461,
-                2
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            34461,
+            2
+          ]
+        });
   }
   const ty = decl.cty_new;
   const decl$1 = {
@@ -39301,13 +39301,13 @@ function nondep_class_declaration(env, id, decl) {
 function nondep_cltype_declaration(env, id, decl) {
   if (isfree(id, decl.clty_path)) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                34480,
-                2
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            34480,
+            2
+          ]
+        });
   }
   const decl_clty_params = Stdlib__List.map((function (param) {
           return nondep_type_rec(env, id, param);
@@ -39342,13 +39342,13 @@ function collapse_conj(env, visited, ty) {
   const row = ty$1.desc;
   if (/* tag */typeof row === "number" || typeof row === "string") {
     return iter_type_expr((function (param) {
-                  return collapse_conj(env, visited$1, param);
-                }), ty$1);
+            return collapse_conj(env, visited$1, param);
+          }), ty$1);
   }
   if (row.TAG !== /* Tvariant */8) {
     return iter_type_expr((function (param) {
-                  return collapse_conj(env, visited$1, param);
-                }), ty$1);
+            return collapse_conj(env, visited$1, param);
+          }), ty$1);
   }
   const row$1 = row_repr_aux(/* [] */0, row._0);
   Stdlib__List.iter((function (param) {
@@ -39403,24 +39403,24 @@ function print_ident(ppf, s) {
   switch (s.TAG) {
     case /* Oide_apply */0 :
         return Curry._4(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Alpha */15,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '(' */40,
+                      _1: {
+                        TAG: /* Alpha */15,
                         _0: {
-                          TAG: /* Alpha */15,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '(' */40,
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ')' */41,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
-                        },
-                        _1: "%a(%a)"
-                      }), print_ident, s._0, print_ident, s._1);
+                          TAG: /* Char_literal */12,
+                          _0: /* ')' */41,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    }
+                  },
+                  _1: "%a(%a)"
+                }), print_ident, s._0, print_ident, s._1);
     case /* Oide_dot */1 :
         print_ident(ppf, s._0);
         Stdlib__Format.pp_print_char(ppf, /* '.' */46);
@@ -39476,22 +39476,22 @@ function parenthesized_ident(name) {
 function value_ident(ppf, name) {
   if (parenthesized_ident(name)) {
     return Curry._1(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "( ",
-                      _1: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
-                          TAG: /* String_literal */11,
-                          _0: " )",
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "( %s )"
-                  }), name);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "( ",
+                _1: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* String_literal */11,
+                    _0: " )",
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "( %s )"
+            }), name);
   } else {
     return Stdlib__Format.pp_print_string(ppf, name);
   }
@@ -39516,68 +39516,68 @@ function print_list(pr, sep, ppf, _param) {
 
 function pr_present(param, param$1) {
   return print_list((function (ppf, s) {
-                Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '`' */96,
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          },
-                          _1: "`%s"
-                        }), s);
-              }), (function (ppf) {
-                Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* Formatting_lit */17,
-                        _0: {
-                          TAG: /* Break */0,
-                          _0: "@ ",
-                          _1: 1,
-                          _2: 0
-                        },
+          Curry._1(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '`' */96,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
                         _1: /* End_of_format */0
-                      },
-                      _1: "@ "
-                    });
-              }), param, param$1);
+                      }
+                    },
+                    _1: "`%s"
+                  }), s);
+        }), (function (ppf) {
+          Stdlib__Format.fprintf(ppf)({
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Formatting_lit */17,
+                  _0: {
+                    TAG: /* Break */0,
+                    _0: "@ ",
+                    _1: 1,
+                    _2: 0
+                  },
+                  _1: /* End_of_format */0
+                },
+                _1: "@ "
+              });
+        }), param, param$1);
 }
 
 function pr_vars(param, param$1) {
   return print_list((function (ppf, s) {
-                Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '\'' */39,
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          },
-                          _1: "'%s"
-                        }), s);
-              }), (function (ppf) {
-                Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* Formatting_lit */17,
-                        _0: {
-                          TAG: /* Break */0,
-                          _0: "@ ",
-                          _1: 1,
-                          _2: 0
-                        },
+          Curry._1(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '\'' */39,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
                         _1: /* End_of_format */0
-                      },
-                      _1: "@ "
-                    });
-              }), param, param$1);
+                      }
+                    },
+                    _1: "'%s"
+                  }), s);
+        }), (function (ppf) {
+          Stdlib__Format.fprintf(ppf)({
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Formatting_lit */17,
+                  _0: {
+                    TAG: /* Break */0,
+                    _0: "@ ",
+                    _1: 1,
+                    _2: 0
+                  },
+                  _1: /* End_of_format */0
+                },
+                _1: "@ "
+              });
+        }), param, param$1);
 }
 
 function print_out_type(ppf, ty) {
@@ -39587,89 +39587,89 @@ function print_out_type(ppf, ty) {
   switch (ty.TAG) {
     case /* Otyp_alias */0 :
         return Curry._3(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: {
+                        TAG: /* Formatting_lit */17,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: "as '",
                           _1: {
-                            TAG: /* Alpha */15,
-                            _0: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
+                            _1: {
                               TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: "as '",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: /* Close_box */0,
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              _0: /* Close_box */0,
+                              _1: /* End_of_format */0
                             }
                           }
-                        },
-                        _1: "@[%a@ as '%s@]"
-                      }), print_out_type, ty._0, ty._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[%a@ as '%s@]"
+                }), print_out_type, ty._0, ty._1);
     case /* Otyp_poly */12 :
         return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<hov 2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hov 2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: {
+                        TAG: /* Char_literal */12,
+                        _0: /* '.' */46,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hov 2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hov 2>"
-                            }
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
                           },
                           _1: {
                             TAG: /* Alpha */15,
                             _0: {
-                              TAG: /* Char_literal */12,
-                              _0: /* '.' */46,
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
-                                _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: /* Close_box */0,
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* Formatting_lit */17,
+                              _0: /* Close_box */0,
+                              _1: /* End_of_format */0
                             }
                           }
-                        },
-                        _1: "@[<hov 2>%a.@ %a@]"
-                      }), pr_vars, ty._0, print_out_type, ty._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hov 2>%a.@ %a@]"
+                }), pr_vars, ty._0, print_out_type, ty._1);
     default:
       return print_out_type_1(ppf, ty);
   }
@@ -39700,34 +39700,34 @@ function print_out_type_2(ppf, tyl) {
     return print_simple_out_type(ppf, tyl);
   } else {
     return Curry._2(Stdlib__Format.fprintf(ppf)({
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_gen */18,
+                _0: {
+                  TAG: /* Open_box */1,
+                  _0: {
                     TAG: /* Format */0,
                     _0: {
-                      TAG: /* Formatting_gen */18,
-                      _0: {
-                        TAG: /* Open_box */1,
-                        _0: {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "<0>",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "<0>"
-                        }
-                      },
-                      _1: {
-                        TAG: /* Alpha */15,
-                        _0: {
-                          TAG: /* Formatting_lit */17,
-                          _0: /* Close_box */0,
-                          _1: /* End_of_format */0
-                        }
-                      }
+                      TAG: /* String_literal */11,
+                      _0: "<0>",
+                      _1: /* End_of_format */0
                     },
-                    _1: "@[<0>%a@]"
-                  }), (function (param, param$1) {
-                  return print_typlist(print_simple_out_type, " *", param, param$1);
-                }), tyl._0);
+                    _1: "<0>"
+                  }
+                },
+                _1: {
+                  TAG: /* Alpha */15,
+                  _0: {
+                    TAG: /* Formatting_lit */17,
+                    _0: /* Close_box */0,
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "@[<0>%a@]"
+            }), (function (param, param$1) {
+            return print_typlist(print_simple_out_type, " *", param, param$1);
+          }), tyl._0);
   }
 }
 
@@ -39738,39 +39738,39 @@ function print_simple_out_type(ppf, s) {
   switch (s.TAG) {
     case /* Otyp_class */2 :
         return Curry._5(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* '#' */35,
                           _1: {
                             TAG: /* Alpha */15,
                             _0: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* '#' */35,
-                                _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: /* Close_box */0,
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* Formatting_lit */17,
+                              _0: /* Close_box */0,
+                              _1: /* End_of_format */0
                             }
                           }
-                        },
-                        _1: "@[%a%s#%a@]"
-                      }), print_typargs, s._2, s._0 ? "_" : "", print_ident, s._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[%a%s#%a@]"
+                }), print_typargs, s._2, s._0 ? "_" : "", print_ident, s._1);
     case /* Otyp_constr */3 :
         const id = s._0;
         let exit = 0;
@@ -39837,42 +39837,42 @@ function print_simple_out_type(ppf, s) {
                                     if (!/* tag */(typeof single === "number" || typeof single === "string") && single.TAG === /* Otyp_tuple */9) {
                                       if (tys.tl) {
                                         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                                  MEL_EXN_ID: Stdlib.Not_found
-                                                });
+                                              MEL_EXN_ID: Stdlib.Not_found
+                                            });
                                       }
                                       if (variant === "Arity_1") {
                                         return {
-                                                TAG: /* Otyp_arrow */1,
-                                                _0: "",
-                                                _1: single,
-                                                _2: result
-                                              };
+                                          TAG: /* Otyp_arrow */1,
+                                          _0: "",
+                                          _1: single,
+                                          _2: result
+                                        };
                                       } else {
                                         return Stdlib__List.fold_right((function (x, acc) {
-                                                      return {
-                                                              TAG: /* Otyp_arrow */1,
-                                                              _0: "",
-                                                              _1: x,
-                                                              _2: acc
-                                                            };
-                                                    }), single._0, result);
+                                                return {
+                                                  TAG: /* Otyp_arrow */1,
+                                                  _0: "",
+                                                  _1: x,
+                                                  _2: acc
+                                                };
+                                              }), single._0, result);
                                       }
                                     }
                                     if (tys.tl) {
                                       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                                MEL_EXN_ID: Stdlib.Not_found
-                                              });
+                                            MEL_EXN_ID: Stdlib.Not_found
+                                          });
                                     }
                                     return {
-                                            TAG: /* Otyp_arrow */1,
-                                            _0: "",
-                                            _1: single,
-                                            _2: result
-                                          };
+                                      TAG: /* Otyp_arrow */1,
+                                      _0: "",
+                                      _1: single,
+                                      _2: result
+                                    };
                                   }
                                   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                            MEL_EXN_ID: Stdlib.Not_found
-                                          });
+                                        MEL_EXN_ID: Stdlib.Not_found
+                                      });
                                 };
                                 let exit$3 = 0;
                                 let res;
@@ -39888,60 +39888,60 @@ function print_simple_out_type(ppf, s) {
                                 }
                                 if (exit$3 === 5) {
                                   return Curry._2(Stdlib__Format.fprintf(ppf)({
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* Formatting_gen */18,
+                                              _0: {
+                                                TAG: /* Open_box */1,
+                                                _0: {
                                                   TAG: /* Format */0,
                                                   _0: {
-                                                    TAG: /* Formatting_gen */18,
+                                                    TAG: /* String_literal */11,
+                                                    _0: "<0>",
+                                                    _1: /* End_of_format */0
+                                                  },
+                                                  _1: "<0>"
+                                                }
+                                              },
+                                              _1: {
+                                                TAG: /* Char_literal */12,
+                                                _0: /* '(' */40,
+                                                _1: {
+                                                  TAG: /* Alpha */15,
+                                                  _0: {
+                                                    TAG: /* Formatting_lit */17,
                                                     _0: {
-                                                      TAG: /* Open_box */1,
-                                                      _0: {
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "<0>",
-                                                          _1: /* End_of_format */0
-                                                        },
-                                                        _1: "<0>"
-                                                      }
+                                                      TAG: /* Break */0,
+                                                      _0: "@ ",
+                                                      _1: 1,
+                                                      _2: 0
                                                     },
                                                     _1: {
                                                       TAG: /* Char_literal */12,
-                                                      _0: /* '(' */40,
+                                                      _0: /* '[' */91,
                                                       _1: {
-                                                        TAG: /* Alpha */15,
+                                                        TAG: /* Formatting_lit */17,
                                                         _0: {
-                                                          TAG: /* Formatting_lit */17,
-                                                          _0: {
-                                                            TAG: /* Break */0,
-                                                            _0: "@ ",
-                                                            _1: 1,
-                                                            _2: 0
-                                                          },
+                                                          TAG: /* Scan_indic */2,
+                                                          _0: /* 'm' */109
+                                                        },
+                                                        _1: {
+                                                          TAG: /* String_literal */11,
+                                                          _0: "el.this])",
                                                           _1: {
-                                                            TAG: /* Char_literal */12,
-                                                            _0: /* '[' */91,
-                                                            _1: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Scan_indic */2,
-                                                                _0: /* 'm' */109
-                                                              },
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "el.this])",
-                                                                _1: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: /* Close_box */0,
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            }
+                                                            TAG: /* Formatting_lit */17,
+                                                            _0: /* Close_box */0,
+                                                            _1: /* End_of_format */0
                                                           }
                                                         }
                                                       }
                                                     }
-                                                  },
-                                                  _1: "@[<0>(%a@ [@mel.this])@]"
-                                                }), print_out_type_1, res);
+                                                  }
+                                                }
+                                              }
+                                            },
+                                            _1: "@[<0>(%a@ [@mel.this])@]"
+                                          }), print_out_type_1, res);
                                 }
                                 
                               } else {
@@ -39979,60 +39979,60 @@ function print_simple_out_type(ppf, s) {
                             const make$1 = function (tys, result) {
                               if (Caml_obj.caml_equal(tys, /* [] */0)) {
                                 return {
-                                        TAG: /* Otyp_arrow */1,
-                                        _0: "",
-                                        _1: {
-                                          TAG: /* Otyp_constr */3,
-                                          _0: {
-                                            TAG: /* Oide_ident */2,
-                                            _0: "unit"
-                                          },
-                                          _1: /* [] */0
-                                        },
-                                        _2: result
-                                      };
+                                  TAG: /* Otyp_arrow */1,
+                                  _0: "",
+                                  _1: {
+                                    TAG: /* Otyp_constr */3,
+                                    _0: {
+                                      TAG: /* Oide_ident */2,
+                                      _0: "unit"
+                                    },
+                                    _1: /* [] */0
+                                  },
+                                  _2: result
+                                };
                               }
                               if (tys) {
                                 const single = tys.hd;
                                 if (!/* tag */(typeof single === "number" || typeof single === "string") && single.TAG === /* Otyp_tuple */9) {
                                   if (tys.tl) {
                                     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                              MEL_EXN_ID: Stdlib.Not_found
-                                            });
+                                          MEL_EXN_ID: Stdlib.Not_found
+                                        });
                                   }
                                   if (variant$1 === "Arity_1") {
                                     return {
-                                            TAG: /* Otyp_arrow */1,
-                                            _0: "",
-                                            _1: single,
-                                            _2: result
-                                          };
+                                      TAG: /* Otyp_arrow */1,
+                                      _0: "",
+                                      _1: single,
+                                      _2: result
+                                    };
                                   } else {
                                     return Stdlib__List.fold_right((function (x, acc) {
-                                                  return {
-                                                          TAG: /* Otyp_arrow */1,
-                                                          _0: "",
-                                                          _1: x,
-                                                          _2: acc
-                                                        };
-                                                }), single._0, result);
+                                            return {
+                                              TAG: /* Otyp_arrow */1,
+                                              _0: "",
+                                              _1: x,
+                                              _2: acc
+                                            };
+                                          }), single._0, result);
                                   }
                                 }
                                 if (tys.tl) {
                                   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                            MEL_EXN_ID: Stdlib.Not_found
-                                          });
+                                        MEL_EXN_ID: Stdlib.Not_found
+                                      });
                                 }
                                 return {
-                                        TAG: /* Otyp_arrow */1,
-                                        _0: "",
-                                        _1: single,
-                                        _2: result
-                                      };
+                                  TAG: /* Otyp_arrow */1,
+                                  _0: "",
+                                  _1: single,
+                                  _2: result
+                                };
                               }
                               throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                        MEL_EXN_ID: Stdlib.Not_found
-                                      });
+                                    MEL_EXN_ID: Stdlib.Not_found
+                                  });
                             };
                             let exit$4 = 0;
                             let res$1;
@@ -40050,125 +40050,125 @@ function print_simple_out_type(ppf, s) {
                               switch (name) {
                                 case "fn" :
                                     return Curry._2(Stdlib__Format.fprintf(ppf)({
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* Formatting_gen */18,
+                                                _0: {
+                                                  TAG: /* Open_box */1,
+                                                  _0: {
                                                     TAG: /* Format */0,
                                                     _0: {
-                                                      TAG: /* Formatting_gen */18,
+                                                      TAG: /* String_literal */11,
+                                                      _0: "<0>",
+                                                      _1: /* End_of_format */0
+                                                    },
+                                                    _1: "<0>"
+                                                  }
+                                                },
+                                                _1: {
+                                                  TAG: /* Char_literal */12,
+                                                  _0: /* '(' */40,
+                                                  _1: {
+                                                    TAG: /* Alpha */15,
+                                                    _0: {
+                                                      TAG: /* Formatting_lit */17,
                                                       _0: {
-                                                        TAG: /* Open_box */1,
-                                                        _0: {
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "<0>",
-                                                            _1: /* End_of_format */0
-                                                          },
-                                                          _1: "<0>"
-                                                        }
+                                                        TAG: /* Break */0,
+                                                        _0: "@ ",
+                                                        _1: 1,
+                                                        _2: 0
                                                       },
                                                       _1: {
                                                         TAG: /* Char_literal */12,
-                                                        _0: /* '(' */40,
+                                                        _0: /* '[' */91,
                                                         _1: {
-                                                          TAG: /* Alpha */15,
+                                                          TAG: /* Formatting_lit */17,
                                                           _0: {
-                                                            TAG: /* Formatting_lit */17,
-                                                            _0: {
-                                                              TAG: /* Break */0,
-                                                              _0: "@ ",
-                                                              _1: 1,
-                                                              _2: 0
-                                                            },
+                                                            TAG: /* Scan_indic */2,
+                                                            _0: /* 'u' */117
+                                                          },
+                                                          _1: {
+                                                            TAG: /* String_literal */11,
+                                                            _0: "])",
                                                             _1: {
-                                                              TAG: /* Char_literal */12,
-                                                              _0: /* '[' */91,
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Scan_indic */2,
-                                                                  _0: /* 'u' */117
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "])",
-                                                                  _1: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: /* Close_box */0,
-                                                                    _1: /* End_of_format */0
-                                                                  }
-                                                                }
-                                                              }
+                                                              TAG: /* Formatting_lit */17,
+                                                              _0: /* Close_box */0,
+                                                              _1: /* End_of_format */0
                                                             }
                                                           }
                                                         }
                                                       }
-                                                    },
-                                                    _1: "@[<0>(%a@ [@u])@]"
-                                                  }), print_out_type_1, res$1);
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              _1: "@[<0>(%a@ [@u])@]"
+                                            }), print_out_type_1, res$1);
                                 case "meth" :
                                     return Curry._2(Stdlib__Format.fprintf(ppf)({
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* Formatting_gen */18,
+                                                _0: {
+                                                  TAG: /* Open_box */1,
+                                                  _0: {
                                                     TAG: /* Format */0,
                                                     _0: {
-                                                      TAG: /* Formatting_gen */18,
+                                                      TAG: /* String_literal */11,
+                                                      _0: "<0>",
+                                                      _1: /* End_of_format */0
+                                                    },
+                                                    _1: "<0>"
+                                                  }
+                                                },
+                                                _1: {
+                                                  TAG: /* Char_literal */12,
+                                                  _0: /* '(' */40,
+                                                  _1: {
+                                                    TAG: /* Alpha */15,
+                                                    _0: {
+                                                      TAG: /* Formatting_lit */17,
                                                       _0: {
-                                                        TAG: /* Open_box */1,
-                                                        _0: {
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "<0>",
-                                                            _1: /* End_of_format */0
-                                                          },
-                                                          _1: "<0>"
-                                                        }
+                                                        TAG: /* Break */0,
+                                                        _0: "@ ",
+                                                        _1: 1,
+                                                        _2: 0
                                                       },
                                                       _1: {
                                                         TAG: /* Char_literal */12,
-                                                        _0: /* '(' */40,
+                                                        _0: /* '[' */91,
                                                         _1: {
-                                                          TAG: /* Alpha */15,
+                                                          TAG: /* Formatting_lit */17,
                                                           _0: {
-                                                            TAG: /* Formatting_lit */17,
-                                                            _0: {
-                                                              TAG: /* Break */0,
-                                                              _0: "@ ",
-                                                              _1: 1,
-                                                              _2: 0
-                                                            },
+                                                            TAG: /* Scan_indic */2,
+                                                            _0: /* 'm' */109
+                                                          },
+                                                          _1: {
+                                                            TAG: /* String_literal */11,
+                                                            _0: "el.meth])",
                                                             _1: {
-                                                              TAG: /* Char_literal */12,
-                                                              _0: /* '[' */91,
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Scan_indic */2,
-                                                                  _0: /* 'm' */109
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "el.meth])",
-                                                                  _1: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: /* Close_box */0,
-                                                                    _1: /* End_of_format */0
-                                                                  }
-                                                                }
-                                                              }
+                                                              TAG: /* Formatting_lit */17,
+                                                              _0: /* Close_box */0,
+                                                              _1: /* End_of_format */0
                                                             }
                                                           }
                                                         }
                                                       }
-                                                    },
-                                                    _1: "@[<0>(%a@ [@mel.meth])@]"
-                                                  }), print_out_type_1, res$1);
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              _1: "@[<0>(%a@ [@mel.meth])@]"
+                                            }), print_out_type_1, res$1);
                                 default:
                                   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                            MEL_EXN_ID: "Assert_failure",
-                                            _1: [
-                                              "jscomp/test/ocaml_typedtree_test.ml",
-                                              34910,
-                                              17
-                                            ]
-                                          });
+                                        MEL_EXN_ID: "Assert_failure",
+                                        _1: [
+                                          "jscomp/test/ocaml_typedtree_test.ml",
+                                          34910,
+                                          17
+                                        ]
+                                      });
                               }
                             }
                             
@@ -40205,229 +40205,229 @@ function print_simple_out_type(ppf, s) {
     case /* Otyp_object */5 :
         const rest = s._1;
         return Curry._2(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<2>"
-                            }
-                          },
+                          TAG: /* String_literal */11,
+                          _0: "<2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "< ",
+                      _1: {
+                        TAG: /* Alpha */15,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: " >",
                           _1: {
-                            TAG: /* String_literal */11,
-                            _0: "< ",
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: " >",
-                                _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "@[<2>< %a >@]"
-                      }), (function (param, param$1) {
-                      return print_fields(rest, param, param$1);
-                    }), s._0);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<2>< %a >@]"
+                }), (function (param, param$1) {
+                return print_fields(rest, param, param$1);
+              }), s._0);
     case /* Otyp_stuff */7 :
         return Stdlib__Format.pp_print_string(ppf, s._0);
     case /* Otyp_var */10 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '\'' */39,
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "'%s%s"
-                      }), s._0 ? "_" : "", s._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '\'' */39,
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "'%s%s"
+                }), s._0 ? "_" : "", s._1);
     case /* Otyp_variant */11 :
         const tags = s._3;
         const print_present = function (ppf, l) {
           if (l !== undefined && l) {
             return Curry._2(Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@;<1 -2>",
+                          _1: 1,
+                          _2: -2
+                        },
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: "> ",
+                          _1: {
+                            TAG: /* Formatting_gen */18,
                             _0: {
-                              TAG: /* Formatting_lit */17,
+                              TAG: /* Open_box */1,
                               _0: {
-                                TAG: /* Break */0,
-                                _0: "@;<1 -2>",
-                                _1: 1,
-                                _2: -2
-                              },
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: "> ",
-                                _1: {
-                                  TAG: /* Formatting_gen */18,
-                                  _0: {
-                                    TAG: /* Open_box */1,
-                                    _0: {
-                                      TAG: /* Format */0,
-                                      _0: {
-                                        TAG: /* String_literal */11,
-                                        _0: "<hov>",
-                                        _1: /* End_of_format */0
-                                      },
-                                      _1: "<hov>"
-                                    }
-                                  },
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: /* Close_box */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* Format */0,
+                                _0: {
+                                  TAG: /* String_literal */11,
+                                  _0: "<hov>",
+                                  _1: /* End_of_format */0
+                                },
+                                _1: "<hov>"
                               }
                             },
-                            _1: "@;<1 -2>> @[<hov>%a@]"
-                          }), pr_present, l);
+                            _1: {
+                              TAG: /* Alpha */15,
+                              _0: {
+                                TAG: /* Formatting_lit */17,
+                                _0: /* Close_box */0,
+                                _1: /* End_of_format */0
+                              }
+                            }
+                          }
+                        }
+                      },
+                      _1: "@;<1 -2>> @[<hov>%a@]"
+                    }), pr_present, l);
           }
           
         };
         const print_fields$1 = function (ppf, fields) {
           if (fields.TAG === /* Ovar_fields */0) {
             return print_list(print_row_field, (function (ppf) {
-                          Stdlib__Format.fprintf(ppf)({
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@;<1 -2>",
-                                    _1: 1,
-                                    _2: -2
-                                  },
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: "| ",
-                                    _1: /* End_of_format */0
-                                  }
-                                },
-                                _1: "@;<1 -2>| "
-                              });
-                        }), ppf, fields._0);
+                    Stdlib__Format.fprintf(ppf)({
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* Formatting_lit */17,
+                            _0: {
+                              TAG: /* Break */0,
+                              _0: "@;<1 -2>",
+                              _1: 1,
+                              _2: -2
+                            },
+                            _1: {
+                              TAG: /* String_literal */11,
+                              _0: "| ",
+                              _1: /* End_of_format */0
+                            }
+                          },
+                          _1: "@;<1 -2>| "
+                        });
+                  }), ppf, fields._0);
           } else {
             return Curry._4(Stdlib__Format.fprintf(ppf)({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Formatting_gen */18,
+                        _0: {
+                          TAG: /* Open_box */1,
+                          _0: {
                             TAG: /* Format */0,
+                            _0: /* End_of_format */0,
+                            _1: ""
+                          }
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
+                          _0: {
+                            TAG: /* Alpha */15,
                             _0: {
-                              TAG: /* Formatting_gen */18,
-                              _0: {
-                                TAG: /* Open_box */1,
-                                _0: {
-                                  TAG: /* Format */0,
-                                  _0: /* End_of_format */0,
-                                  _1: ""
-                                }
-                              },
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* Alpha */15,
-                                  _0: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: /* Close_box */0,
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
-                            },
-                            _1: "@[%a%a@]"
-                          }), print_typargs, fields._1, print_ident, fields._0);
+                              TAG: /* Formatting_lit */17,
+                              _0: /* Close_box */0,
+                              _1: /* End_of_format */0
+                            }
+                          }
+                        }
+                      },
+                      _1: "@[%a%a@]"
+                    }), print_typargs, fields._1, print_ident, fields._0);
           }
         };
         return Curry._6(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '[' */91,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Formatting_gen */18,
+                          _0: {
+                            TAG: /* Open_box */1,
+                            _0: {
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "<hv>",
+                                _1: /* End_of_format */0
+                              },
+                              _1: "<hv>"
+                            }
+                          },
                           _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '[' */91,
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Formatting_gen */18,
+                            TAG: /* Formatting_gen */18,
+                            _0: {
+                              TAG: /* Open_box */1,
+                              _0: {
+                                TAG: /* Format */0,
                                 _0: {
-                                  TAG: /* Open_box */1,
-                                  _0: {
-                                    TAG: /* Format */0,
-                                    _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: "<hv>",
-                                      _1: /* End_of_format */0
-                                    },
-                                    _1: "<hv>"
-                                  }
+                                  TAG: /* String_literal */11,
+                                  _0: "<hv>",
+                                  _1: /* End_of_format */0
                                 },
+                                _1: "<hv>"
+                              }
+                            },
+                            _1: {
+                              TAG: /* Alpha */15,
+                              _0: {
+                                TAG: /* Formatting_lit */17,
+                                _0: /* Close_box */0,
                                 _1: {
-                                  TAG: /* Formatting_gen */18,
+                                  TAG: /* Alpha */15,
                                   _0: {
-                                    TAG: /* Open_box */1,
-                                    _0: {
-                                      TAG: /* Format */0,
-                                      _0: {
-                                        TAG: /* String_literal */11,
-                                        _0: "<hv>",
-                                        _1: /* End_of_format */0
-                                      },
-                                      _1: "<hv>"
-                                    }
-                                  },
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
+                                    TAG: /* String_literal */11,
+                                    _0: " ]",
+                                    _1: {
                                       TAG: /* Formatting_lit */17,
                                       _0: /* Close_box */0,
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: {
-                                          TAG: /* String_literal */11,
-                                          _0: " ]",
-                                          _1: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: /* Close_box */0,
-                                            _1: /* End_of_format */0
-                                          }
-                                        }
-                                      }
+                                      _1: /* End_of_format */0
                                     }
                                   }
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "%s[%s@[<hv>@[<hv>%a@]%a ]@]"
-                      }), s._0 ? "_" : "", s._2 ? (
-                      tags === undefined ? " " : "< "
-                    ) : (
-                      tags === undefined ? "> " : "? "
-                    ), print_fields$1, s._1, print_present, tags);
+                        }
+                      }
+                    }
+                  },
+                  _1: "%s[%s@[<hv>@[<hv>%a@]%a ]@]"
+                }), s._0 ? "_" : "", s._2 ? (
+                tags === undefined ? " " : "< "
+              ) : (
+                tags === undefined ? "> " : "? "
+              ), print_fields$1, s._1, print_present, tags);
     case /* Otyp_alias */0 :
     case /* Otyp_arrow */1 :
     case /* Otyp_tuple */9 :
@@ -40497,18 +40497,18 @@ function print_simple_out_type(ppf, s) {
                         }), sep, s, print_out_type, t);
               }), s._1, s._2);
         return Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Char_literal */12,
-                      _0: /* ')' */41,
-                      _1: {
-                        TAG: /* Formatting_lit */17,
-                        _0: /* Close_box */0,
-                        _1: /* End_of_format */0
-                      }
-                    },
-                    _1: ")@]"
-                  });
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char_literal */12,
+                _0: /* ')' */41,
+                _1: {
+                  TAG: /* Formatting_lit */17,
+                  _0: /* Close_box */0,
+                  _1: /* End_of_format */0
+                }
+              },
+              _1: ")@]"
+            });
     default:
       return ;
   }
@@ -40525,18 +40525,18 @@ function print_fields(rest, ppf, _param) {
     if (!param) {
       if (rest !== undefined) {
         return Curry._1(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "..",
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "%s.."
-                      }), rest ? "_" : "");
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "..",
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "%s.."
+                }), rest ? "_" : "");
       } else {
         return ;
       }
@@ -40545,39 +40545,39 @@ function print_fields(rest, ppf, _param) {
     const s = match[0];
     if (param.tl) {
       return Curry._5(Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* String_literal */11,
+                    _0: " : ",
+                    _1: {
+                      TAG: /* Alpha */15,
                       _0: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
+                        TAG: /* Char_literal */12,
+                        _0: /* ';' */59,
                         _1: {
-                          TAG: /* String_literal */11,
-                          _0: " : ",
+                          TAG: /* Formatting_lit */17,
+                          _0: {
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
                           _1: {
                             TAG: /* Alpha */15,
-                            _0: {
-                              TAG: /* Char_literal */12,
-                              _0: /* ';' */59,
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
-                                _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: /* End_of_format */0
-                                }
-                              }
-                            }
+                            _0: /* End_of_format */0
                           }
                         }
-                      },
-                      _1: "%s : %a;@ %a"
-                    }), s, print_out_type, match[1], (function (param, param$1) {
-                    return print_fields(rest, param, param$1);
-                  }), param.tl);
+                      }
+                    }
+                  }
+                },
+                _1: "%s : %a;@ %a"
+              }), s, print_out_type, match[1], (function (param, param$1) {
+              return print_fields(rest, param, param$1);
+            }), param.tl);
     }
     Curry._3(Stdlib__Format.fprintf(ppf)({
               TAG: /* Format */0,
@@ -40626,61 +40626,61 @@ function print_row_field(ppf, param) {
   const pr_of = function (ppf) {
     if (opt_amp) {
       return Stdlib__Format.fprintf(ppf)({
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* String_literal */11,
-                    _0: " of",
-                    _1: {
-                      TAG: /* Formatting_lit */17,
-                      _0: {
-                        TAG: /* Break */0,
-                        _0: "@ ",
-                        _1: 1,
-                        _2: 0
-                      },
-                      _1: {
-                        TAG: /* Char_literal */12,
-                        _0: /* '&' */38,
-                        _1: {
-                          TAG: /* Formatting_lit */17,
-                          _0: {
-                            TAG: /* Break */0,
-                            _0: "@ ",
-                            _1: 1,
-                            _2: 0
-                          },
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    }
-                  },
-                  _1: " of@ &@ "
-                });
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* String_literal */11,
+              _0: " of",
+              _1: {
+                TAG: /* Formatting_lit */17,
+                _0: {
+                  TAG: /* Break */0,
+                  _0: "@ ",
+                  _1: 1,
+                  _2: 0
+                },
+                _1: {
+                  TAG: /* Char_literal */12,
+                  _0: /* '&' */38,
+                  _1: {
+                    TAG: /* Formatting_lit */17,
+                    _0: {
+                      TAG: /* Break */0,
+                      _0: "@ ",
+                      _1: 1,
+                      _2: 0
+                    },
+                    _1: /* End_of_format */0
+                  }
+                }
+              }
+            },
+            _1: " of@ &@ "
+          });
     } else if (Caml_obj.caml_notequal(tyl, /* [] */0)) {
       return Stdlib__Format.fprintf(ppf)({
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* String_literal */11,
-                    _0: " of",
-                    _1: {
-                      TAG: /* Formatting_lit */17,
-                      _0: {
-                        TAG: /* Break */0,
-                        _0: "@ ",
-                        _1: 1,
-                        _2: 0
-                      },
-                      _1: /* End_of_format */0
-                    }
-                  },
-                  _1: " of@ "
-                });
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* String_literal */11,
+              _0: " of",
+              _1: {
+                TAG: /* Formatting_lit */17,
+                _0: {
+                  TAG: /* Break */0,
+                  _0: "@ ",
+                  _1: 1,
+                  _2: 0
+                },
+                _1: /* End_of_format */0
+              }
+            },
+            _1: " of@ "
+          });
     } else {
       return Stdlib__Format.fprintf(ppf)({
-                  TAG: /* Format */0,
-                  _0: /* End_of_format */0,
-                  _1: ""
-                });
+            TAG: /* Format */0,
+            _0: /* End_of_format */0,
+            _1: ""
+          });
     }
   };
   Curry._4(Stdlib__Format.fprintf(ppf)({
@@ -40787,61 +40787,61 @@ function type_parameter(ppf, param) {
 function print_out_class_params(ppf, tyl) {
   if (tyl) {
     return Curry._2(Stdlib__Format.fprintf(ppf)({
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_gen */18,
+                _0: {
+                  TAG: /* Open_box */1,
+                  _0: {
                     TAG: /* Format */0,
                     _0: {
-                      TAG: /* Formatting_gen */18,
-                      _0: {
-                        TAG: /* Open_box */1,
-                        _0: {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "<1>",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "<1>"
-                        }
-                      },
+                      TAG: /* String_literal */11,
+                      _0: "<1>",
+                      _1: /* End_of_format */0
+                    },
+                    _1: "<1>"
+                  }
+                },
+                _1: {
+                  TAG: /* Char_literal */12,
+                  _0: /* '[' */91,
+                  _1: {
+                    TAG: /* Alpha */15,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ']' */93,
                       _1: {
-                        TAG: /* Char_literal */12,
-                        _0: /* '[' */91,
+                        TAG: /* Formatting_lit */17,
+                        _0: /* Close_box */0,
                         _1: {
-                          TAG: /* Alpha */15,
+                          TAG: /* Formatting_lit */17,
                           _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ']' */93,
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: /* Close_box */0,
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
+                          _1: /* End_of_format */0
                         }
                       }
-                    },
-                    _1: "@[<1>[%a]@]@ "
-                  }), (function (param, param$1) {
-                  return print_list(type_parameter, (function (ppf) {
-                                Stdlib__Format.fprintf(ppf)({
-                                      TAG: /* Format */0,
-                                      _0: {
-                                        TAG: /* String_literal */11,
-                                        _0: ", ",
-                                        _1: /* End_of_format */0
-                                      },
-                                      _1: ", "
-                                    });
-                              }), param, param$1);
-                }), tyl);
+                    }
+                  }
+                }
+              },
+              _1: "@[<1>[%a]@]@ "
+            }), (function (param, param$1) {
+            return print_list(type_parameter, (function (ppf) {
+                    Stdlib__Format.fprintf(ppf)({
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* String_literal */11,
+                            _0: ", ",
+                            _1: /* End_of_format */0
+                          },
+                          _1: ", "
+                        });
+                  }), param, param$1);
+          }), tyl);
   }
   
 }
@@ -40902,20 +40902,62 @@ function print_out_class_type(ppf, param) {
                 }), tyl);
         };
         return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: {
+                        TAG: /* Alpha */15,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
+                          TAG: /* Formatting_lit */17,
+                          _0: /* Close_box */0,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[%a%a@]"
+                }), pr_tyl, param._1, print_ident, param._0);
+    case /* Octy_arrow */1 :
+        const lab = param._0;
+        return Curry._5(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
+                        TAG: /* Format */0,
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* Alpha */15,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: " ->",
                           _1: {
-                            TAG: /* Alpha */15,
+                            TAG: /* Formatting_lit */17,
                             _0: {
+                              TAG: /* Break */0,
+                              _0: "@ ",
+                              _1: 1,
+                              _2: 0
+                            },
+                            _1: {
                               TAG: /* Alpha */15,
                               _0: {
                                 TAG: /* Formatting_lit */17,
@@ -40924,14 +40966,26 @@ function print_out_class_type(ppf, param) {
                               }
                             }
                           }
-                        },
-                        _1: "@[%a%a@]"
-                      }), pr_tyl, param._1, print_ident, param._0);
-    case /* Octy_arrow */1 :
-        const lab = param._0;
-        return Curry._5(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[%s%a ->@ %a@]"
+                }), lab !== "" ? lab + ":" : "", print_out_type_2, param._1, print_out_class_type, param._2);
+    case /* Octy_signature */2 :
+        const pr_param = function (ppf, ty) {
+          if (ty !== undefined) {
+            return Curry._2(Stdlib__Format.fprintf(ppf)({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Formatting_lit */17,
                         _0: {
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
+                        },
+                        _1: {
                           TAG: /* Formatting_gen */18,
                           _0: {
                             TAG: /* Open_box */1,
@@ -40942,174 +40996,120 @@ function print_out_class_type(ppf, param) {
                             }
                           },
                           _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
+                            TAG: /* Char_literal */12,
+                            _0: /* '(' */40,
                             _1: {
                               TAG: /* Alpha */15,
                               _0: {
-                                TAG: /* String_literal */11,
-                                _0: " ->",
+                                TAG: /* Char_literal */12,
+                                _0: /* ')' */41,
                                 _1: {
                                   TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@ ",
-                                    _1: 1,
-                                    _2: 0
-                                  },
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: /* Close_box */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
+                                  _0: /* Close_box */0,
+                                  _1: /* End_of_format */0
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[%s%a ->@ %a@]"
-                      }), lab !== "" ? lab + ":" : "", print_out_type_2, param._1, print_out_class_type, param._2);
-    case /* Octy_signature */2 :
-        const pr_param = function (ppf, ty) {
-          if (ty !== undefined) {
-            return Curry._2(Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* Formatting_gen */18,
-                                _0: {
-                                  TAG: /* Open_box */1,
-                                  _0: {
-                                    TAG: /* Format */0,
-                                    _0: /* End_of_format */0,
-                                    _1: ""
-                                  }
-                                },
-                                _1: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* '(' */40,
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* ')' */41,
-                                      _1: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            _1: "@ @[(%a)@]"
-                          }), out_type.contents, ty);
+                        }
+                      },
+                      _1: "@ @[(%a)@]"
+                    }), out_type.contents, ty);
           }
           
         };
         return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<hv 2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hv 2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
+                          TAG: /* Format */0,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hv 2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hv 2>"
-                            }
+                            TAG: /* String_literal */11,
+                            _0: "<2>",
+                            _1: /* End_of_format */0
                           },
-                          _1: {
-                            TAG: /* Formatting_gen */18,
-                            _0: {
-                              TAG: /* Open_box */1,
-                              _0: {
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "<2>",
-                                  _1: /* End_of_format */0
-                                },
-                                _1: "<2>"
-                              }
-                            },
+                          _1: "<2>"
+                        }
+                      },
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "object",
+                        _1: {
+                          TAG: /* Alpha */15,
+                          _0: {
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
                             _1: {
-                              TAG: /* String_literal */11,
-                              _0: "object",
+                              TAG: /* Formatting_lit */17,
+                              _0: {
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
+                              },
                               _1: {
                                 TAG: /* Alpha */15,
                                 _0: {
                                   TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
+                                  _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@;<1 -2>",
+                                    _1: 1,
+                                    _2: -2
+                                  },
                                   _1: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@ ",
-                                      _1: 1,
-                                      _2: 0
-                                    },
+                                    TAG: /* String_literal */11,
+                                    _0: "end",
                                     _1: {
-                                      TAG: /* Alpha */15,
-                                      _0: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: {
-                                          TAG: /* Break */0,
-                                          _0: "@;<1 -2>",
-                                          _1: 1,
-                                          _2: -2
-                                        },
-                                        _1: {
-                                          TAG: /* String_literal */11,
-                                          _0: "end",
-                                          _1: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: /* Close_box */0,
-                                            _1: /* End_of_format */0
-                                          }
-                                        }
-                                      }
+                                      TAG: /* Formatting_lit */17,
+                                      _0: /* Close_box */0,
+                                      _1: /* End_of_format */0
                                     }
                                   }
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[<hv 2>@[<2>object%a@]@ %a@;<1 -2>end@]"
-                      }), pr_param, param._0, (function (param, param$1) {
-                      return print_list(print_out_class_sig_item, (function (ppf) {
-                                    Stdlib__Format.fprintf(ppf)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: {
-                                              TAG: /* Break */0,
-                                              _0: "@ ",
-                                              _1: 1,
-                                              _2: 0
-                                            },
-                                            _1: /* End_of_format */0
-                                          },
-                                          _1: "@ "
-                                        });
-                                  }), param, param$1);
-                    }), param._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hv 2>@[<2>object%a@]@ %a@;<1 -2>end@]"
+                }), pr_param, param._0, (function (param, param$1) {
+                return print_list(print_out_class_sig_item, (function (ppf) {
+                        Stdlib__Format.fprintf(ppf)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* Formatting_lit */17,
+                                _0: {
+                                  TAG: /* Break */0,
+                                  _0: "@ ",
+                                  _1: 1,
+                                  _2: 0
+                                },
+                                _1: /* End_of_format */0
+                              },
+                              _1: "@ "
+                            });
+                      }), param, param$1);
+              }), param._1);
     
   }
 }
@@ -41118,166 +41118,166 @@ function print_out_class_sig_item(ppf, param) {
   switch (param.TAG) {
     case /* Ocsg_constraint */0 :
         return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<2>"
-                            }
-                          },
+                          TAG: /* String_literal */11,
+                          _0: "<2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "constraint ",
+                      _1: {
+                        TAG: /* Alpha */15,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: " =",
                           _1: {
-                            TAG: /* String_literal */11,
-                            _0: "constraint ",
+                            TAG: /* Formatting_lit */17,
+                            _0: {
+                              TAG: /* Break */0,
+                              _0: "@ ",
+                              _1: 1,
+                              _2: 0
+                            },
                             _1: {
                               TAG: /* Alpha */15,
                               _0: {
-                                TAG: /* String_literal */11,
-                                _0: " =",
-                                _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@ ",
-                                    _1: 1,
-                                    _2: 0
-                                  },
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: /* Close_box */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* Formatting_lit */17,
+                                _0: /* Close_box */0,
+                                _1: /* End_of_format */0
                               }
                             }
                           }
-                        },
-                        _1: "@[<2>constraint %a =@ %a@]"
-                      }), out_type.contents, param._0, out_type.contents, param._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<2>constraint %a =@ %a@]"
+                }), out_type.contents, param._0, out_type.contents, param._1);
     case /* Ocsg_method */1 :
         return Curry._5(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<2>"
-                            }
-                          },
+                          TAG: /* String_literal */11,
+                          _0: "<2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "method ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
                           _1: {
-                            TAG: /* String_literal */11,
-                            _0: "method ",
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                              TAG: /* String_literal */11,
+                              _0: " :",
                               _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
+                                TAG: /* Formatting_lit */17,
+                                _0: {
+                                  TAG: /* Break */0,
+                                  _0: "@ ",
+                                  _1: 1,
+                                  _2: 0
+                                },
                                 _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " :",
-                                    _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: /* Close_box */0,
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
+                                  TAG: /* Alpha */15,
+                                  _0: {
+                                    TAG: /* Formatting_lit */17,
+                                    _0: /* Close_box */0,
+                                    _1: /* End_of_format */0
                                   }
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[<2>method %s%s%s :@ %a@]"
-                      }), param._1 ? "private " : "", param._2 ? "virtual " : "", param._0, out_type.contents, param._3);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<2>method %s%s%s :@ %a@]"
+                }), param._1 ? "private " : "", param._2 ? "virtual " : "", param._0, out_type.contents, param._3);
     case /* Ocsg_value */2 :
         return Curry._5(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<2>"
-                            }
-                          },
+                          TAG: /* String_literal */11,
+                          _0: "<2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "val ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
                           _1: {
-                            TAG: /* String_literal */11,
-                            _0: "val ",
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                              TAG: /* String_literal */11,
+                              _0: " :",
                               _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
+                                TAG: /* Formatting_lit */17,
+                                _0: {
+                                  TAG: /* Break */0,
+                                  _0: "@ ",
+                                  _1: 1,
+                                  _2: 0
+                                },
                                 _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " :",
-                                    _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: /* Close_box */0,
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
+                                  TAG: /* Alpha */15,
+                                  _0: {
+                                    TAG: /* Formatting_lit */17,
+                                    _0: /* Close_box */0,
+                                    _1: /* End_of_format */0
                                   }
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[<2>val %s%s%s :@ %a@]"
-                      }), param._1 ? "mutable " : "", param._2 ? "virtual " : "", param._0, out_type.contents, param._3);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<2>val %s%s%s :@ %a@]"
+                }), param._1 ? "mutable " : "", param._2 ? "virtual " : "", param._0, out_type.contents, param._3);
     
   }
 }
@@ -41289,36 +41289,36 @@ const out_class_type = {
 const out_module_type = {
   contents: (function (param) {
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: "Oprint.out_module_type"
-              });
+            MEL_EXN_ID: "Failure",
+            _1: "Oprint.out_module_type"
+          });
     })
 };
 
 const out_sig_item = {
   contents: (function (param) {
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: "Oprint.out_sig_item"
-              });
+            MEL_EXN_ID: "Failure",
+            _1: "Oprint.out_sig_item"
+          });
     })
 };
 
 const out_signature = {
   contents: (function (param) {
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: "Oprint.out_signature"
-              });
+            MEL_EXN_ID: "Failure",
+            _1: "Oprint.out_signature"
+          });
     })
 };
 
 const out_type_extension = {
   contents: (function (param) {
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: "Oprint.out_type_extension"
-              });
+            MEL_EXN_ID: "Failure",
+            _1: "Oprint.out_type_extension"
+          });
     })
 };
 
@@ -41327,45 +41327,45 @@ function print_out_functor(ppf, m) {
     const mty_arg = m._1;
     if (mty_arg !== undefined) {
       return Curry._5(Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* Char_literal */12,
-                        _0: /* '(' */40,
-                        _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Char_literal */12,
+                  _0: /* '(' */40,
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: " : ",
+                      _1: {
+                        TAG: /* Alpha */15,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: ") ",
                           _1: {
-                            TAG: /* String_literal */11,
-                            _0: " : ",
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: ") ",
-                                _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Alpha */15,
+                            _0: /* End_of_format */0
                           }
                         }
-                      },
-                      _1: "(%s : %a) %a"
-                    }), m._0, print_out_module_type, mty_arg, print_out_functor, m._2);
+                      }
+                    }
+                  }
+                },
+                _1: "(%s : %a) %a"
+              }), m._0, print_out_module_type, mty_arg, print_out_functor, m._2);
     } else {
       return Curry._2(Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "() ",
-                        _1: {
-                          TAG: /* Alpha */15,
-                          _0: /* End_of_format */0
-                        }
-                      },
-                      _1: "() %a"
-                    }), print_out_functor, m._2);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "() ",
+                  _1: {
+                    TAG: /* Alpha */15,
+                    _0: /* End_of_format */0
+                  }
+                },
+                _1: "() %a"
+              }), print_out_functor, m._2);
     }
   }
   Curry._2(Stdlib__Format.fprintf(ppf)({
@@ -41398,125 +41398,125 @@ function print_out_module_type(ppf, t) {
   switch (t.TAG) {
     case /* Omty_functor */0 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "functor",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<2>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "functor",
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "@[<2>functor@ %a@]"
-                      }), print_out_functor, t);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<2>functor@ %a@]"
+                }), print_out_functor, t);
     case /* Omty_ident */1 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Alpha */15,
-                          _0: /* End_of_format */0
-                        },
-                        _1: "%a"
-                      }), print_ident, t._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Alpha */15,
+                    _0: /* End_of_format */0
+                  },
+                  _1: "%a"
+                }), print_ident, t._0);
     case /* Omty_signature */2 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<hv 2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hv 2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "sig",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Open_box */1,
+                            TAG: /* Formatting_lit */17,
                             _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hv 2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hv 2>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "sig",
+                              TAG: /* Break */0,
+                              _0: "@;<1 -2>",
+                              _1: 1,
+                              _2: -2
+                            },
                             _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
+                              TAG: /* String_literal */11,
+                              _0: "end",
                               _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@;<1 -2>",
-                                    _1: 1,
-                                    _2: -2
-                                  },
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: "end",
-                                    _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: /* Close_box */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* Formatting_lit */17,
+                                _0: /* Close_box */0,
+                                _1: /* End_of_format */0
                               }
                             }
                           }
-                        },
-                        _1: "@[<hv 2>sig@ %a@;<1 -2>end@]"
-                      }), out_signature.contents, t._0);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hv 2>sig@ %a@;<1 -2>end@]"
+                }), out_signature.contents, t._0);
     case /* Omty_alias */3 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "(module ",
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: {
-                              TAG: /* Char_literal */12,
-                              _0: /* ')' */41,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "(module %a)"
-                      }), print_ident, t._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "(module ",
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: {
+                        TAG: /* Char_literal */12,
+                        _0: /* ')' */41,
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "(module %a)"
+                }), print_ident, t._0);
     
   }
 }
@@ -41528,151 +41528,151 @@ function print_out_constr(ppf, param) {
   if (ret_type_opt !== undefined) {
     if (tyl) {
       return Curry._5(Stdlib__Format.fprintf(ppf)({
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Formatting_gen */18,
+                  _0: {
+                    TAG: /* Open_box */1,
+                    _0: {
                       TAG: /* Format */0,
                       _0: {
-                        TAG: /* Formatting_gen */18,
+                        TAG: /* String_literal */11,
+                        _0: "<2>",
+                        _1: /* End_of_format */0
+                      },
+                      _1: "<2>"
+                    }
+                  },
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: " :",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
                         _0: {
-                          TAG: /* Open_box */1,
-                          _0: {
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: "<2>",
-                              _1: /* End_of_format */0
-                            },
-                            _1: "<2>"
-                          }
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
                         },
                         _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
+                          TAG: /* Alpha */15,
+                          _0: {
                             TAG: /* String_literal */11,
-                            _0: " :",
+                            _0: " -> ",
                             _1: {
-                              TAG: /* Formatting_lit */17,
+                              TAG: /* Alpha */15,
                               _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: " -> ",
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: /* Close_box */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* Formatting_lit */17,
+                                _0: /* Close_box */0,
+                                _1: /* End_of_format */0
                               }
                             }
                           }
                         }
-                      },
-                      _1: "@[<2>%s :@ %a -> %a@]"
-                    }), name, (function (param, param$1) {
-                    return print_typlist(print_simple_out_type, " *", param, param$1);
-                  }), tyl, print_simple_out_type, ret_type_opt);
+                      }
+                    }
+                  }
+                },
+                _1: "@[<2>%s :@ %a -> %a@]"
+              }), name, (function (param, param$1) {
+              return print_typlist(print_simple_out_type, " *", param, param$1);
+            }), tyl, print_simple_out_type, ret_type_opt);
     } else {
       return Curry._3(Stdlib__Format.fprintf(ppf)({
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Formatting_gen */18,
+                  _0: {
+                    TAG: /* Open_box */1,
+                    _0: {
                       TAG: /* Format */0,
                       _0: {
-                        TAG: /* Formatting_gen */18,
+                        TAG: /* String_literal */11,
+                        _0: "<2>",
+                        _1: /* End_of_format */0
+                      },
+                      _1: "<2>"
+                    }
+                  },
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: " :",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
                         _0: {
-                          TAG: /* Open_box */1,
-                          _0: {
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: "<2>",
-                              _1: /* End_of_format */0
-                            },
-                            _1: "<2>"
-                          }
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
                         },
                         _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: " :",
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                          TAG: /* Alpha */15,
+                          _0: {
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
                         }
-                      },
-                      _1: "@[<2>%s :@ %a@]"
-                    }), name, print_simple_out_type, ret_type_opt);
+                      }
+                    }
+                  }
+                },
+                _1: "@[<2>%s :@ %a@]"
+              }), name, print_simple_out_type, ret_type_opt);
     }
   } else if (tyl) {
     return Curry._3(Stdlib__Format.fprintf(ppf)({
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_gen */18,
+                _0: {
+                  TAG: /* Open_box */1,
+                  _0: {
                     TAG: /* Format */0,
                     _0: {
-                      TAG: /* Formatting_gen */18,
+                      TAG: /* String_literal */11,
+                      _0: "<2>",
+                      _1: /* End_of_format */0
+                    },
+                    _1: "<2>"
+                  }
+                },
+                _1: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* String_literal */11,
+                    _0: " of",
+                    _1: {
+                      TAG: /* Formatting_lit */17,
                       _0: {
-                        TAG: /* Open_box */1,
-                        _0: {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "<2>",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "<2>"
-                        }
+                        TAG: /* Break */0,
+                        _0: "@ ",
+                        _1: 1,
+                        _2: 0
                       },
                       _1: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
-                          TAG: /* String_literal */11,
-                          _0: " of",
-                          _1: {
-                            TAG: /* Formatting_lit */17,
-                            _0: {
-                              TAG: /* Break */0,
-                              _0: "@ ",
-                              _1: 1,
-                              _2: 0
-                            },
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Formatting_lit */17,
-                                _0: /* Close_box */0,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
+                        TAG: /* Alpha */15,
+                        _0: {
+                          TAG: /* Formatting_lit */17,
+                          _0: /* Close_box */0,
+                          _1: /* End_of_format */0
                         }
                       }
-                    },
-                    _1: "@[<2>%s of@ %a@]"
-                  }), name, (function (param, param$1) {
-                  return print_typlist(print_simple_out_type, " *", param, param$1);
-                }), tyl);
+                    }
+                  }
+                }
+              },
+              _1: "@[<2>%s of@ %a@]"
+            }), name, (function (param, param$1) {
+            return print_typlist(print_simple_out_type, " *", param, param$1);
+          }), tyl);
   } else {
     return Stdlib__Format.pp_print_string(ppf, name);
   }
@@ -41751,16 +41751,16 @@ function print_out_signature(ppf, param) {
               const acc = _acc;
               if (!items) {
                 return [
-                        Stdlib__List.rev(acc),
-                        items
-                      ];
+                  Stdlib__List.rev(acc),
+                  items
+                ];
               }
               const match = items.hd;
               if (match.TAG !== /* Osig_typext */2) {
                 return [
-                        Stdlib__List.rev(acc),
-                        items
-                      ];
+                  Stdlib__List.rev(acc),
+                  items
+                ];
               }
               const ext = match._0;
               switch (match._1) {
@@ -41778,9 +41778,9 @@ function print_out_signature(ppf, param) {
                 case /* Oext_first */0 :
                 case /* Oext_exception */2 :
                     return [
-                            Stdlib__List.rev(acc),
-                            items
-                          ];
+                      Stdlib__List.rev(acc),
+                      items
+                    ];
                 
               }
             };
@@ -41804,25 +41804,25 @@ function print_out_signature(ppf, param) {
             otyext_private: te_otyext_private
           };
           return Curry._4(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Alpha */15,
-                            _0: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "%a@ %a"
-                        }), out_type_extension.contents, te, print_out_signature, match[1]);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Alpha */15,
+                      _0: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
+                          _0: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "%a@ %a"
+                  }), out_type_extension.contents, te, print_out_signature, match[1]);
       case /* Oext_next */1 :
       case /* Oext_exception */2 :
           break;
@@ -41855,25 +41855,38 @@ function print_out_sig_item(ppf, param) {
   switch (param.TAG) {
     case /* Osig_class */0 :
         return Curry._7(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<2>"
-                            }
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
                           },
                           _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
+                            TAG: /* Alpha */15,
+                            _0: {
                               TAG: /* String */2,
                               _0: /* No_padding */0,
                               _1: {
@@ -41885,38 +41898,22 @@ function print_out_sig_item(ppf, param) {
                                   _2: 0
                                 },
                                 _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
+                                  TAG: /* Char_literal */12,
+                                  _0: /* ':' */58,
+                                  _1: {
+                                    TAG: /* Formatting_lit */17,
+                                    _0: {
+                                      TAG: /* Break */0,
+                                      _0: "@ ",
+                                      _1: 1,
+                                      _2: 0
+                                    },
                                     _1: {
-                                      TAG: /* Formatting_lit */17,
+                                      TAG: /* Alpha */15,
                                       _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
-                                      _1: {
-                                        TAG: /* Char_literal */12,
-                                        _0: /* ':' */58,
-                                        _1: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: {
-                                            TAG: /* Break */0,
-                                            _0: "@ ",
-                                            _1: 1,
-                                            _2: 0
-                                          },
-                                          _1: {
-                                            TAG: /* Alpha */15,
-                                            _0: {
-                                              TAG: /* Formatting_lit */17,
-                                              _0: /* Close_box */0,
-                                              _1: /* End_of_format */0
-                                            }
-                                          }
-                                        }
+                                        TAG: /* Formatting_lit */17,
+                                        _0: /* Close_box */0,
+                                        _1: /* End_of_format */0
                                       }
                                     }
                                   }
@@ -41924,30 +41921,46 @@ function print_out_sig_item(ppf, param) {
                               }
                             }
                           }
-                        },
-                        _1: "@[<2>%s%s@ %a%s@ :@ %a@]"
-                      }), param._4 === /* Orec_next */2 ? "and" : "class", param._0 ? " virtual" : "", print_out_class_params, param._2, param._1, out_class_type.contents, param._3);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<2>%s%s@ %a%s@ :@ %a@]"
+                }), param._4 === /* Orec_next */2 ? "and" : "class", param._0 ? " virtual" : "", print_out_class_params, param._2, param._1, out_class_type.contents, param._3);
     case /* Osig_class_type */1 :
         return Curry._7(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<2>"
-                            }
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
                           },
                           _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
+                            TAG: /* Alpha */15,
+                            _0: {
                               TAG: /* String */2,
                               _0: /* No_padding */0,
                               _1: {
@@ -41959,38 +41972,22 @@ function print_out_sig_item(ppf, param) {
                                   _2: 0
                                 },
                                 _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
+                                  TAG: /* Char_literal */12,
+                                  _0: /* '=' */61,
+                                  _1: {
+                                    TAG: /* Formatting_lit */17,
+                                    _0: {
+                                      TAG: /* Break */0,
+                                      _0: "@ ",
+                                      _1: 1,
+                                      _2: 0
+                                    },
                                     _1: {
-                                      TAG: /* Formatting_lit */17,
+                                      TAG: /* Alpha */15,
                                       _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
-                                      _1: {
-                                        TAG: /* Char_literal */12,
-                                        _0: /* '=' */61,
-                                        _1: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: {
-                                            TAG: /* Break */0,
-                                            _0: "@ ",
-                                            _1: 1,
-                                            _2: 0
-                                          },
-                                          _1: {
-                                            TAG: /* Alpha */15,
-                                            _0: {
-                                              TAG: /* Formatting_lit */17,
-                                              _0: /* Close_box */0,
-                                              _1: /* End_of_format */0
-                                            }
-                                          }
-                                        }
+                                        TAG: /* Formatting_lit */17,
+                                        _0: /* Close_box */0,
+                                        _1: /* End_of_format */0
                                       }
                                     }
                                   }
@@ -41998,9 +41995,12 @@ function print_out_sig_item(ppf, param) {
                               }
                             }
                           }
-                        },
-                        _1: "@[<2>%s%s@ %a%s@ =@ %a@]"
-                      }), param._4 === /* Orec_next */2 ? "and" : "class type", param._0 ? " virtual" : "", print_out_class_params, param._2, param._1, out_class_type.contents, param._3);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<2>%s%s@ %a%s@ =@ %a@]"
+                }), param._4 === /* Orec_next */2 ? "and" : "class type", param._0 ? " virtual" : "", print_out_class_params, param._2, param._1, out_class_type.contents, param._3);
     case /* Osig_typext */2 :
         const ext = param._0;
         switch (param._1) {
@@ -42022,136 +42022,87 @@ function print_out_sig_item(ppf, param) {
                 if (match) {
                   if (match.tl) {
                     return Curry._3(Stdlib__Format.fprintf(ppf)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* Formatting_gen */18,
+                                _0: {
+                                  TAG: /* Open_box */1,
+                                  _0: {
                                     TAG: /* Format */0,
+                                    _0: /* End_of_format */0,
+                                    _1: ""
+                                  }
+                                },
+                                _1: {
+                                  TAG: /* Char_literal */12,
+                                  _0: /* '(' */40,
+                                  _1: {
+                                    TAG: /* Formatting_gen */18,
                                     _0: {
-                                      TAG: /* Formatting_gen */18,
+                                      TAG: /* Open_box */1,
+                                      _0: {
+                                        TAG: /* Format */0,
+                                        _0: /* End_of_format */0,
+                                        _1: ""
+                                      }
+                                    },
+                                    _1: {
+                                      TAG: /* Alpha */15,
                                       _0: {
-                                        TAG: /* Open_box */1,
-                                        _0: {
-                                          TAG: /* Format */0,
-                                          _0: /* End_of_format */0,
-                                          _1: ""
-                                        }
-                                      },
-                                      _1: {
                                         TAG: /* Char_literal */12,
-                                        _0: /* '(' */40,
+                                        _0: /* ')' */41,
                                         _1: {
-                                          TAG: /* Formatting_gen */18,
-                                          _0: {
-                                            TAG: /* Open_box */1,
-                                            _0: {
-                                              TAG: /* Format */0,
-                                              _0: /* End_of_format */0,
-                                              _1: ""
-                                            }
-                                          },
+                                          TAG: /* Formatting_lit */17,
+                                          _0: /* Close_box */0,
                                           _1: {
-                                            TAG: /* Alpha */15,
+                                            TAG: /* Formatting_lit */17,
                                             _0: {
-                                              TAG: /* Char_literal */12,
-                                              _0: /* ')' */41,
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* String */2,
+                                              _0: /* No_padding */0,
                                               _1: {
                                                 TAG: /* Formatting_lit */17,
                                                 _0: /* Close_box */0,
-                                                _1: {
-                                                  TAG: /* Formatting_lit */17,
-                                                  _0: {
-                                                    TAG: /* Break */0,
-                                                    _0: "@ ",
-                                                    _1: 1,
-                                                    _2: 0
-                                                  },
-                                                  _1: {
-                                                    TAG: /* String */2,
-                                                    _0: /* No_padding */0,
-                                                    _1: {
-                                                      TAG: /* Formatting_lit */17,
-                                                      _0: /* Close_box */0,
-                                                      _1: /* End_of_format */0
-                                                    }
-                                                  }
-                                                }
+                                                _1: /* End_of_format */0
                                               }
                                             }
                                           }
                                         }
                                       }
-                                    },
-                                    _1: "@[(@[%a)@]@ %s@]"
-                                  }), (function (param, param$1) {
-                                  return print_list(print_type_parameter, (function (ppf) {
-                                                Stdlib__Format.fprintf(ppf)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* Char_literal */12,
-                                                        _0: /* ',' */44,
-                                                        _1: {
-                                                          TAG: /* Formatting_lit */17,
-                                                          _0: {
-                                                            TAG: /* Break */0,
-                                                            _0: "@ ",
-                                                            _1: 1,
-                                                            _2: 0
-                                                          },
-                                                          _1: /* End_of_format */0
-                                                        }
-                                                      },
-                                                      _1: ",@ "
-                                                    });
-                                              }), param, param$1);
-                                }), ext.oext_type_params, ext.oext_type_name);
-                  } else {
-                    return Curry._3(Stdlib__Format.fprintf(ppf)({
-                                    TAG: /* Format */0,
-                                    _0: {
-                                      TAG: /* Formatting_gen */18,
-                                      _0: {
-                                        TAG: /* Open_box */1,
-                                        _0: {
+                                    }
+                                  }
+                                }
+                              },
+                              _1: "@[(@[%a)@]@ %s@]"
+                            }), (function (param, param$1) {
+                            return print_list(print_type_parameter, (function (ppf) {
+                                    Stdlib__Format.fprintf(ppf)({
                                           TAG: /* Format */0,
-                                          _0: /* End_of_format */0,
-                                          _1: ""
-                                        }
-                                      },
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: {
-                                          TAG: /* Formatting_lit */17,
                                           _0: {
-                                            TAG: /* Break */0,
-                                            _0: "@ ",
-                                            _1: 1,
-                                            _2: 0
-                                          },
-                                          _1: {
-                                            TAG: /* String */2,
-                                            _0: /* No_padding */0,
+                                            TAG: /* Char_literal */12,
+                                            _0: /* ',' */44,
                                             _1: {
                                               TAG: /* Formatting_lit */17,
-                                              _0: /* Close_box */0,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
                                               _1: /* End_of_format */0
                                             }
-                                          }
-                                        }
-                                      }
-                                    },
-                                    _1: "@[%a@ %s@]"
-                                  }), print_type_parameter, match.hd, ext.oext_type_name);
-                  }
-                } else {
-                  return Curry._1(Stdlib__Format.fprintf(ppf)({
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: /* End_of_format */0
-                                  },
-                                  _1: "%s"
-                                }), ext.oext_type_name);
-                }
-              };
-              return Curry._4(Stdlib__Format.fprintf(ppf)({
+                                          },
+                                          _1: ",@ "
+                                        });
+                                  }), param, param$1);
+                          }), ext.oext_type_params, ext.oext_type_name);
+                  } else {
+                    return Curry._3(Stdlib__Format.fprintf(ppf)({
                               TAG: /* Format */0,
                               _0: {
                                 TAG: /* Formatting_gen */18,
@@ -42159,89 +42110,138 @@ function print_out_sig_item(ppf, param) {
                                   TAG: /* Open_box */1,
                                   _0: {
                                     TAG: /* Format */0,
-                                    _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: "<hv 2>",
-                                      _1: /* End_of_format */0
-                                    },
-                                    _1: "<hv 2>"
+                                    _0: /* End_of_format */0,
+                                    _1: ""
                                   }
                                 },
                                 _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: "type ",
-                                  _1: {
-                                    TAG: /* Theta */16,
+                                  TAG: /* Alpha */15,
+                                  _0: {
+                                    TAG: /* Formatting_lit */17,
                                     _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: " +=",
+                                      TAG: /* Break */0,
+                                      _0: "@ ",
+                                      _1: 1,
+                                      _2: 0
+                                    },
+                                    _1: {
+                                      TAG: /* String */2,
+                                      _0: /* No_padding */0,
                                       _1: {
-                                        TAG: /* String */2,
-                                        _0: /* No_padding */0,
-                                        _1: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: {
-                                            TAG: /* Break */0,
-                                            _0: "@;<1 2>",
-                                            _1: 1,
-                                            _2: 2
-                                          },
-                                          _1: {
-                                            TAG: /* Alpha */15,
-                                            _0: {
-                                              TAG: /* Formatting_lit */17,
-                                              _0: /* Close_box */0,
-                                              _1: /* End_of_format */0
-                                            }
-                                          }
-                                        }
+                                        TAG: /* Formatting_lit */17,
+                                        _0: /* Close_box */0,
+                                        _1: /* End_of_format */0
                                       }
                                     }
                                   }
                                 }
                               },
-                              _1: "@[<hv 2>type %t +=%s@;<1 2>%a@]"
-                            }), print_extended_type, ext.oext_private === /* Private */0 ? " private" : "", print_out_constr, [
-                          ext.oext_name,
-                          ext.oext_args,
-                          ext.oext_ret_type
-                        ]);
-          case /* Oext_exception */2 :
-              return Curry._2(Stdlib__Format.fprintf(ppf)({
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* Formatting_gen */18,
-                                _0: {
-                                  TAG: /* Open_box */1,
-                                  _0: {
-                                    TAG: /* Format */0,
-                                    _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: "<2>",
-                                      _1: /* End_of_format */0
-                                    },
-                                    _1: "<2>"
-                                  }
-                                },
+                              _1: "@[%a@ %s@]"
+                            }), print_type_parameter, match.hd, ext.oext_type_name);
+                  }
+                } else {
+                  return Curry._1(Stdlib__Format.fprintf(ppf)({
+                            TAG: /* Format */0,
+                            _0: {
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
+                              _1: /* End_of_format */0
+                            },
+                            _1: "%s"
+                          }), ext.oext_type_name);
+                }
+              };
+              return Curry._4(Stdlib__Format.fprintf(ppf)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* Formatting_gen */18,
+                          _0: {
+                            TAG: /* Open_box */1,
+                            _0: {
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "<hv 2>",
+                                _1: /* End_of_format */0
+                              },
+                              _1: "<hv 2>"
+                            }
+                          },
+                          _1: {
+                            TAG: /* String_literal */11,
+                            _0: "type ",
+                            _1: {
+                              TAG: /* Theta */16,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: " +=",
                                 _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: "exception ",
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
                                   _1: {
-                                    TAG: /* Alpha */15,
+                                    TAG: /* Formatting_lit */17,
                                     _0: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: /* Close_box */0,
-                                      _1: /* End_of_format */0
+                                      TAG: /* Break */0,
+                                      _0: "@;<1 2>",
+                                      _1: 1,
+                                      _2: 2
+                                    },
+                                    _1: {
+                                      TAG: /* Alpha */15,
+                                      _0: {
+                                        TAG: /* Formatting_lit */17,
+                                        _0: /* Close_box */0,
+                                        _1: /* End_of_format */0
+                                      }
                                     }
                                   }
                                 }
+                              }
+                            }
+                          }
+                        },
+                        _1: "@[<hv 2>type %t +=%s@;<1 2>%a@]"
+                      }), print_extended_type, ext.oext_private === /* Private */0 ? " private" : "", print_out_constr, [
+                    ext.oext_name,
+                    ext.oext_args,
+                    ext.oext_ret_type
+                  ]);
+          case /* Oext_exception */2 :
+              return Curry._2(Stdlib__Format.fprintf(ppf)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* Formatting_gen */18,
+                          _0: {
+                            TAG: /* Open_box */1,
+                            _0: {
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "<2>",
+                                _1: /* End_of_format */0
                               },
-                              _1: "@[<2>exception %a@]"
-                            }), print_out_constr, [
-                          ext.oext_name,
-                          ext.oext_args,
-                          ext.oext_ret_type
-                        ]);
+                              _1: "<2>"
+                            }
+                          },
+                          _1: {
+                            TAG: /* String_literal */11,
+                            _0: "exception ",
+                            _1: {
+                              TAG: /* Alpha */15,
+                              _0: {
+                                TAG: /* Formatting_lit */17,
+                                _0: /* Close_box */0,
+                                _1: /* End_of_format */0
+                              }
+                            }
+                          }
+                        },
+                        _1: "@[<2>exception %a@]"
+                      }), print_out_constr, [
+                    ext.oext_name,
+                    ext.oext_args,
+                    ext.oext_ret_type
+                  ]);
           
         }
     case /* Osig_modtype */3 :
@@ -42249,139 +42249,139 @@ function print_out_sig_item(ppf, param) {
         let tmp = param._1;
         if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
           return Curry._1(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
                           TAG: /* Format */0,
                           _0: {
-                            TAG: /* Formatting_gen */18,
-                            _0: {
-                              TAG: /* Open_box */1,
-                              _0: {
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "<2>",
-                                  _1: /* End_of_format */0
-                                },
-                                _1: "<2>"
-                              }
-                            },
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: "module type ",
-                              _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* String_literal */11,
+                            _0: "<2>",
+                            _1: /* End_of_format */0
                           },
-                          _1: "@[<2>module type %s@]"
-                        }), name);
+                          _1: "<2>"
+                        }
+                      },
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "module type ",
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
+                          _1: {
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[<2>module type %s@]"
+                  }), name);
         } else {
           return Curry._3(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
                           TAG: /* Format */0,
                           _0: {
-                            TAG: /* Formatting_gen */18,
-                            _0: {
-                              TAG: /* Open_box */1,
+                            TAG: /* String_literal */11,
+                            _0: "<2>",
+                            _1: /* End_of_format */0
+                          },
+                          _1: "<2>"
+                        }
+                      },
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "module type ",
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
+                          _1: {
+                            TAG: /* String_literal */11,
+                            _0: " =",
+                            _1: {
+                              TAG: /* Formatting_lit */17,
                               _0: {
-                                TAG: /* Format */0,
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
+                              },
+                              _1: {
+                                TAG: /* Alpha */15,
                                 _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "<2>",
+                                  TAG: /* Formatting_lit */17,
+                                  _0: /* Close_box */0,
                                   _1: /* End_of_format */0
-                                },
-                                _1: "<2>"
-                              }
-                            },
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: "module type ",
-                              _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: " =",
-                                  _1: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@ ",
-                                      _1: 1,
-                                      _2: 0
-                                    },
-                                    _1: {
-                                      TAG: /* Alpha */15,
-                                      _0: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
                                 }
                               }
                             }
-                          },
-                          _1: "@[<2>module type %s =@ %a@]"
-                        }), name, out_module_type.contents, param._1);
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[<2>module type %s =@ %a@]"
+                  }), name, out_module_type.contents, param._1);
         }
     case /* Osig_module */4 :
         const name$1 = param._0;
         const id = param._1;
         if (!/* tag */(typeof id === "number" || typeof id === "string") && id.TAG === /* Omty_alias */3) {
           return Curry._3(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
                           TAG: /* Format */0,
                           _0: {
-                            TAG: /* Formatting_gen */18,
-                            _0: {
-                              TAG: /* Open_box */1,
+                            TAG: /* String_literal */11,
+                            _0: "<2>",
+                            _1: /* End_of_format */0
+                          },
+                          _1: "<2>"
+                        }
+                      },
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "module ",
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
+                          _1: {
+                            TAG: /* String_literal */11,
+                            _0: " =",
+                            _1: {
+                              TAG: /* Formatting_lit */17,
                               _0: {
-                                TAG: /* Format */0,
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
+                              },
+                              _1: {
+                                TAG: /* Alpha */15,
                                 _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "<2>",
+                                  TAG: /* Formatting_lit */17,
+                                  _0: /* Close_box */0,
                                   _1: /* End_of_format */0
-                                },
-                                _1: "<2>"
-                              }
-                            },
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: "module ",
-                              _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: " =",
-                                  _1: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@ ",
-                                      _1: 1,
-                                      _2: 0
-                                    },
-                                    _1: {
-                                      TAG: /* Alpha */15,
-                                      _0: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
                                 }
                               }
                             }
-                          },
-                          _1: "@[<2>module %s =@ %a@]"
-                        }), name$1, print_ident, id._0);
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[<2>module %s =@ %a@]"
+                  }), name$1, print_ident, id._0);
         }
         let tmp$1;
         switch (param._2) {
@@ -42397,57 +42397,57 @@ function print_out_sig_item(ppf, param) {
           
         }
         return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<2>"
-                            }
-                          },
+                          TAG: /* String_literal */11,
+                          _0: "<2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* Char_literal */12,
+                        _0: /* ' ' */32,
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
                           _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
+                            TAG: /* String_literal */11,
+                            _0: " :",
                             _1: {
-                              TAG: /* Char_literal */12,
-                              _0: /* ' ' */32,
+                              TAG: /* Formatting_lit */17,
+                              _0: {
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
+                              },
                               _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: " :",
-                                  _1: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@ ",
-                                      _1: 1,
-                                      _2: 0
-                                    },
-                                    _1: {
-                                      TAG: /* Alpha */15,
-                                      _0: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
+                                TAG: /* Alpha */15,
+                                _0: {
+                                  TAG: /* Formatting_lit */17,
+                                  _0: /* Close_box */0,
+                                  _1: /* End_of_format */0
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[<2>%s %s :@ %a@]"
-                      }), tmp$1, name$1, out_module_type.contents, param._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<2>%s %s :@ %a@]"
+                }), tmp$1, name$1, out_module_type.contents, param._1);
     case /* Osig_type */5 :
         let tmp$2;
         switch (param._1) {
@@ -42528,152 +42528,152 @@ function print_out_sig_item(ppf, param) {
           if (match) {
             if (match.tl) {
               return Curry._3(Stdlib__Format.fprintf(ppf)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* Formatting_gen */18,
+                          _0: {
+                            TAG: /* Open_box */1,
+                            _0: {
                               TAG: /* Format */0,
+                              _0: /* End_of_format */0,
+                              _1: ""
+                            }
+                          },
+                          _1: {
+                            TAG: /* Char_literal */12,
+                            _0: /* '(' */40,
+                            _1: {
+                              TAG: /* Formatting_gen */18,
                               _0: {
-                                TAG: /* Formatting_gen */18,
+                                TAG: /* Open_box */1,
+                                _0: {
+                                  TAG: /* Format */0,
+                                  _0: /* End_of_format */0,
+                                  _1: ""
+                                }
+                              },
+                              _1: {
+                                TAG: /* Alpha */15,
                                 _0: {
-                                  TAG: /* Open_box */1,
-                                  _0: {
-                                    TAG: /* Format */0,
-                                    _0: /* End_of_format */0,
-                                    _1: ""
-                                  }
-                                },
-                                _1: {
                                   TAG: /* Char_literal */12,
-                                  _0: /* '(' */40,
+                                  _0: /* ')' */41,
                                   _1: {
-                                    TAG: /* Formatting_gen */18,
-                                    _0: {
-                                      TAG: /* Open_box */1,
-                                      _0: {
-                                        TAG: /* Format */0,
-                                        _0: /* End_of_format */0,
-                                        _1: ""
-                                      }
-                                    },
+                                    TAG: /* Formatting_lit */17,
+                                    _0: /* Close_box */0,
                                     _1: {
-                                      TAG: /* Alpha */15,
+                                      TAG: /* Formatting_lit */17,
                                       _0: {
-                                        TAG: /* Char_literal */12,
-                                        _0: /* ')' */41,
+                                        TAG: /* Break */0,
+                                        _0: "@ ",
+                                        _1: 1,
+                                        _2: 0
+                                      },
+                                      _1: {
+                                        TAG: /* String */2,
+                                        _0: /* No_padding */0,
                                         _1: {
                                           TAG: /* Formatting_lit */17,
                                           _0: /* Close_box */0,
-                                          _1: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: {
-                                              TAG: /* Break */0,
-                                              _0: "@ ",
-                                              _1: 1,
-                                              _2: 0
-                                            },
-                                            _1: {
-                                              TAG: /* String */2,
-                                              _0: /* No_padding */0,
-                                              _1: {
-                                                TAG: /* Formatting_lit */17,
-                                                _0: /* Close_box */0,
-                                                _1: /* End_of_format */0
-                                              }
-                                            }
-                                          }
+                                          _1: /* End_of_format */0
                                         }
                                       }
                                     }
                                   }
                                 }
-                              },
-                              _1: "@[(@[%a)@]@ %s@]"
-                            }), (function (param, param$1) {
-                            return print_list(type_parameter, (function (ppf) {
-                                          Stdlib__Format.fprintf(ppf)({
-                                                TAG: /* Format */0,
-                                                _0: {
-                                                  TAG: /* Char_literal */12,
-                                                  _0: /* ',' */44,
-                                                  _1: {
-                                                    TAG: /* Formatting_lit */17,
-                                                    _0: {
-                                                      TAG: /* Break */0,
-                                                      _0: "@ ",
-                                                      _1: 1,
-                                                      _2: 0
-                                                    },
-                                                    _1: /* End_of_format */0
-                                                  }
-                                                },
-                                                _1: ",@ "
-                                              });
-                                        }), param, param$1);
-                          }), td.otype_params, td.otype_name);
-            } else {
-              return Curry._3(Stdlib__Format.fprintf(ppf)({
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* Formatting_gen */18,
-                                _0: {
-                                  TAG: /* Open_box */1,
-                                  _0: {
+                              }
+                            }
+                          }
+                        },
+                        _1: "@[(@[%a)@]@ %s@]"
+                      }), (function (param, param$1) {
+                      return print_list(type_parameter, (function (ppf) {
+                              Stdlib__Format.fprintf(ppf)({
                                     TAG: /* Format */0,
-                                    _0: /* End_of_format */0,
-                                    _1: ""
-                                  }
-                                },
-                                _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: {
-                                    TAG: /* Formatting_lit */17,
                                     _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@ ",
-                                      _1: 1,
-                                      _2: 0
-                                    },
-                                    _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
+                                      TAG: /* Char_literal */12,
+                                      _0: /* ',' */44,
                                       _1: {
                                         TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
+                                        _0: {
+                                          TAG: /* Break */0,
+                                          _0: "@ ",
+                                          _1: 1,
+                                          _2: 0
+                                        },
                                         _1: /* End_of_format */0
                                       }
-                                    }
-                                  }
-                                }
-                              },
-                              _1: "@[%a@ %s@]"
-                            }), type_parameter, match.hd, td.otype_name);
-            }
-          } else {
-            return Stdlib__Format.pp_print_string(ppf, td.otype_name);
-          }
-        };
-        const print_manifest = function (ppf, param) {
-          if (/* tag */typeof param === "number" || typeof param === "string" || param.TAG !== /* Otyp_manifest */4) {
-            return ;
-          } else {
-            return Curry._2(Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: " =",
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
+                                    },
+                                    _1: ",@ "
+                                  });
+                            }), param, param$1);
+                    }), td.otype_params, td.otype_name);
+            } else {
+              return Curry._3(Stdlib__Format.fprintf(ppf)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* Formatting_gen */18,
+                          _0: {
+                            TAG: /* Open_box */1,
+                            _0: {
+                              TAG: /* Format */0,
+                              _0: /* End_of_format */0,
+                              _1: ""
+                            }
+                          },
+                          _1: {
+                            TAG: /* Alpha */15,
+                            _0: {
+                              TAG: /* Formatting_lit */17,
+                              _0: {
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
+                              },
+                              _1: {
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
                                 _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: /* End_of_format */0
+                                  TAG: /* Formatting_lit */17,
+                                  _0: /* Close_box */0,
+                                  _1: /* End_of_format */0
                                 }
                               }
-                            },
-                            _1: " =@ %a"
-                          }), out_type.contents, param._0);
+                            }
+                          }
+                        },
+                        _1: "@[%a@ %s@]"
+                      }), type_parameter, match.hd, td.otype_name);
+            }
+          } else {
+            return Stdlib__Format.pp_print_string(ppf, td.otype_name);
+          }
+        };
+        const print_manifest = function (ppf, param) {
+          if (/* tag */typeof param === "number" || typeof param === "string" || param.TAG !== /* Otyp_manifest */4) {
+            return ;
+          } else {
+            return Curry._2(Stdlib__Format.fprintf(ppf)({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: " =",
+                        _1: {
+                          TAG: /* Formatting_lit */17,
+                          _0: {
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
+                          _1: {
+                            TAG: /* Alpha */15,
+                            _0: /* End_of_format */0
+                          }
+                        }
+                      },
+                      _1: " =@ %a"
+                    }), out_type.contents, param._0);
           }
         };
         const print_name_params = function (ppf) {
@@ -42703,14 +42703,14 @@ function print_out_sig_item(ppf, param) {
         const print_private = function (ppf, param) {
           if (param === /* Private */0) {
             return Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: " private",
-                          _1: /* End_of_format */0
-                        },
-                        _1: " private"
-                      });
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: " private",
+                    _1: /* End_of_format */0
+                  },
+                  _1: " private"
+                });
           }
           
         };
@@ -42720,51 +42720,104 @@ function print_out_sig_item(ppf, param) {
               return ;
             } else {
               return Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: " = ..",
-                            _1: /* End_of_format */0
-                          },
-                          _1: " = .."
-                        });
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: " = ..",
+                      _1: /* End_of_format */0
+                    },
+                    _1: " = .."
+                  });
             }
           }
           switch (lbls.TAG) {
             case /* Otyp_record */6 :
                 return Curry._4(Stdlib__Format.fprintf(ppf)({
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: " =",
-                                  _1: {
-                                    TAG: /* Alpha */15,
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* String_literal */11,
+                            _0: " =",
+                            _1: {
+                              TAG: /* Alpha */15,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: " {",
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: {
+                                    TAG: /* Formatting_lit */17,
                                     _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: " {",
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: {
-                                            TAG: /* Break */0,
-                                            _0: "@;<1 -2>",
-                                            _1: 1,
-                                            _2: -2
-                                          },
-                                          _1: {
-                                            TAG: /* Char_literal */12,
-                                            _0: /* '}' */125,
-                                            _1: /* End_of_format */0
-                                          }
-                                        }
-                                      }
+                                      TAG: /* Break */0,
+                                      _0: "@;<1 -2>",
+                                      _1: 1,
+                                      _2: -2
+                                    },
+                                    _1: {
+                                      TAG: /* Char_literal */12,
+                                      _0: /* '}' */125,
+                                      _1: /* End_of_format */0
                                     }
                                   }
+                                }
+                              }
+                            }
+                          },
+                          _1: " =%a {%a@;<1 -2>}"
+                        }), print_private, td.otype_private, (function (param, param$1) {
+                        const sep = function (ppf) {
+                          Stdlib__Format.fprintf(ppf)({
+                                TAG: /* Format */0,
+                                _0: {
+                                  TAG: /* Formatting_lit */17,
+                                  _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@ ",
+                                    _1: 1,
+                                    _2: 0
+                                  },
+                                  _1: /* End_of_format */0
+                                },
+                                _1: "@ "
+                              });
+                        };
+                        let _param = param$1;
+                        while(true) {
+                          const param$2 = _param;
+                          if (!param$2) {
+                            return ;
+                          }
+                          Curry._1(sep, param);
+                          Curry._2(print_out_label, param, param$2.hd);
+                          _param = param$2.tl;
+                          continue ;
+                        };
+                      }), lbls._0);
+            case /* Otyp_sum */8 :
+                return Curry._4(Stdlib__Format.fprintf(ppf)({
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* String_literal */11,
+                            _0: " =",
+                            _1: {
+                              TAG: /* Alpha */15,
+                              _0: {
+                                TAG: /* Formatting_lit */17,
+                                _0: {
+                                  TAG: /* Break */0,
+                                  _0: "@;<1 2>",
+                                  _1: 1,
+                                  _2: 2
                                 },
-                                _1: " =%a {%a@;<1 -2>}"
-                              }), print_private, td.otype_private, (function (param, param$1) {
-                              const sep = function (ppf) {
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: /* End_of_format */0
+                                }
+                              }
+                            }
+                          },
+                          _1: " =%a@;<1 2>%a"
+                        }), print_private, td.otype_private, (function (param, param$1) {
+                        return print_list(print_out_constr, (function (ppf) {
                                 Stdlib__Format.fprintf(ppf)({
                                       TAG: /* Format */0,
                                       _0: {
@@ -42775,148 +42828,95 @@ function print_out_sig_item(ppf, param) {
                                           _1: 1,
                                           _2: 0
                                         },
-                                        _1: /* End_of_format */0
+                                        _1: {
+                                          TAG: /* String_literal */11,
+                                          _0: "| ",
+                                          _1: /* End_of_format */0
+                                        }
                                       },
-                                      _1: "@ "
+                                      _1: "@ | "
                                     });
-                              };
-                              let _param = param$1;
-                              while(true) {
-                                const param$2 = _param;
-                                if (!param$2) {
-                                  return ;
-                                }
-                                Curry._1(sep, param);
-                                Curry._2(print_out_label, param, param$2.hd);
-                                _param = param$2.tl;
-                                continue ;
-                              };
-                            }), lbls._0);
-            case /* Otyp_sum */8 :
-                return Curry._4(Stdlib__Format.fprintf(ppf)({
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: " =",
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@;<1 2>",
-                                        _1: 1,
-                                        _2: 2
-                                      },
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: /* End_of_format */0
-                                      }
-                                    }
-                                  }
-                                },
-                                _1: " =%a@;<1 2>%a"
-                              }), print_private, td.otype_private, (function (param, param$1) {
-                              return print_list(print_out_constr, (function (ppf) {
-                                            Stdlib__Format.fprintf(ppf)({
-                                                  TAG: /* Format */0,
-                                                  _0: {
-                                                    TAG: /* Formatting_lit */17,
-                                                    _0: {
-                                                      TAG: /* Break */0,
-                                                      _0: "@ ",
-                                                      _1: 1,
-                                                      _2: 0
-                                                    },
-                                                    _1: {
-                                                      TAG: /* String_literal */11,
-                                                      _0: "| ",
-                                                      _1: /* End_of_format */0
-                                                    }
-                                                  },
-                                                  _1: "@ | "
-                                                });
-                                          }), param, param$1);
-                            }), lbls._0);
+                              }), param, param$1);
+                      }), lbls._0);
             default:
               return Curry._4(Stdlib__Format.fprintf(ppf)({
-                              TAG: /* Format */0,
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: " =",
+                          _1: {
+                            TAG: /* Alpha */15,
+                            _0: {
+                              TAG: /* Formatting_lit */17,
                               _0: {
-                                TAG: /* String_literal */11,
-                                _0: " =",
-                                _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@;<1 2>",
-                                      _1: 1,
-                                      _2: 2
-                                    },
-                                    _1: {
-                                      TAG: /* Alpha */15,
-                                      _0: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* Break */0,
+                                _0: "@;<1 2>",
+                                _1: 1,
+                                _2: 2
                               },
-                              _1: " =%a@;<1 2>%a"
-                            }), print_private, td.otype_private, out_type.contents, lbls);
+                              _1: {
+                                TAG: /* Alpha */15,
+                                _0: /* End_of_format */0
+                              }
+                            }
+                          }
+                        },
+                        _1: " =%a@;<1 2>%a"
+                      }), print_private, td.otype_private, out_type.contents, lbls);
           }
         };
         return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
+                          TAG: /* Format */0,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<2>"
-                            }
+                            TAG: /* String_literal */11,
+                            _0: "<hv 2>",
+                            _1: /* End_of_format */0
                           },
-                          _1: {
-                            TAG: /* Formatting_gen */18,
-                            _0: {
-                              TAG: /* Open_box */1,
-                              _0: {
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "<hv 2>",
-                                  _1: /* End_of_format */0
-                                },
-                                _1: "<hv 2>"
-                              }
-                            },
+                          _1: "<hv 2>"
+                        }
+                      },
+                      _1: {
+                        TAG: /* Theta */16,
+                        _0: {
+                          TAG: /* Alpha */15,
+                          _0: {
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
                             _1: {
                               TAG: /* Theta */16,
                               _0: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: {
-                                    TAG: /* Theta */16,
-                                    _0: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: /* Close_box */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* Formatting_lit */17,
+                                _0: /* Close_box */0,
+                                _1: /* End_of_format */0
                               }
                             }
                           }
-                        },
-                        _1: "@[<2>@[<hv 2>%t%a@]%t@]"
-                      }), print_name_params, print_out_tkind, ty, print_constraints);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<2>@[<hv 2>%t%a@]%t@]"
+                }), print_name_params, print_out_tkind, ty, print_constraints);
     case /* Osig_value */6 :
         const prims = param._2;
         const kwd = Caml_obj.caml_equal(prims, /* [] */0) ? "val" : "external";
@@ -42949,112 +42949,112 @@ function print_out_sig_item(ppf, param) {
                       _1: "@ = \"%s\""
                     }), param.hd);
             return Stdlib__List.iter((function (s) {
-                          const len = s.length;
-                          if (len >= 3 && Caml_string.get(s, 0) === /* 'B' */66 && Caml_string.get(s, 1) === /* 'S' */83 && Caml_string.get(s, 2) === /* ':' */58) {
-                            return Stdlib__Format.fprintf(ppf)({
-                                        TAG: /* Format */0,
-                                        _0: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: {
-                                            TAG: /* Break */0,
-                                            _0: "@ ",
-                                            _1: 1,
-                                            _2: 0
-                                          },
-                                          _1: {
-                                            TAG: /* String_literal */11,
-                                            _0: "\"BS-EXTERNAL\"",
-                                            _1: /* End_of_format */0
-                                          }
-                                        },
-                                        _1: "@ \"BS-EXTERNAL\""
-                                      });
-                          } else {
-                            return Curry._1(Stdlib__Format.fprintf(ppf)({
-                                            TAG: /* Format */0,
-                                            _0: {
-                                              TAG: /* Formatting_lit */17,
-                                              _0: {
-                                                TAG: /* Break */0,
-                                                _0: "@ ",
-                                                _1: 1,
-                                                _2: 0
-                                              },
-                                              _1: {
-                                                TAG: /* Char_literal */12,
-                                                _0: /* '"' */34,
-                                                _1: {
-                                                  TAG: /* String */2,
-                                                  _0: /* No_padding */0,
-                                                  _1: {
-                                                    TAG: /* Char_literal */12,
-                                                    _0: /* '"' */34,
-                                                    _1: /* End_of_format */0
-                                                  }
-                                                }
-                                              }
-                                            },
-                                            _1: "@ \"%s\""
-                                          }), s);
-                          }
-                        }), param.tl);
+                    const len = s.length;
+                    if (len >= 3 && Caml_string.get(s, 0) === /* 'B' */66 && Caml_string.get(s, 1) === /* 'S' */83 && Caml_string.get(s, 2) === /* ':' */58) {
+                      return Stdlib__Format.fprintf(ppf)({
+                            TAG: /* Format */0,
+                            _0: {
+                              TAG: /* Formatting_lit */17,
+                              _0: {
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
+                              },
+                              _1: {
+                                TAG: /* String_literal */11,
+                                _0: "\"BS-EXTERNAL\"",
+                                _1: /* End_of_format */0
+                              }
+                            },
+                            _1: "@ \"BS-EXTERNAL\""
+                          });
+                    } else {
+                      return Curry._1(Stdlib__Format.fprintf(ppf)({
+                                TAG: /* Format */0,
+                                _0: {
+                                  TAG: /* Formatting_lit */17,
+                                  _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@ ",
+                                    _1: 1,
+                                    _2: 0
+                                  },
+                                  _1: {
+                                    TAG: /* Char_literal */12,
+                                    _0: /* '"' */34,
+                                    _1: {
+                                      TAG: /* String */2,
+                                      _0: /* No_padding */0,
+                                      _1: {
+                                        TAG: /* Char_literal */12,
+                                        _0: /* '"' */34,
+                                        _1: /* End_of_format */0
+                                      }
+                                    }
+                                  }
+                                },
+                                _1: "@ \"%s\""
+                              }), s);
+                    }
+                  }), param.tl);
           }
           
         };
         return Curry._7(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* Char_literal */12,
+                        _0: /* ' ' */32,
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
+                            TAG: /* String_literal */11,
+                            _0: " :",
+                            _1: {
+                              TAG: /* Formatting_lit */17,
                               _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<2>",
-                                _1: /* End_of_format */0
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
                               },
-                              _1: "<2>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* Char_literal */12,
-                              _0: /* ' ' */32,
                               _1: {
                                 TAG: /* Alpha */15,
                                 _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: " :",
-                                  _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: {
                                     TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@ ",
-                                      _1: 1,
-                                      _2: 0
-                                    },
-                                    _1: {
-                                      TAG: /* Alpha */15,
-                                      _0: {
-                                        TAG: /* Alpha */15,
-                                        _0: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: /* Close_box */0,
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
+                                    _0: /* Close_box */0,
+                                    _1: /* End_of_format */0
                                   }
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[<2>%s %a :@ %a%a@]"
-                      }), kwd, value_ident, param._0, out_type.contents, param._1, pr_prims, prims);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<2>%s %a :@ %a%a@]"
+                }), kwd, value_ident, param._0, out_type.contents, param._1, pr_prims, prims);
     
   }
 }
@@ -43076,133 +43076,133 @@ function print_out_type_extension(ppf, te) {
     if (match) {
       if (match.tl) {
         return Curry._3(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '(' */40,
+                      _1: {
+                        TAG: /* Formatting_gen */18,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* Open_box */1,
+                          _0: {
+                            TAG: /* Format */0,
+                            _0: /* End_of_format */0,
+                            _1: ""
+                          }
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
-                          _1: {
                             TAG: /* Char_literal */12,
-                            _0: /* '(' */40,
+                            _0: /* ')' */41,
                             _1: {
-                              TAG: /* Formatting_gen */18,
-                              _0: {
-                                TAG: /* Open_box */1,
-                                _0: {
-                                  TAG: /* Format */0,
-                                  _0: /* End_of_format */0,
-                                  _1: ""
-                                }
-                              },
+                              TAG: /* Formatting_lit */17,
+                              _0: /* Close_box */0,
                               _1: {
-                                TAG: /* Alpha */15,
+                                TAG: /* Formatting_lit */17,
                                 _0: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* ')' */41,
+                                  TAG: /* Break */0,
+                                  _0: "@ ",
+                                  _1: 1,
+                                  _2: 0
+                                },
+                                _1: {
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
                                   _1: {
                                     TAG: /* Formatting_lit */17,
                                     _0: /* Close_box */0,
-                                    _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
-                                      _1: {
-                                        TAG: /* String */2,
-                                        _0: /* No_padding */0,
-                                        _1: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: /* Close_box */0,
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
+                                    _1: /* End_of_format */0
                                   }
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[(@[%a)@]@ %s@]"
-                      }), (function (param, param$1) {
-                      return print_list(print_type_parameter, (function (ppf) {
-                                    Stdlib__Format.fprintf(ppf)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* Char_literal */12,
-                                            _0: /* ',' */44,
-                                            _1: {
-                                              TAG: /* Formatting_lit */17,
-                                              _0: {
-                                                TAG: /* Break */0,
-                                                _0: "@ ",
-                                                _1: 1,
-                                                _2: 0
-                                              },
-                                              _1: /* End_of_format */0
-                                            }
-                                          },
-                                          _1: ",@ "
-                                        });
-                                  }), param, param$1);
-                    }), te.otyext_params, te.otyext_name);
-      } else {
-        return Curry._3(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[(@[%a)@]@ %s@]"
+                }), (function (param, param$1) {
+                return print_list(print_type_parameter, (function (ppf) {
+                        Stdlib__Format.fprintf(ppf)({
                               TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: {
-                              TAG: /* Formatting_lit */17,
                               _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
+                                TAG: /* Char_literal */12,
+                                _0: /* ',' */44,
                                 _1: {
                                   TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
+                                  _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@ ",
+                                    _1: 1,
+                                    _2: 0
+                                  },
                                   _1: /* End_of_format */0
                                 }
-                              }
-                            }
-                          }
+                              },
+                              _1: ",@ "
+                            });
+                      }), param, param$1);
+              }), te.otyext_params, te.otyext_name);
+      } else {
+        return Curry._3(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
+                        TAG: /* Format */0,
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
                         },
-                        _1: "@[%a@ %s@]"
-                      }), print_type_parameter, match.hd, te.otyext_name);
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
+                          _1: {
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[%a@ %s@]"
+                }), print_type_parameter, match.hd, te.otyext_name);
       }
     } else {
       return Curry._1(Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: /* End_of_format */0
-                      },
-                      _1: "%s"
-                    }), te.otyext_name);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: /* End_of_format */0
+                },
+                _1: "%s"
+              }), te.otyext_name);
     }
   };
   Curry._4(Stdlib__Format.fprintf(ppf)({
@@ -43257,25 +43257,25 @@ function print_out_type_extension(ppf, te) {
             _1: "@[<hv 2>type %t +=%s@;<1 2>%a@]"
           }), print_extended_type, te.otyext_private === /* Private */0 ? " private" : "", (function (param, param$1) {
           return print_list(print_out_constr, (function (ppf) {
-                        Stdlib__Format.fprintf(ppf)({
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
-                                _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: "| ",
-                                  _1: /* End_of_format */0
-                                }
-                              },
-                              _1: "@ | "
-                            });
-                      }), param, param$1);
+                  Stdlib__Format.fprintf(ppf)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* Formatting_lit */17,
+                          _0: {
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
+                          _1: {
+                            TAG: /* String_literal */11,
+                            _0: "| ",
+                            _1: /* End_of_format */0
+                          }
+                        },
+                        _1: "@ | "
+                      });
+                }), param, param$1);
         }), te.otyext_constructors);
 }
 
@@ -43293,41 +43293,41 @@ function longident(ppf, s) {
         return Stdlib__Format.pp_print_string(ppf, s._0);
     case /* Ldot */1 :
         return Curry._3(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Alpha */15,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '.' */46,
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "%a.%s"
-                      }), longident, s._0, s._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Alpha */15,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '.' */46,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "%a.%s"
+                }), longident, s._0, s._1);
     case /* Lapply */2 :
         return Curry._4(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Alpha */15,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '(' */40,
+                      _1: {
+                        TAG: /* Alpha */15,
                         _0: {
-                          TAG: /* Alpha */15,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '(' */40,
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ')' */41,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
-                        },
-                        _1: "%a(%a)"
-                      }), longident, s._0, longident, s._1);
+                          TAG: /* Char_literal */12,
+                          _0: /* ')' */41,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    }
+                  },
+                  _1: "%a(%a)"
+                }), longident, s._0, longident, s._1);
     
   }
 }
@@ -43378,18 +43378,18 @@ function tree_of_path(id) {
   switch (id.TAG) {
     case /* Pident */0 :
         return {
-                TAG: /* Oide_ident */2,
-                _0: ident_name(id._0)
-              };
+          TAG: /* Oide_ident */2,
+          _0: ident_name(id._0)
+        };
     case /* Pdot */1 :
         const id$1 = id._0;
         switch (id$1.TAG) {
           case /* Pident */0 :
               if (Caml_obj.caml_equal(id$1._0, ident_pervasive)) {
                 return {
-                        TAG: /* Oide_ident */2,
-                        _0: id._1
-                      };
+                  TAG: /* Oide_ident */2,
+                  _0: id._1
+                };
               }
               break;
           case /* Pdot */1 :
@@ -43398,16 +43398,16 @@ function tree_of_path(id) {
           
         }
         return {
-                TAG: /* Oide_dot */1,
-                _0: tree_of_path(id$1),
-                _1: id._1
-              };
+          TAG: /* Oide_dot */1,
+          _0: tree_of_path(id$1),
+          _1: id._1
+        };
     case /* Papply */2 :
         return {
-                TAG: /* Oide_apply */0,
-                _0: tree_of_path(id._0),
-                _1: tree_of_path(id._1)
-              };
+          TAG: /* Oide_apply */0,
+          _0: tree_of_path(id._0),
+          _1: tree_of_path(id._1)
+        };
     
   }
 }
@@ -43434,24 +43434,24 @@ function path(ppf, id) {
         return Stdlib__Format.pp_print_string(ppf, id._1);
     case /* Papply */2 :
         return Curry._4(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Alpha */15,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '(' */40,
+                      _1: {
+                        TAG: /* Alpha */15,
                         _0: {
-                          TAG: /* Alpha */15,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '(' */40,
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ')' */41,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
-                        },
-                        _1: "%a(%a)"
-                      }), path, id._0, path, id._1);
+                          TAG: /* Char_literal */12,
+                          _0: /* ')' */41,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    }
+                  },
+                  _1: "%a(%a)"
+                }), path, id._0, path, id._1);
     
   }
 }
@@ -43460,26 +43460,26 @@ function string_of_out_ident(s) {
   switch (s.TAG) {
     case /* Oide_apply */0 :
         return Stdlib__String.concat("", {
-                    hd: string_of_out_ident(s._0),
-                    tl: {
-                      hd: "(",
-                      tl: {
-                        hd: string_of_out_ident(s._1),
-                        tl: {
-                          hd: ")",
-                          tl: /* [] */0
-                        }
-                      }
-                    }
-                  });
+              hd: string_of_out_ident(s._0),
+              tl: {
+                hd: "(",
+                tl: {
+                  hd: string_of_out_ident(s._1),
+                  tl: {
+                    hd: ")",
+                    tl: /* [] */0
+                  }
+                }
+              }
+            });
     case /* Oide_dot */1 :
         return Stdlib__String.concat(".", {
-                    hd: string_of_out_ident(s._0),
-                    tl: {
-                      hd: s._1,
-                      tl: /* [] */0
-                    }
-                  });
+              hd: string_of_out_ident(s._0),
+              tl: {
+                hd: s._1,
+                tl: /* [] */0
+              }
+            });
     case /* Oide_ident */2 :
         return s._0;
     
@@ -43505,14 +43505,14 @@ function tree_of_rec(param) {
 function raw_list(pr, ppf, param) {
   if (!param) {
     return Stdlib__Format.fprintf(ppf)({
-                TAG: /* Format */0,
-                _0: {
-                  TAG: /* String_literal */11,
-                  _0: "[]",
-                  _1: /* End_of_format */0
-                },
-                _1: "[]"
-              });
+          TAG: /* Format */0,
+          _0: {
+            TAG: /* String_literal */11,
+            _0: "[]",
+            _1: /* End_of_format */0
+          },
+          _1: "[]"
+        });
   }
   const l = param.tl;
   Curry._3(Stdlib__Format.fprintf(ppf)({
@@ -43662,9 +43662,9 @@ function list_of_memo(_rem) {
     }
     if (rem.TAG === /* Mcons */0) {
       return {
-              hd: rem._1,
-              tl: list_of_memo(rem._4)
-            };
+        hd: rem._1,
+        tl: list_of_memo(rem._4)
+      };
     }
     _rem = rem._0.contents;
     continue ;
@@ -43674,32 +43674,32 @@ function list_of_memo(_rem) {
 function print_name(ppf, name) {
   if (name !== undefined) {
     return Curry._1(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Char_literal */12,
-                      _0: /* '"' */34,
-                      _1: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '"' */34,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "\"%s\""
-                  }), name);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char_literal */12,
+                _0: /* '"' */34,
+                _1: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '"' */34,
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "\"%s\""
+            }), name);
   } else {
     return Stdlib__Format.fprintf(ppf)({
-                TAG: /* Format */0,
-                _0: {
-                  TAG: /* String_literal */11,
-                  _0: "None",
-                  _1: /* End_of_format */0
-                },
-                _1: "None"
-              });
+          TAG: /* Format */0,
+          _0: {
+            TAG: /* String_literal */11,
+            _0: "None",
+            _1: /* End_of_format */0
+          },
+          _1: "None"
+        });
   }
 }
 
@@ -43711,93 +43711,93 @@ function raw_type(ppf, ty) {
   const ty$1 = safe_repr(/* [] */0, ty);
   if (Stdlib__List.memq(ty$1, visited.contents)) {
     return Curry._1(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "{id=",
-                      _1: {
-                        TAG: /* Int */4,
-                        _0: /* Int_d */0,
-                        _1: /* No_padding */0,
-                        _2: /* No_precision */0,
-                        _3: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '}' */125,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "{id=%d}"
-                  }), ty$1.id);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "{id=",
+                _1: {
+                  TAG: /* Int */4,
+                  _0: /* Int_d */0,
+                  _1: /* No_padding */0,
+                  _2: /* No_precision */0,
+                  _3: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '}' */125,
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "{id=%d}"
+            }), ty$1.id);
   } else {
     visited.contents = {
       hd: ty$1,
       tl: visited.contents
     };
     return Curry._4(Stdlib__Format.fprintf(ppf)({
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_gen */18,
+                _0: {
+                  TAG: /* Open_box */1,
+                  _0: {
                     TAG: /* Format */0,
                     _0: {
-                      TAG: /* Formatting_gen */18,
-                      _0: {
-                        TAG: /* Open_box */1,
-                        _0: {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "<1>",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "<1>"
-                        }
-                      },
+                      TAG: /* String_literal */11,
+                      _0: "<1>",
+                      _1: /* End_of_format */0
+                    },
+                    _1: "<1>"
+                  }
+                },
+                _1: {
+                  TAG: /* String_literal */11,
+                  _0: "{id=",
+                  _1: {
+                    TAG: /* Int */4,
+                    _0: /* Int_d */0,
+                    _1: /* No_padding */0,
+                    _2: /* No_precision */0,
+                    _3: {
+                      TAG: /* String_literal */11,
+                      _0: ";level=",
                       _1: {
-                        TAG: /* String_literal */11,
-                        _0: "{id=",
-                        _1: {
-                          TAG: /* Int */4,
-                          _0: /* Int_d */0,
-                          _1: /* No_padding */0,
-                          _2: /* No_precision */0,
-                          _3: {
-                            TAG: /* String_literal */11,
-                            _0: ";level=",
+                        TAG: /* Int */4,
+                        _0: /* Int_d */0,
+                        _1: /* No_padding */0,
+                        _2: /* No_precision */0,
+                        _3: {
+                          TAG: /* String_literal */11,
+                          _0: ";desc=",
+                          _1: {
+                            TAG: /* Formatting_lit */17,
+                            _0: {
+                              TAG: /* Break */0,
+                              _0: "@,",
+                              _1: 0,
+                              _2: 0
+                            },
                             _1: {
-                              TAG: /* Int */4,
-                              _0: /* Int_d */0,
-                              _1: /* No_padding */0,
-                              _2: /* No_precision */0,
-                              _3: {
-                                TAG: /* String_literal */11,
-                                _0: ";desc=",
+                              TAG: /* Alpha */15,
+                              _0: {
+                                TAG: /* Char_literal */12,
+                                _0: /* '}' */125,
                                 _1: {
                                   TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@,",
-                                    _1: 0,
-                                    _2: 0
-                                  },
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* '}' */125,
-                                      _1: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
+                                  _0: /* Close_box */0,
+                                  _1: /* End_of_format */0
                                 }
                               }
                             }
                           }
                         }
                       }
-                    },
-                    _1: "@[<1>{id=%d;level=%d;desc=@,%a}@]"
-                  }), ty$1.id, ty$1.level, raw_type_desc, ty$1.desc);
+                    }
+                  }
+                }
+              },
+              _1: "@[<1>{id=%d;level=%d;desc=@,%a}@]"
+            }), ty$1.id, ty$1.level, raw_type_desc, ty$1.desc);
   }
 }
 
@@ -43810,53 +43810,66 @@ function raw_type_list(tl) {
 function raw_type_desc(ppf, name) {
   if (/* tag */typeof name === "number" || typeof name === "string") {
     return Stdlib__Format.fprintf(ppf)({
-                TAG: /* Format */0,
-                _0: {
-                  TAG: /* String_literal */11,
-                  _0: "Tnil",
-                  _1: /* End_of_format */0
-                },
-                _1: "Tnil"
-              });
+          TAG: /* Format */0,
+          _0: {
+            TAG: /* String_literal */11,
+            _0: "Tnil",
+            _1: /* End_of_format */0
+          },
+          _1: "Tnil"
+        });
   }
   switch (name.TAG) {
     case /* Tvar */0 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Tvar ",
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: /* End_of_format */0
-                          }
-                        },
-                        _1: "Tvar %a"
-                      }), print_name, name._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Tvar ",
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: /* End_of_format */0
+                    }
+                  },
+                  _1: "Tvar %a"
+                }), print_name, name._0);
     case /* Tarrow */1 :
         return Curry._6(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
+                          TAG: /* String_literal */11,
+                          _0: "<hov1>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hov1>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Tarrow(",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ',' */44,
+                          _1: {
+                            TAG: /* Formatting_lit */17,
                             _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hov1>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hov1>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Tarrow(",
+                              TAG: /* Break */0,
+                              _0: "@,",
+                              _1: 0,
+                              _2: 0
+                            },
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
+                              TAG: /* Alpha */15,
+                              _0: {
                                 TAG: /* Char_literal */12,
                                 _0: /* ',' */44,
                                 _1: {
@@ -43881,31 +43894,15 @@ function raw_type_desc(ppf, name) {
                                           _2: 0
                                         },
                                         _1: {
-                                          TAG: /* Alpha */15,
-                                          _0: {
+                                          TAG: /* String */2,
+                                          _0: /* No_padding */0,
+                                          _1: {
                                             TAG: /* Char_literal */12,
-                                            _0: /* ',' */44,
+                                            _0: /* ')' */41,
                                             _1: {
                                               TAG: /* Formatting_lit */17,
-                                              _0: {
-                                                TAG: /* Break */0,
-                                                _0: "@,",
-                                                _1: 0,
-                                                _2: 0
-                                              },
-                                              _1: {
-                                                TAG: /* String */2,
-                                                _0: /* No_padding */0,
-                                                _1: {
-                                                  TAG: /* Char_literal */12,
-                                                  _0: /* ')' */41,
-                                                  _1: {
-                                                    TAG: /* Formatting_lit */17,
-                                                    _0: /* Close_box */0,
-                                                    _1: /* End_of_format */0
-                                                  }
-                                                }
-                                              }
+                                              _0: /* Close_box */0,
+                                              _1: /* End_of_format */0
                                             }
                                           }
                                         }
@@ -43916,70 +43913,86 @@ function raw_type_desc(ppf, name) {
                               }
                             }
                           }
-                        },
-                        _1: "@[<hov1>Tarrow(%s,@,%a,@,%a,@,%s)@]"
-                      }), name._0, raw_type, name._1, raw_type, name._2, safe_commu_repr(/* [] */0, name._3));
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hov1>Tarrow(%s,@,%a,@,%a,@,%s)@]"
+                }), name._0, raw_type, name._1, raw_type, name._2, safe_commu_repr(/* [] */0, name._3));
     case /* Ttuple */2 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<1>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<1>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Ttuple",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@,",
+                          _1: 0,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<1>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<1>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Ttuple",
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@,",
-                                _1: 0,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "@[<1>Ttuple@,%a@]"
-                      }), raw_type_list, name._0);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<1>Ttuple@,%a@]"
+                }), raw_type_list, name._0);
     case /* Tconstr */3 :
         return Curry._6(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<hov1>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hov1>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Tconstr(",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@,",
+                          _1: 0,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hov1>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hov1>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Tconstr(",
+                            TAG: /* Char_literal */12,
+                            _0: /* ',' */44,
                             _1: {
                               TAG: /* Formatting_lit */17,
                               _0: {
@@ -44005,27 +44018,11 @@ function raw_type_desc(ppf, name) {
                                       TAG: /* Alpha */15,
                                       _0: {
                                         TAG: /* Char_literal */12,
-                                        _0: /* ',' */44,
+                                        _0: /* ')' */41,
                                         _1: {
                                           TAG: /* Formatting_lit */17,
-                                          _0: {
-                                            TAG: /* Break */0,
-                                            _0: "@,",
-                                            _1: 0,
-                                            _2: 0
-                                          },
-                                          _1: {
-                                            TAG: /* Alpha */15,
-                                            _0: {
-                                              TAG: /* Char_literal */12,
-                                              _0: /* ')' */41,
-                                              _1: {
-                                                TAG: /* Formatting_lit */17,
-                                                _0: /* Close_box */0,
-                                                _1: /* End_of_format */0
-                                              }
-                                            }
-                                          }
+                                          _0: /* Close_box */0,
+                                          _1: /* End_of_format */0
                                         }
                                       }
                                     }
@@ -44034,32 +44031,48 @@ function raw_type_desc(ppf, name) {
                               }
                             }
                           }
-                        },
-                        _1: "@[<hov1>Tconstr(@,%a,@,%a,@,%a)@]"
-                      }), path, name._0, raw_type_list, name._1, (function (param, param$1) {
-                      return raw_list(path, param, param$1);
-                    }), list_of_memo(name._2.contents));
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hov1>Tconstr(@,%a,@,%a,@,%a)@]"
+                }), path, name._0, raw_type_list, name._1, (function (param, param$1) {
+                return raw_list(path, param, param$1);
+              }), list_of_memo(name._2.contents));
     case /* Tobject */4 :
         const nm = name._1;
         return Curry._3(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<hov1>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hov1>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Tobject(",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@,",
+                          _1: 0,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hov1>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hov1>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Tobject(",
+                            TAG: /* Char_literal */12,
+                            _0: /* ',' */44,
                             _1: {
                               TAG: /* Formatting_lit */17,
                               _0: {
@@ -44069,50 +44082,34 @@ function raw_type_desc(ppf, name) {
                                 _2: 0
                               },
                               _1: {
-                                TAG: /* Alpha */15,
+                                TAG: /* Formatting_gen */18,
                                 _0: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* ',' */44,
-                                  _1: {
-                                    TAG: /* Formatting_lit */17,
+                                  TAG: /* Open_box */1,
+                                  _0: {
+                                    TAG: /* Format */0,
                                     _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@,",
-                                      _1: 0,
-                                      _2: 0
+                                      TAG: /* String_literal */11,
+                                      _0: "<1>",
+                                      _1: /* End_of_format */0
                                     },
-                                    _1: {
-                                      TAG: /* Formatting_gen */18,
-                                      _0: {
-                                        TAG: /* Open_box */1,
-                                        _0: {
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: "<1>",
-                                            _1: /* End_of_format */0
-                                          },
-                                          _1: "<1>"
-                                        }
-                                      },
+                                    _1: "<1>"
+                                  }
+                                },
+                                _1: {
+                                  TAG: /* String_literal */11,
+                                  _0: "ref",
+                                  _1: {
+                                    TAG: /* Theta */16,
+                                    _0: {
+                                      TAG: /* Formatting_lit */17,
+                                      _0: /* Close_box */0,
                                       _1: {
-                                        TAG: /* String_literal */11,
-                                        _0: "ref",
+                                        TAG: /* Char_literal */12,
+                                        _0: /* ')' */41,
                                         _1: {
-                                          TAG: /* Theta */16,
-                                          _0: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: /* Close_box */0,
-                                            _1: {
-                                              TAG: /* Char_literal */12,
-                                              _0: /* ')' */41,
-                                              _1: {
-                                                TAG: /* Formatting_lit */17,
-                                                _0: /* Close_box */0,
-                                                _1: /* End_of_format */0
-                                              }
-                                            }
-                                          }
+                                          TAG: /* Formatting_lit */17,
+                                          _0: /* Close_box */0,
+                                          _1: /* End_of_format */0
                                         }
                                       }
                                     }
@@ -44121,84 +44118,101 @@ function raw_type_desc(ppf, name) {
                               }
                             }
                           }
-                        },
-                        _1: "@[<hov1>Tobject(@,%a,@,@[<1>ref%t@])@]"
-                      }), raw_type, name._0, (function (ppf) {
-                      const match = nm.contents;
-                      if (match !== undefined) {
-                        return Curry._4(Stdlib__Format.fprintf(ppf)({
-                                        TAG: /* Format */0,
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hov1>Tobject(@,%a,@,@[<1>ref%t@])@]"
+                }), raw_type, name._0, (function (ppf) {
+                const match = nm.contents;
+                if (match !== undefined) {
+                  return Curry._4(Stdlib__Format.fprintf(ppf)({
+                            TAG: /* Format */0,
+                            _0: {
+                              TAG: /* String_literal */11,
+                              _0: "(Some(",
+                              _1: {
+                                TAG: /* Formatting_lit */17,
+                                _0: {
+                                  TAG: /* Break */0,
+                                  _0: "@,",
+                                  _1: 0,
+                                  _2: 0
+                                },
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: {
+                                    TAG: /* Char_literal */12,
+                                    _0: /* ',' */44,
+                                    _1: {
+                                      TAG: /* Formatting_lit */17,
+                                      _0: {
+                                        TAG: /* Break */0,
+                                        _0: "@,",
+                                        _1: 0,
+                                        _2: 0
+                                      },
+                                      _1: {
+                                        TAG: /* Alpha */15,
                                         _0: {
                                           TAG: /* String_literal */11,
-                                          _0: "(Some(",
-                                          _1: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: {
-                                              TAG: /* Break */0,
-                                              _0: "@,",
-                                              _1: 0,
-                                              _2: 0
-                                            },
-                                            _1: {
-                                              TAG: /* Alpha */15,
-                                              _0: {
-                                                TAG: /* Char_literal */12,
-                                                _0: /* ',' */44,
-                                                _1: {
-                                                  TAG: /* Formatting_lit */17,
-                                                  _0: {
-                                                    TAG: /* Break */0,
-                                                    _0: "@,",
-                                                    _1: 0,
-                                                    _2: 0
-                                                  },
-                                                  _1: {
-                                                    TAG: /* Alpha */15,
-                                                    _0: {
-                                                      TAG: /* String_literal */11,
-                                                      _0: "))",
-                                                      _1: /* End_of_format */0
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        },
-                                        _1: "(Some(@,%a,@,%a))"
-                                      }), path, match[0], raw_type_list, match[1]);
-                      } else {
-                        return Stdlib__Format.fprintf(ppf)({
-                                    TAG: /* Format */0,
-                                    _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: " None",
-                                      _1: /* End_of_format */0
-                                    },
-                                    _1: " None"
-                                  });
-                      }
-                    }));
+                                          _0: "))",
+                                          _1: /* End_of_format */0
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            _1: "(Some(@,%a,@,%a))"
+                          }), path, match[0], raw_type_list, match[1]);
+                } else {
+                  return Stdlib__Format.fprintf(ppf)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: " None",
+                          _1: /* End_of_format */0
+                        },
+                        _1: " None"
+                      });
+                }
+              }));
     case /* Tfield */5 :
         return Curry._6(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hov1>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hov1>"
-                            }
-                          },
+                          TAG: /* String_literal */11,
+                          _0: "<hov1>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hov1>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Tfield(",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@,",
+                          _1: 0,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
                           _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Tfield(",
+                            TAG: /* Char_literal */12,
+                            _0: /* ',' */44,
                             _1: {
                               TAG: /* Formatting_lit */17,
                               _0: {
@@ -44222,44 +44236,27 @@ function raw_type_desc(ppf, name) {
                                       _2: 0
                                     },
                                     _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: {
+                                      TAG: /* Alpha */15,
+                                      _0: {
                                         TAG: /* Char_literal */12,
                                         _0: /* ',' */44,
                                         _1: {
                                           TAG: /* Formatting_lit */17,
                                           _0: {
                                             TAG: /* Break */0,
-                                            _0: "@,",
+                                            _0: "@;<0 -1>",
                                             _1: 0,
-                                            _2: 0
+                                            _2: -1
                                           },
                                           _1: {
                                             TAG: /* Alpha */15,
                                             _0: {
                                               TAG: /* Char_literal */12,
-                                              _0: /* ',' */44,
+                                              _0: /* ')' */41,
                                               _1: {
                                                 TAG: /* Formatting_lit */17,
-                                                _0: {
-                                                  TAG: /* Break */0,
-                                                  _0: "@;<0 -1>",
-                                                  _1: 0,
-                                                  _2: -1
-                                                },
-                                                _1: {
-                                                  TAG: /* Alpha */15,
-                                                  _0: {
-                                                    TAG: /* Char_literal */12,
-                                                    _0: /* ')' */41,
-                                                    _1: {
-                                                      TAG: /* Formatting_lit */17,
-                                                      _0: /* Close_box */0,
-                                                      _1: /* End_of_format */0
-                                                    }
-                                                  }
-                                                }
+                                                _0: /* Close_box */0,
+                                                _1: /* End_of_format */0
                                               }
                                             }
                                           }
@@ -44271,252 +44268,252 @@ function raw_type_desc(ppf, name) {
                               }
                             }
                           }
-                        },
-                        _1: "@[<hov1>Tfield(@,%s,@,%s,@,%a,@;<0 -1>%a)@]"
-                      }), name._0, safe_kind_repr(/* [] */0, name._1), raw_type, name._2, raw_type, name._3);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hov1>Tfield(@,%s,@,%s,@,%a,@;<0 -1>%a)@]"
+                }), name._0, safe_kind_repr(/* [] */0, name._1), raw_type, name._2, raw_type, name._3);
     case /* Tlink */6 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<1>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<1>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Tlink",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@,",
+                          _1: 0,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<1>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<1>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Tlink",
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@,",
-                                _1: 0,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "@[<1>Tlink@,%a@]"
-                      }), raw_type, name._0);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<1>Tlink@,%a@]"
+                }), raw_type, name._0);
     case /* Tsubst */7 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<1>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<1>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Tsubst",
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@,",
-                                _1: 0,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          }
+                          TAG: /* String_literal */11,
+                          _0: "<1>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<1>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Tsubst",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@,",
+                          _1: 0,
+                          _2: 0
                         },
-                        _1: "@[<1>Tsubst@,%a@]"
-                      }), raw_type, name._0);
+                        _1: {
+                          TAG: /* Alpha */15,
+                          _0: {
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<1>Tsubst@,%a@]"
+                }), raw_type, name._0);
     case /* Tvariant */8 :
         const row = name._0;
         return Curry.app(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<hov1>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hov1>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '{' */123,
+                      _1: {
+                        TAG: /* Formatting_gen */18,
+                        _0: {
+                          TAG: /* Open_box */1,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hov1>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hov1>"
-                            }
-                          },
+                            TAG: /* Format */0,
+                            _0: /* End_of_format */0,
+                            _1: ""
+                          }
+                        },
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
                           _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '{' */123,
+                            TAG: /* Formatting_lit */17,
+                            _0: {
+                              TAG: /* Break */0,
+                              _0: "@,",
+                              _1: 0,
+                              _2: 0
+                            },
                             _1: {
-                              TAG: /* Formatting_gen */18,
+                              TAG: /* Alpha */15,
                               _0: {
-                                TAG: /* Open_box */1,
-                                _0: {
-                                  TAG: /* Format */0,
-                                  _0: /* End_of_format */0,
-                                  _1: ""
-                                }
-                              },
-                              _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
+                                TAG: /* Char_literal */12,
+                                _0: /* ';' */59,
                                 _1: {
                                   TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@,",
-                                    _1: 0,
-                                    _2: 0
-                                  },
+                                  _0: /* Close_box */0,
                                   _1: {
-                                    TAG: /* Alpha */15,
+                                    TAG: /* Formatting_lit */17,
                                     _0: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* ';' */59,
+                                      TAG: /* Break */0,
+                                      _0: "@ ",
+                                      _1: 1,
+                                      _2: 0
+                                    },
+                                    _1: {
+                                      TAG: /* Formatting_gen */18,
+                                      _0: {
+                                        TAG: /* Open_box */1,
+                                        _0: {
+                                          TAG: /* Format */0,
+                                          _0: /* End_of_format */0,
+                                          _1: ""
+                                        }
+                                      },
                                       _1: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
+                                        TAG: /* String */2,
+                                        _0: /* No_padding */0,
                                         _1: {
                                           TAG: /* Formatting_lit */17,
                                           _0: {
                                             TAG: /* Break */0,
-                                            _0: "@ ",
-                                            _1: 1,
+                                            _0: "@,",
+                                            _1: 0,
                                             _2: 0
                                           },
                                           _1: {
-                                            TAG: /* Formatting_gen */18,
+                                            TAG: /* Alpha */15,
                                             _0: {
-                                              TAG: /* Open_box */1,
-                                              _0: {
-                                                TAG: /* Format */0,
-                                                _0: /* End_of_format */0,
-                                                _1: ""
-                                              }
-                                            },
-                                            _1: {
-                                              TAG: /* String */2,
-                                              _0: /* No_padding */0,
+                                              TAG: /* Char_literal */12,
+                                              _0: /* ';' */59,
                                               _1: {
                                                 TAG: /* Formatting_lit */17,
-                                                _0: {
-                                                  TAG: /* Break */0,
-                                                  _0: "@,",
-                                                  _1: 0,
-                                                  _2: 0
-                                                },
+                                                _0: /* Close_box */0,
                                                 _1: {
-                                                  TAG: /* Alpha */15,
+                                                  TAG: /* Formatting_lit */17,
                                                   _0: {
-                                                    TAG: /* Char_literal */12,
-                                                    _0: /* ';' */59,
+                                                    TAG: /* Break */0,
+                                                    _0: "@ ",
+                                                    _1: 1,
+                                                    _2: 0
+                                                  },
+                                                  _1: {
+                                                    TAG: /* String */2,
+                                                    _0: /* No_padding */0,
                                                     _1: {
-                                                      TAG: /* Formatting_lit */17,
-                                                      _0: /* Close_box */0,
+                                                      TAG: /* Bool */9,
+                                                      _0: /* No_padding */0,
                                                       _1: {
-                                                        TAG: /* Formatting_lit */17,
-                                                        _0: {
-                                                          TAG: /* Break */0,
-                                                          _0: "@ ",
-                                                          _1: 1,
-                                                          _2: 0
-                                                        },
+                                                        TAG: /* Char_literal */12,
+                                                        _0: /* ';' */59,
                                                         _1: {
-                                                          TAG: /* String */2,
-                                                          _0: /* No_padding */0,
+                                                          TAG: /* Formatting_lit */17,
+                                                          _0: {
+                                                            TAG: /* Break */0,
+                                                            _0: "@ ",
+                                                            _1: 1,
+                                                            _2: 0
+                                                          },
                                                           _1: {
-                                                            TAG: /* Bool */9,
+                                                            TAG: /* String */2,
                                                             _0: /* No_padding */0,
                                                             _1: {
-                                                              TAG: /* Char_literal */12,
-                                                              _0: /* ';' */59,
+                                                              TAG: /* Bool */9,
+                                                              _0: /* No_padding */0,
                                                               _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
+                                                                TAG: /* Char_literal */12,
+                                                                _0: /* ';' */59,
                                                                 _1: {
-                                                                  TAG: /* String */2,
-                                                                  _0: /* No_padding */0,
+                                                                  TAG: /* Formatting_lit */17,
+                                                                  _0: {
+                                                                    TAG: /* Break */0,
+                                                                    _0: "@ ",
+                                                                    _1: 1,
+                                                                    _2: 0
+                                                                  },
                                                                   _1: {
-                                                                    TAG: /* Bool */9,
-                                                                    _0: /* No_padding */0,
+                                                                    TAG: /* Formatting_gen */18,
+                                                                    _0: {
+                                                                      TAG: /* Open_box */1,
+                                                                      _0: {
+                                                                        TAG: /* Format */0,
+                                                                        _0: {
+                                                                          TAG: /* String_literal */11,
+                                                                          _0: "<1>",
+                                                                          _1: /* End_of_format */0
+                                                                        },
+                                                                        _1: "<1>"
+                                                                      }
+                                                                    },
                                                                     _1: {
-                                                                      TAG: /* Char_literal */12,
-                                                                      _0: /* ';' */59,
+                                                                      TAG: /* String */2,
+                                                                      _0: /* No_padding */0,
                                                                       _1: {
-                                                                        TAG: /* Formatting_lit */17,
+                                                                        TAG: /* Theta */16,
                                                                         _0: {
-                                                                          TAG: /* Break */0,
-                                                                          _0: "@ ",
-                                                                          _1: 1,
-                                                                          _2: 0
-                                                                        },
-                                                                        _1: {
-                                                                          TAG: /* Formatting_gen */18,
-                                                                          _0: {
-                                                                            TAG: /* Open_box */1,
-                                                                            _0: {
-                                                                              TAG: /* Format */0,
-                                                                              _0: {
-                                                                                TAG: /* String_literal */11,
-                                                                                _0: "<1>",
-                                                                                _1: /* End_of_format */0
-                                                                              },
-                                                                              _1: "<1>"
-                                                                            }
-                                                                          },
+                                                                          TAG: /* Formatting_lit */17,
+                                                                          _0: /* Close_box */0,
                                                                           _1: {
-                                                                            TAG: /* String */2,
-                                                                            _0: /* No_padding */0,
+                                                                            TAG: /* Char_literal */12,
+                                                                            _0: /* '}' */125,
                                                                             _1: {
-                                                                              TAG: /* Theta */16,
-                                                                              _0: {
-                                                                                TAG: /* Formatting_lit */17,
-                                                                                _0: /* Close_box */0,
-                                                                                _1: {
-                                                                                  TAG: /* Char_literal */12,
-                                                                                  _0: /* '}' */125,
-                                                                                  _1: {
-                                                                                    TAG: /* Formatting_lit */17,
-                                                                                    _0: /* Close_box */0,
-                                                                                    _1: /* End_of_format */0
-                                                                                  }
-                                                                                }
-                                                                              }
+                                                                              TAG: /* Formatting_lit */17,
+                                                                              _0: /* Close_box */0,
+                                                                              _1: /* End_of_format */0
                                                                             }
                                                                           }
                                                                         }
@@ -44543,153 +44540,169 @@ function raw_type_desc(ppf, name) {
                               }
                             }
                           }
-                        },
-                        _1: "@[<hov1>{@[%s@,%a;@]@ @[%s@,%a;@]@ %s%b;@ %s%b;@ @[<1>%s%t@]}@]"
-                      }), [
-                    "row_fields=",
-                    (function (param, param$1) {
-                        return raw_list((function (ppf, param) {
-                                      Curry._3(Stdlib__Format.fprintf(ppf)({
-                                                TAG: /* Format */0,
-                                                _0: {
-                                                  TAG: /* Formatting_gen */18,
-                                                  _0: {
-                                                    TAG: /* Open_box */1,
-                                                    _0: {
-                                                      TAG: /* Format */0,
-                                                      _0: /* End_of_format */0,
-                                                      _1: ""
-                                                    }
-                                                  },
-                                                  _1: {
-                                                    TAG: /* String */2,
-                                                    _0: /* No_padding */0,
-                                                    _1: {
-                                                      TAG: /* Char_literal */12,
-                                                      _0: /* ',' */44,
-                                                      _1: {
-                                                        TAG: /* Formatting_lit */17,
-                                                        _0: {
-                                                          TAG: /* Break */0,
-                                                          _0: "@ ",
-                                                          _1: 1,
-                                                          _2: 0
-                                                        },
-                                                        _1: {
-                                                          TAG: /* Alpha */15,
-                                                          _0: {
-                                                            TAG: /* Formatting_lit */17,
-                                                            _0: /* Close_box */0,
-                                                            _1: /* End_of_format */0
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }
-                                                },
-                                                _1: "@[%s,@ %a@]"
-                                              }), param[0], raw_field, param[1]);
-                                    }), param, param$1);
-                      }),
-                    row.row_fields,
-                    "row_more=",
-                    raw_type,
-                    row.row_more,
-                    "row_closed=",
-                    row.row_closed,
-                    "row_fixed=",
-                    row.row_fixed,
-                    "row_name=",
-                    (function (ppf) {
-                        const match = row.row_name;
-                        if (match !== undefined) {
-                          return Curry._4(Stdlib__Format.fprintf(ppf)({
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hov1>{@[%s@,%a;@]@ @[%s@,%a;@]@ %s%b;@ %s%b;@ @[<1>%s%t@]}@]"
+                }), [
+              "row_fields=",
+              (function (param, param$1) {
+                  return raw_list((function (ppf, param) {
+                          Curry._3(Stdlib__Format.fprintf(ppf)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* Formatting_gen */18,
+                                      _0: {
+                                        TAG: /* Open_box */1,
+                                        _0: {
                                           TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: "Some(",
+                                          _0: /* End_of_format */0,
+                                          _1: ""
+                                        }
+                                      },
+                                      _1: {
+                                        TAG: /* String */2,
+                                        _0: /* No_padding */0,
+                                        _1: {
+                                          TAG: /* Char_literal */12,
+                                          _0: /* ',' */44,
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
                                             _1: {
-                                              TAG: /* Formatting_lit */17,
+                                              TAG: /* Alpha */15,
                                               _0: {
-                                                TAG: /* Break */0,
-                                                _0: "@,",
-                                                _1: 0,
-                                                _2: 0
-                                              },
-                                              _1: {
-                                                TAG: /* Alpha */15,
-                                                _0: {
-                                                  TAG: /* Char_literal */12,
-                                                  _0: /* ',' */44,
-                                                  _1: {
-                                                    TAG: /* Formatting_lit */17,
-                                                    _0: {
-                                                      TAG: /* Break */0,
-                                                      _0: "@,",
-                                                      _1: 0,
-                                                      _2: 0
-                                                    },
-                                                    _1: {
-                                                      TAG: /* Alpha */15,
-                                                      _0: {
-                                                        TAG: /* Char_literal */12,
-                                                        _0: /* ')' */41,
-                                                        _1: /* End_of_format */0
-                                                      }
-                                                    }
-                                                  }
-                                                }
+                                                TAG: /* Formatting_lit */17,
+                                                _0: /* Close_box */0,
+                                                _1: /* End_of_format */0
                                               }
                                             }
-                                          },
-                                          _1: "Some(@,%a,@,%a)"
-                                        }), path, match[0], raw_type_list, match[1]);
-                        } else {
-                          return Stdlib__Format.fprintf(ppf)({
-                                      TAG: /* Format */0,
-                                      _0: {
-                                        TAG: /* String_literal */11,
-                                        _0: "None",
-                                        _1: /* End_of_format */0
-                                      },
-                                      _1: "None"
-                                    });
-                        }
-                      })
-                  ]);
+                                          }
+                                        }
+                                      }
+                                    },
+                                    _1: "@[%s,@ %a@]"
+                                  }), param[0], raw_field, param[1]);
+                        }), param, param$1);
+                }),
+              row.row_fields,
+              "row_more=",
+              raw_type,
+              row.row_more,
+              "row_closed=",
+              row.row_closed,
+              "row_fixed=",
+              row.row_fixed,
+              "row_name=",
+              (function (ppf) {
+                  const match = row.row_name;
+                  if (match !== undefined) {
+                    return Curry._4(Stdlib__Format.fprintf(ppf)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "Some(",
+                                _1: {
+                                  TAG: /* Formatting_lit */17,
+                                  _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@,",
+                                    _1: 0,
+                                    _2: 0
+                                  },
+                                  _1: {
+                                    TAG: /* Alpha */15,
+                                    _0: {
+                                      TAG: /* Char_literal */12,
+                                      _0: /* ',' */44,
+                                      _1: {
+                                        TAG: /* Formatting_lit */17,
+                                        _0: {
+                                          TAG: /* Break */0,
+                                          _0: "@,",
+                                          _1: 0,
+                                          _2: 0
+                                        },
+                                        _1: {
+                                          TAG: /* Alpha */15,
+                                          _0: {
+                                            TAG: /* Char_literal */12,
+                                            _0: /* ')' */41,
+                                            _1: /* End_of_format */0
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              },
+                              _1: "Some(@,%a,@,%a)"
+                            }), path, match[0], raw_type_list, match[1]);
+                  } else {
+                    return Stdlib__Format.fprintf(ppf)({
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* String_literal */11,
+                            _0: "None",
+                            _1: /* End_of_format */0
+                          },
+                          _1: "None"
+                        });
+                  }
+                })
+            ]);
     case /* Tunivar */9 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Tunivar ",
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: /* End_of_format */0
+                    }
+                  },
+                  _1: "Tunivar %a"
+                }), print_name, name._0);
+    case /* Tpoly */10 :
+        return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
                           TAG: /* String_literal */11,
-                          _0: "Tunivar ",
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: /* End_of_format */0
-                          }
+                          _0: "<hov1>",
+                          _1: /* End_of_format */0
                         },
-                        _1: "Tunivar %a"
-                      }), print_name, name._0);
-    case /* Tpoly */10 :
-        return Curry._4(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
+                        _1: "<hov1>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Tpoly(",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* Break */0,
+                          _0: "@,",
+                          _1: 0,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hov1>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hov1>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Tpoly(",
+                            TAG: /* Char_literal */12,
+                            _0: /* ',' */44,
                             _1: {
                               TAG: /* Formatting_lit */17,
                               _0: {
@@ -44702,92 +44715,79 @@ function raw_type_desc(ppf, name) {
                                 TAG: /* Alpha */15,
                                 _0: {
                                   TAG: /* Char_literal */12,
-                                  _0: /* ',' */44,
+                                  _0: /* ')' */41,
                                   _1: {
                                     TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@,",
-                                      _1: 0,
-                                      _2: 0
-                                    },
-                                    _1: {
-                                      TAG: /* Alpha */15,
-                                      _0: {
-                                        TAG: /* Char_literal */12,
-                                        _0: /* ')' */41,
-                                        _1: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: /* Close_box */0,
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
+                                    _0: /* Close_box */0,
+                                    _1: /* End_of_format */0
                                   }
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[<hov1>Tpoly(@,%a,@,%a)@]"
-                      }), raw_type, name._0, raw_type_list, name._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hov1>Tpoly(@,%a,@,%a)@]"
+                }), raw_type, name._0, raw_type_list, name._1);
     case /* Tpackage */11 :
         return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<hov1>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hov1>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Tpackage(",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@,",
+                          _1: 0,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Open_box */1,
+                            TAG: /* Formatting_lit */17,
                             _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hov1>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hov1>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Tpackage(",
+                              TAG: /* Break */0,
+                              _0: "@,",
+                              _1: 0,
+                              _2: 0
+                            },
                             _1: {
-                              TAG: /* Formatting_lit */17,
+                              TAG: /* Alpha */15,
                               _0: {
-                                TAG: /* Break */0,
-                                _0: "@,",
-                                _1: 0,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
+                                TAG: /* Char_literal */12,
+                                _0: /* ')' */41,
+                                _1: {
                                   TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@,",
-                                    _1: 0,
-                                    _2: 0
-                                  },
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* ')' */41,
-                                      _1: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
+                                  _0: /* Close_box */0,
+                                  _1: /* End_of_format */0
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[<hov1>Tpackage(@,%a@,%a)@]"
-                      }), path, name._0, raw_type_list, name._2);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hov1>Tpackage(@,%a@,%a)@]"
+                }), path, name._0, raw_type_list, name._2);
     
   }
 }
@@ -44795,72 +44795,72 @@ function raw_type_desc(ppf, name) {
 function raw_field(ppf, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return Stdlib__Format.fprintf(ppf)({
-                TAG: /* Format */0,
-                _0: {
-                  TAG: /* String_literal */11,
-                  _0: "Rabsent",
-                  _1: /* End_of_format */0
-                },
-                _1: "Rabsent"
-              });
+          TAG: /* Format */0,
+          _0: {
+            TAG: /* String_literal */11,
+            _0: "Rabsent",
+            _1: /* End_of_format */0
+          },
+          _1: "Rabsent"
+        });
   }
   if (param.TAG === /* Rpresent */0) {
     const t = param._0;
     if (t !== undefined) {
       return Curry._2(Stdlib__Format.fprintf(ppf)({
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Formatting_gen */18,
+                  _0: {
+                    TAG: /* Open_box */1,
+                    _0: {
                       TAG: /* Format */0,
                       _0: {
-                        TAG: /* Formatting_gen */18,
+                        TAG: /* String_literal */11,
+                        _0: "<1>",
+                        _1: /* End_of_format */0
+                      },
+                      _1: "<1>"
+                    }
+                  },
+                  _1: {
+                    TAG: /* String_literal */11,
+                    _0: "Rpresent(Some",
+                    _1: {
+                      TAG: /* Formatting_lit */17,
+                      _0: {
+                        TAG: /* Break */0,
+                        _0: "@,",
+                        _1: 0,
+                        _2: 0
+                      },
+                      _1: {
+                        TAG: /* Alpha */15,
                         _0: {
-                          TAG: /* Open_box */1,
-                          _0: {
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: "<1>",
-                              _1: /* End_of_format */0
-                            },
-                            _1: "<1>"
-                          }
-                        },
-                        _1: {
-                          TAG: /* String_literal */11,
-                          _0: "Rpresent(Some",
+                          TAG: /* Char_literal */12,
+                          _0: /* ')' */41,
                           _1: {
                             TAG: /* Formatting_lit */17,
-                            _0: {
-                              TAG: /* Break */0,
-                              _0: "@,",
-                              _1: 0,
-                              _2: 0
-                            },
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ')' */41,
-                                _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
                         }
-                      },
-                      _1: "@[<1>Rpresent(Some@,%a)@]"
-                    }), raw_type, t);
+                      }
+                    }
+                  }
+                },
+                _1: "@[<1>Rpresent(Some@,%a)@]"
+              }), raw_type, t);
     } else {
       return Stdlib__Format.fprintf(ppf)({
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* String_literal */11,
-                    _0: "Rpresent None",
-                    _1: /* End_of_format */0
-                  },
-                  _1: "Rpresent None"
-                });
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* String_literal */11,
+              _0: "Rpresent None",
+              _1: /* End_of_format */0
+            },
+            _1: "Rpresent None"
+          });
     }
   }
   const e = param._3;
@@ -44975,59 +44975,59 @@ function raw_field(ppf, param) {
           const f = e.contents;
           if (f !== undefined) {
             return Curry._2(Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@,",
+                          _1: 0,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Formatting_gen */18,
+                          _0: {
+                            TAG: /* Open_box */1,
                             _0: {
-                              TAG: /* Formatting_lit */17,
+                              TAG: /* Format */0,
                               _0: {
-                                TAG: /* Break */0,
-                                _0: "@,",
-                                _1: 0,
-                                _2: 0
+                                TAG: /* String_literal */11,
+                                _0: "<1>",
+                                _1: /* End_of_format */0
                               },
-                              _1: {
-                                TAG: /* Formatting_gen */18,
-                                _0: {
-                                  TAG: /* Open_box */1,
-                                  _0: {
-                                    TAG: /* Format */0,
-                                    _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: "<1>",
-                                      _1: /* End_of_format */0
-                                    },
-                                    _1: "<1>"
-                                  }
-                                },
+                              _1: "<1>"
+                            }
+                          },
+                          _1: {
+                            TAG: /* Char_literal */12,
+                            _0: /* '(' */40,
+                            _1: {
+                              TAG: /* Alpha */15,
+                              _0: {
+                                TAG: /* Char_literal */12,
+                                _0: /* ')' */41,
                                 _1: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* '(' */40,
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* ')' */41,
-                                      _1: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
+                                  TAG: /* Formatting_lit */17,
+                                  _0: /* Close_box */0,
+                                  _1: /* End_of_format */0
                                 }
                               }
-                            },
-                            _1: "@,@[<1>(%a)@]"
-                          }), raw_field, f);
+                            }
+                          }
+                        }
+                      },
+                      _1: "@,@[<1>(%a)@]"
+                    }), raw_field, f);
           } else {
             return Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: " None",
-                          _1: /* End_of_format */0
-                        },
-                        _1: " None"
-                      });
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: " None",
+                    _1: /* End_of_format */0
+                  },
+                  _1: " None"
+                });
           }
         }));
 }
@@ -45051,21 +45051,21 @@ function is_nth(param) {
 function compose(l1, l2) {
   if (/* tag */typeof l2 === "number" || typeof l2 === "string") {
     return {
-            TAG: /* Map */1,
-            _0: l1
-          };
+      TAG: /* Map */1,
+      _0: l1
+    };
   } else if (l2.TAG === /* Nth */0) {
     return {
-            TAG: /* Nth */0,
-            _0: Stdlib__List.nth(l1, l2._0)
-          };
+      TAG: /* Nth */0,
+      _0: Stdlib__List.nth(l1, l2._0)
+    };
   } else {
     return {
-            TAG: /* Map */1,
-            _0: Stdlib__List.map((function (param) {
-                    return Stdlib__List.nth(l1, param);
-                  }), l2._0)
-          };
+      TAG: /* Map */1,
+      _0: Stdlib__List.map((function (param) {
+              return Stdlib__List.nth(l1, param);
+            }), l2._0)
+    };
   }
 }
 
@@ -45074,13 +45074,13 @@ function apply_subst(s1, tyl) {
     return tyl;
   } else if (s1.TAG === /* Nth */0) {
     return {
-            hd: Stdlib__List.nth(tyl, s1._0),
-            tl: /* [] */0
-          };
+      hd: Stdlib__List.nth(tyl, s1._0),
+      tl: /* [] */0
+    };
   } else {
     return Stdlib__List.map((function (param) {
-                  return Stdlib__List.nth(tyl, param);
-                }), s1._0);
+            return Stdlib__List.nth(tyl, param);
+          }), s1._0);
   }
 }
 
@@ -45161,13 +45161,13 @@ function create$7(l, x, d, r) {
   const hl = height$6(l);
   const hr = height$6(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$6(l, x, d, r) {
@@ -45178,9 +45178,9 @@ function bal$6(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -45193,25 +45193,25 @@ function bal$6(l, x, d, r) {
       return create$7(create$7(ll, lv, ld, lr.l), lr.v, lr.d, create$7(lr.r, x, d, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -45224,21 +45224,21 @@ function bal$6(l, x, d, r) {
     return create$7(create$7(l, x, d, rl.l), rl.v, rl.d, create$7(rl.r, rv, rd, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add$8(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -45250,13 +45250,13 @@ function add$8(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -45280,8 +45280,8 @@ function find$4(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg$3.compare, x, param.v);
     if (c === 0) {
@@ -45309,8 +45309,8 @@ function index(l, x) {
     }
   }
   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-            MEL_EXN_ID: Stdlib.Not_found
-          });
+        MEL_EXN_ID: Stdlib.Not_found
+      });
 }
 
 function uniq(_param) {
@@ -45337,21 +45337,21 @@ function normalize_type_path(cacheOpt, env, p) {
     const match$1 = ty.desc;
     if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
       return [
-              p,
-              {
-                TAG: /* Nth */0,
-                _0: index(params, ty)
-              }
-            ];
+        p,
+        {
+          TAG: /* Nth */0,
+          _0: index(params, ty)
+        }
+      ];
     }
     if (match$1.TAG !== /* Tconstr */3) {
       return [
-              p,
-              {
-                TAG: /* Nth */0,
-                _0: index(params, ty)
-              }
-            ];
+        p,
+        {
+          TAG: /* Nth */0,
+          _0: index(params, ty)
+        }
+      ];
     }
     const p1 = match$1._0;
     const tyl = Stdlib__List.map(repr, match$1._1);
@@ -45362,26 +45362,26 @@ function normalize_type_path(cacheOpt, env, p) {
     }
     if (cache || Stdlib__List.length(params) <= Stdlib__List.length(tyl) || !uniq(tyl)) {
       return [
-              p,
-              /* Id */0
-            ];
+        p,
+        /* Id */0
+      ];
     }
     const l1 = Stdlib__List.map((function (param) {
             return index(params, param);
           }), tyl);
     const match$2 = normalize_type_path(cache, env, p1);
     return [
-            match$2[0],
-            compose(l1, match$2[1])
-          ];
+      match$2[0],
+      compose(l1, match$2[1])
+    ];
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Stdlib.Not_found) {
       return [
-              p,
-              /* Id */0
-            ];
+        p,
+        /* Id */0
+      ];
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -45393,21 +45393,21 @@ function path_size(id) {
         const id$1 = id._0;
         const s = id$1.name;
         return [
-                s !== "" && Caml_string.get(s, 0) === /* '_' */95 ? 10 : 1,
-                -id$1.stamp | 0
-              ];
+          s !== "" && Caml_string.get(s, 0) === /* '_' */95 ? 10 : 1,
+          -id$1.stamp | 0
+        ];
     case /* Pdot */1 :
         const match = path_size(id._0);
         return [
-                1 + match[0] | 0,
-                match[1]
-              ];
+          1 + match[0] | 0,
+          match[1]
+        ];
     case /* Papply */2 :
         const match$1 = path_size(id._0);
         return [
-                match$1[0] + path_size(id._1)[0] | 0,
-                match$1[1]
-              ];
+          match$1[0] + path_size(id._1)[0] | 0,
+          match$1[1]
+        ];
     
   }
 }
@@ -45490,8 +45490,8 @@ function set_printing_env(env) {
 function wrap_printing_env(env, f) {
   set_printing_env(env);
   return try_finally(f, (function (param) {
-                set_printing_env(empty);
-              }));
+          set_printing_env(empty);
+        }));
 }
 
 function is_unambiguous(path, env) {
@@ -45528,9 +45528,9 @@ function is_unambiguous(path, env) {
 function best_type_path(p) {
   if (real_paths.contents || printing_env.contents === empty) {
     return [
-            p,
-            /* Id */0
-          ];
+      p,
+      /* Id */0
+    ];
   }
   const match = normalize_type_path(undefined, printing_env.contents, p);
   const p$p = match[0];
@@ -45564,8 +45564,8 @@ function best_type_path(p) {
         continue ;
       }
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     };
   };
   while((function () {
@@ -45606,9 +45606,9 @@ function best_type_path(p) {
     }
   }
   return [
-          p$p$p,
-          match[1]
-        ];
+    p$p$p,
+    match[1]
+  ];
 }
 
 const names = {
@@ -45798,24 +45798,24 @@ function aliasable(ty) {
 function namable_row(row) {
   if (row.row_name !== undefined) {
     return Stdlib__List.for_all((function (param) {
-                  const match = row_field_repr_aux(/* [] */0, param[1]);
-                  if (/* tag */typeof match === "number" || typeof match === "string") {
-                    return true;
-                  }
-                  if (match.TAG === /* Rpresent */0) {
-                    return true;
-                  }
-                  const l = match._1;
-                  if (row.row_closed) {
-                    if (match._0) {
-                      return Caml_obj.caml_equal(l, /* [] */0);
-                    } else {
-                      return Stdlib__List.length(l) === 1;
-                    }
-                  } else {
-                    return false;
-                  }
-                }), row.row_fields);
+            const match = row_field_repr_aux(/* [] */0, param[1]);
+            if (/* tag */typeof match === "number" || typeof match === "string") {
+              return true;
+            }
+            if (match.TAG === /* Rpresent */0) {
+              return true;
+            }
+            const l = match._1;
+            if (row.row_closed) {
+              if (match._0) {
+                return Caml_obj.caml_equal(l, /* [] */0);
+              } else {
+                return Stdlib__List.length(l) === 1;
+              }
+            } else {
+              return false;
+            }
+          }), row.row_fields);
   } else {
     return false;
   }
@@ -45846,13 +45846,13 @@ function mark_loops_rec(_visited, _ty) {
           continue ;
       case /* Ttuple */2 :
           return Stdlib__List.iter((function (param) {
-                        return mark_loops_rec(visited$1, param);
-                      }), tyl._0);
+                  return mark_loops_rec(visited$1, param);
+                }), tyl._0);
       case /* Tconstr */3 :
           const match = best_type_path(tyl._0);
           return Stdlib__List.iter((function (param) {
-                        return mark_loops_rec(visited$1, param);
-                      }), apply_subst(match[1], tyl._1));
+                  return mark_loops_rec(visited$1, param);
+                }), apply_subst(match[1], tyl._1));
       case /* Tobject */4 :
           if (Stdlib__List.memq(px, visited_objects.contents)) {
             return add_alias(px);
@@ -45866,16 +45866,16 @@ function mark_loops_rec(_visited, _ty) {
           const match$1 = tyl._1.contents;
           if (match$1 !== undefined) {
             return Stdlib__List.iter((function (param) {
-                          return mark_loops_rec(visited$1, param);
-                        }), Stdlib__List.tl(match$1[1]));
+                    return mark_loops_rec(visited$1, param);
+                  }), Stdlib__List.tl(match$1[1]));
           }
           const match$2 = flatten_fields(tyl._0);
           return Stdlib__List.iter((function (param) {
-                        if (Caml_obj.caml_equal(field_kind_repr(param[1]), /* Fpresent */0)) {
-                          return mark_loops_rec(visited$1, param[2]);
-                        }
-                        
-                      }), match$2[0]);
+                  if (Caml_obj.caml_equal(field_kind_repr(param[1]), /* Fpresent */0)) {
+                    return mark_loops_rec(visited$1, param[2]);
+                  }
+                  
+                }), match$2[0]);
       case /* Tfield */5 :
           if (Caml_obj.caml_equal(field_kind_repr(tyl._1), /* Fpresent */0)) {
             mark_loops_rec(visited$1, tyl._2);
@@ -45907,17 +45907,17 @@ function mark_loops_rec(_visited, _ty) {
           if (match$3 !== undefined) {
             if (namable_row(row)) {
               return Stdlib__List.iter((function (param) {
-                            return mark_loops_rec(visited$1, param);
-                          }), match$3[1]);
+                      return mark_loops_rec(visited$1, param);
+                    }), match$3[1]);
             } else {
               return iter_row((function (param) {
-                            return mark_loops_rec(visited$1, param);
-                          }), row);
+                      return mark_loops_rec(visited$1, param);
+                    }), row);
             }
           } else {
             return iter_row((function (param) {
-                          return mark_loops_rec(visited$1, param);
-                        }), row);
+                    return mark_loops_rec(visited$1, param);
+                  }), row);
           }
       case /* Tvar */0 :
       case /* Tunivar */9 :
@@ -45929,8 +45929,8 @@ function mark_loops_rec(_visited, _ty) {
           continue ;
       case /* Tpackage */11 :
           return Stdlib__List.iter((function (param) {
-                        return mark_loops_rec(visited$1, param);
-                      }), tyl._2);
+                  return mark_loops_rec(visited$1, param);
+                }), tyl._2);
       
     }
   };
@@ -45964,10 +45964,10 @@ function tree_of_typexp(sch, ty) {
   if (Stdlib__List.mem_assq(px, names.contents) && !Stdlib__List.memq(px, delayed.contents)) {
     const mark = is_non_gen(sch, ty$1);
     return {
-            TAG: /* Otyp_var */10,
-            _0: mark,
-            _1: name_of_type(px)
-          };
+      TAG: /* Otyp_var */10,
+      _0: mark,
+      _1: name_of_type(px)
+    };
   }
   const pr_typ = function (param) {
     const tyl = ty$1.desc;
@@ -45977,10 +45977,10 @@ function tree_of_typexp(sch, ty) {
     switch (tyl.TAG) {
       case /* Tvar */0 :
           return {
-                  TAG: /* Otyp_var */10,
-                  _0: is_non_gen(sch, ty$1),
-                  _1: name_of_type(ty$1)
-                };
+            TAG: /* Otyp_var */10,
+            _0: is_non_gen(sch, ty$1),
+            _1: name_of_type(ty$1)
+          };
       case /* Tarrow */1 :
           let l = tyl._0;
           let ty1 = tyl._1;
@@ -45997,26 +45997,26 @@ function tree_of_typexp(sch, ty) {
             } else {
               const match$1 = match._1;
               t1 = match$1 && !(match$1.tl || !same(match._0, path_option)) ? tree_of_typexp(sch, match$1.hd) : ({
-                    TAG: /* Otyp_stuff */7,
-                    _0: "<hidden>"
-                  });
+                  TAG: /* Otyp_stuff */7,
+                  _0: "<hidden>"
+                });
             }
           } else {
             t1 = tree_of_typexp(sch, ty1);
           }
           return {
-                  TAG: /* Otyp_arrow */1,
-                  _0: lab,
-                  _1: t1,
-                  _2: tree_of_typexp(sch, ty2)
-                };
+            TAG: /* Otyp_arrow */1,
+            _0: lab,
+            _1: t1,
+            _2: tree_of_typexp(sch, ty2)
+          };
       case /* Ttuple */2 :
           return {
-                  TAG: /* Otyp_tuple */9,
-                  _0: Stdlib__List.map((function (param) {
-                          return tree_of_typexp(sch, param);
-                        }), tyl._0)
-                };
+            TAG: /* Otyp_tuple */9,
+            _0: Stdlib__List.map((function (param) {
+                    return tree_of_typexp(sch, param);
+                  }), tyl._0)
+          };
       case /* Tconstr */3 :
           const match$2 = best_type_path(tyl._0);
           const s = match$2[1];
@@ -46025,12 +46025,12 @@ function tree_of_typexp(sch, ty) {
             return tree_of_typexp(sch, Stdlib__List.hd(tyl$p));
           } else {
             return {
-                    TAG: /* Otyp_constr */3,
-                    _0: tree_of_path(match$2[0]),
-                    _1: Stdlib__List.map((function (param) {
-                            return tree_of_typexp(sch, param);
-                          }), tyl$p)
-                  };
+              TAG: /* Otyp_constr */3,
+              _0: tree_of_path(match$2[0]),
+              _1: Stdlib__List.map((function (param) {
+                      return tree_of_typexp(sch, param);
+                    }), tyl$p)
+            };
           }
       case /* Tobject */4 :
           return tree_of_typobject(sch, tyl._0, tyl._1.contents);
@@ -46071,10 +46071,10 @@ function tree_of_typexp(sch, ty) {
                   return Stdlib__List.hd(args);
                 } else {
                   return {
-                          TAG: /* Otyp_constr */3,
-                          _0: id,
-                          _1: args
-                        };
+                    TAG: /* Otyp_constr */3,
+                    _0: id,
+                    _1: args
+                  };
                 }
               }
               const non_gen = is_non_gen(sch, px);
@@ -46107,12 +46107,12 @@ function tree_of_typexp(sch, ty) {
                 };
               }
               return {
-                      TAG: /* Otyp_variant */11,
-                      _0: non_gen,
-                      _1: inh,
-                      _2: row.row_closed,
-                      _3: tags
-                    };
+                TAG: /* Otyp_variant */11,
+                _0: non_gen,
+                _1: inh,
+                _2: row.row_closed,
+                _3: tags
+              };
             }
             
           }
@@ -46122,76 +46122,76 @@ function tree_of_typexp(sch, ty) {
                   const match = row_field_repr_aux(/* [] */0, param[1]);
                   if (/* tag */typeof match === "number" || typeof match === "string") {
                     return [
-                            l,
-                            false,
-                            /* [] */0
-                          ];
+                      l,
+                      false,
+                      /* [] */0
+                    ];
                   }
                   if (match.TAG === /* Rpresent */0) {
                     const ty = match._0;
                     if (ty !== undefined) {
                       return [
-                              l,
-                              false,
-                              {
-                                hd: tree_of_typexp(sch, ty),
-                                tl: /* [] */0
-                              }
-                            ];
+                        l,
+                        false,
+                        {
+                          hd: tree_of_typexp(sch, ty),
+                          tl: /* [] */0
+                        }
+                      ];
                     } else {
                       return [
-                              l,
-                              false,
-                              /* [] */0
-                            ];
+                        l,
+                        false,
+                        /* [] */0
+                      ];
                     }
                   }
                   const c = match._0;
                   if (c && !match._1) {
                     return [
-                            l,
-                            false,
-                            /* [] */0
-                          ];
+                      l,
+                      false,
+                      /* [] */0
+                    ];
                   }
                   const tyl = match._1;
                   if (c) {
                     return [
-                            l,
-                            true,
-                            Stdlib__List.map((function (param) {
-                                    return tree_of_typexp(sch, param);
-                                  }), tyl)
-                          ];
+                      l,
+                      true,
+                      Stdlib__List.map((function (param) {
+                              return tree_of_typexp(sch, param);
+                            }), tyl)
+                    ];
                   } else {
                     return [
-                            l,
-                            false,
-                            Stdlib__List.map((function (param) {
-                                    return tree_of_typexp(sch, param);
-                                  }), tyl)
-                          ];
+                      l,
+                      false,
+                      Stdlib__List.map((function (param) {
+                              return tree_of_typexp(sch, param);
+                            }), tyl)
+                    ];
                   }
                 }), fields);
           const tags$1 = all_present ? undefined : Stdlib__List.map((function (prim) {
                     return prim[0];
                   }), present);
           return {
-                  TAG: /* Otyp_variant */11,
-                  _0: non_gen$1,
-                  _1: {
-                    TAG: /* Ovar_fields */0,
-                    _0: fields$1
-                  },
-                  _2: row.row_closed,
-                  _3: tags$1
-                };
+            TAG: /* Otyp_variant */11,
+            _0: non_gen$1,
+            _1: {
+              TAG: /* Ovar_fields */0,
+              _0: fields$1
+            },
+            _2: row.row_closed,
+            _3: tags$1
+          };
       case /* Tunivar */9 :
           return {
-                  TAG: /* Otyp_var */10,
-                  _0: false,
-                  _1: name_of_type(ty$1)
-                };
+            TAG: /* Otyp_var */10,
+            _0: false,
+            _1: name_of_type(ty$1)
+          };
       case /* Tpoly */10 :
           const ty$2 = tyl._0;
           if (!tyl._1) {
@@ -46218,13 +46218,13 @@ function tree_of_typexp(sch, ty) {
                   return Stdlib__String.concat(".", flat(/* [] */0, li));
                 }), tyl._1);
           return {
-                  TAG: /* Otyp_module */13,
-                  _0: name(undefined, tyl._0),
-                  _1: n,
-                  _2: Stdlib__List.map((function (param) {
-                          return tree_of_typexp(sch, param);
-                        }), tyl._2)
-                };
+            TAG: /* Otyp_module */13,
+            _0: name(undefined, tyl._0),
+            _1: n,
+            _2: Stdlib__List.map((function (param) {
+                    return tree_of_typexp(sch, param);
+                  }), tyl._2)
+          };
       
     }
   };
@@ -46236,10 +46236,10 @@ function tree_of_typexp(sch, ty) {
   if (is_aliased(px) && aliasable(ty$1)) {
     name_of_type(px);
     return {
-            TAG: /* Otyp_alias */0,
-            _0: pr_typ(undefined),
-            _1: name_of_type(px)
-          };
+      TAG: /* Otyp_alias */0,
+      _0: pr_typ(undefined),
+      _1: name_of_type(px)
+    };
   } else {
     return pr_typ(undefined);
   }
@@ -46258,20 +46258,20 @@ function tree_of_typobject(sch, fi, nm) {
     const match$1 = best_type_path(nm[0]);
     if (!Caml_obj.caml_equal(match$1[1], /* Id */0)) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  36171,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              36171,
+              6
+            ]
+          });
     }
     return {
-            TAG: /* Otyp_class */2,
-            _0: non_gen,
-            _1: tree_of_path(match$1[0]),
-            _2: args
-          };
+      TAG: /* Otyp_class */2,
+      _0: non_gen,
+      _1: tree_of_path(match$1[0]),
+      _2: args
+    };
   }
   const pr_fields = function (fi) {
     const match = flatten_fields(fi);
@@ -46279,12 +46279,12 @@ function tree_of_typobject(sch, fi, nm) {
             const match = field_kind_repr(param[1]);
             if (/* tag */(typeof match === "number" || typeof match === "string") && match === /* Fpresent */0) {
               return {
-                      hd: [
-                        param[0],
-                        param[2]
-                      ],
-                      tl: l
-                    };
+                hd: [
+                  param[0],
+                  param[2]
+                ],
+                tl: l
+              };
             } else {
               return l;
             }
@@ -46296,10 +46296,10 @@ function tree_of_typobject(sch, fi, nm) {
   };
   const match$2 = pr_fields(fi);
   return {
-          TAG: /* Otyp_object */5,
-          _0: match$2[0],
-          _1: match$2[1]
-        };
+    TAG: /* Otyp_object */5,
+    _0: match$2[0],
+    _1: match$2[1]
+  };
 }
 
 function is_non_gen(sch, ty) {
@@ -46321,12 +46321,12 @@ function tree_of_typfields(sch, rest, param) {
     ];
     const match$1 = tree_of_typfields(sch, rest, param.tl);
     return [
-            {
-              hd: field,
-              tl: match$1[0]
-            },
-            match$1[1]
-          ];
+      {
+        hd: field,
+        tl: match$1[0]
+      },
+      match$1[1]
+    ];
   }
   const match$2 = rest.desc;
   let rest$1;
@@ -46346,9 +46346,9 @@ function tree_of_typfields(sch, rest, param) {
     }
   }
   return [
-          /* [] */0,
-          rest$1
-        ];
+    /* [] */0,
+    rest$1
+  ];
 }
 
 function typexp$1(sch, prio, ppf, ty) {
@@ -46373,39 +46373,39 @@ function tree_of_type_scheme(ty) {
 
 function tree_of_constraints(params) {
   return Stdlib__List.fold_right((function (ty, list) {
-                const ty$p = unalias(ty);
-                if (proxy(ty) === proxy(ty$p)) {
-                  return list;
-                }
-                const tr = tree_of_typexp(true, ty);
-                return {
-                        hd: [
-                          tr,
-                          tree_of_typexp(true, ty$p)
-                        ],
-                        tl: list
-                      };
-              }), params, /* [] */0);
+          const ty$p = unalias(ty);
+          if (proxy(ty) === proxy(ty$p)) {
+            return list;
+          }
+          const tr = tree_of_typexp(true, ty);
+          return {
+            hd: [
+              tr,
+              tree_of_typexp(true, ty$p)
+            ],
+            tl: list
+          };
+        }), params, /* [] */0);
 }
 
 function filter_params(tyl) {
   return Stdlib__List.rev(Stdlib__List.fold_left((function (tyl, ty) {
-                    const ty$1 = repr(ty);
-                    if (Stdlib__List.memq(ty$1, tyl)) {
-                      return {
-                              hd: newty2(100000000, {
-                                    TAG: /* Tsubst */7,
-                                    _0: ty$1
-                                  }),
-                              tl: tyl
-                            };
-                    } else {
-                      return {
-                              hd: ty$1,
-                              tl: tyl
-                            };
-                    }
-                  }), /* [] */0, tyl));
+              const ty$1 = repr(ty);
+              if (Stdlib__List.memq(ty$1, tyl)) {
+                return {
+                  hd: newty2(100000000, {
+                        TAG: /* Tsubst */7,
+                        _0: ty$1
+                      }),
+                  tl: tyl
+                };
+              } else {
+                return {
+                  hd: ty$1,
+                  tl: tyl
+                };
+              }
+            }), /* [] */0, tyl));
 }
 
 function tree_of_constructor(cd) {
@@ -46413,12 +46413,12 @@ function tree_of_constructor(cd) {
   const res = cd.cd_res;
   if (res === undefined) {
     return [
-            name,
-            Stdlib__List.map((function (param) {
-                    return tree_of_typexp(false, param);
-                  }), cd.cd_args),
-            undefined
-          ];
+      name,
+      Stdlib__List.map((function (param) {
+              return tree_of_typexp(false, param);
+            }), cd.cd_args),
+      undefined
+    ];
   }
   const nm = names.contents;
   names.contents = /* [] */0;
@@ -46428,18 +46428,18 @@ function tree_of_constructor(cd) {
         }), cd.cd_args);
   names.contents = nm;
   return [
-          name,
-          args,
-          ret
-        ];
+    name,
+    args,
+    ret
+  ];
 }
 
 function tree_of_label(l) {
   return [
-          l.ld_id.name,
-          l.ld_mutable === /* Mutable */1,
-          tree_of_typexp(false, l.ld_type)
-        ];
+    l.ld_id.name,
+    l.ld_mutable === /* Mutable */1,
+    tree_of_typexp(false, l.ld_type)
+  ];
 }
 
 function tree_of_type_decl(id, decl) {
@@ -46547,28 +46547,28 @@ function tree_of_type_decl(id, decl) {
               return Curry._1(Types_Variance.get_upper, v);
             } else {
               return [
-                      true,
-                      true
-                    ];
+                true,
+                true
+              ];
             }
           }), decl.type_params, decl.type_variance);
     return [
-            id.name,
-            Stdlib__List.map2((function (ty, cocn) {
-                    return [
-                            type_param(tree_of_typexp(false, ty)),
-                            cocn
-                          ];
-                  }), params, vari)
-          ];
+      id.name,
+      Stdlib__List.map2((function (ty, cocn) {
+              return [
+                type_param(tree_of_typexp(false, ty)),
+                cocn
+              ];
+            }), params, vari)
+    ];
   };
   const tree_of_manifest = function (ty1) {
     if (ty_manifest !== undefined) {
       return {
-              TAG: /* Otyp_manifest */4,
-              _0: tree_of_typexp(false, ty_manifest),
-              _1: ty1
-            };
+        TAG: /* Otyp_manifest */4,
+        _0: tree_of_typexp(false, ty_manifest),
+        _1: ty1
+      };
     } else {
       return ty1;
     }
@@ -46606,20 +46606,20 @@ function tree_of_type_decl(id, decl) {
         ]
     );
   return {
-          otype_name: match$2[0],
-          otype_params: match$2[1],
-          otype_type: match$3[0],
-          otype_private: match$3[1],
-          otype_cstrs: constraints
-        };
+    otype_name: match$2[0],
+    otype_params: match$2[1],
+    otype_type: match$3[0],
+    otype_private: match$3[1],
+    otype_cstrs: constraints
+  };
 }
 
 function tree_of_type_declaration(id, decl, rs) {
   return {
-          TAG: /* Osig_type */5,
-          _0: tree_of_type_decl(id, decl),
-          _1: tree_of_rec(rs)
-        };
+    TAG: /* Osig_type */5,
+    _0: tree_of_type_decl(id, decl),
+    _1: tree_of_rec(rs)
+  };
 }
 
 function type_declaration$1(id, ppf, decl) {
@@ -46691,10 +46691,10 @@ function tree_of_extension_constructor(id, ext, es) {
     
   }
   return {
-          TAG: /* Osig_typext */2,
-          _0: ext$1,
-          _1: es$1
-        };
+    TAG: /* Osig_typext */2,
+    _0: ext$1,
+    _1: es$1
+  };
 }
 
 function extension_constructor$1(id, ppf, ext) {
@@ -46708,11 +46708,11 @@ function tree_of_value_description(id, decl) {
   let prims;
   prims = /* tag */typeof p === "number" || typeof p === "string" || p.TAG !== /* Val_prim */0 ? /* [] */0 : description_list(p._0);
   return {
-          TAG: /* Osig_value */6,
-          _0: id$1,
-          _1: ty,
-          _2: prims
-        };
+    TAG: /* Osig_value */6,
+    _0: id$1,
+    _1: ty,
+    _2: prims
+  };
 }
 
 function value_description$1(id, ppf, decl) {
@@ -46724,27 +46724,27 @@ function method_type(param) {
   const match$1 = repr(param[2]);
   if (!/* tag */(typeof match === "number" || typeof match === "string")) {
     return [
-            match$1,
-            /* [] */0
-          ];
+      match$1,
+      /* [] */0
+    ];
   }
   if (match !== /* Fpresent */0) {
     return [
-            match$1,
-            /* [] */0
-          ];
+      match$1,
+      /* [] */0
+    ];
   }
   const match$2 = match$1.desc;
   if (/* tag */typeof match$2 === "number" || typeof match$2 === "string" || match$2.TAG !== /* Tpoly */10) {
     return [
-            match$1,
-            /* [] */0
-          ];
+      match$1,
+      /* [] */0
+    ];
   } else {
     return [
-            match$2._0,
-            match$2._1
-          ];
+      match$2._0,
+      match$2._1
+    ];
   }
 }
 
@@ -46780,8 +46780,8 @@ function prepare_class_type(params, _sign) {
                   mark_loops(method_type(met)[0]);
                 }), match[0]);
           return Curry._2(Meths.iter, (function (param, param$1) {
-                        mark_loops(param$1[2]);
-                      }), sign$1.csig_vars);
+                  mark_loops(param$1[2]);
+                }), sign$1.csig_vars);
       case /* Cty_arrow */2 :
           mark_loops(sign._1);
           _sign = sign._2;
@@ -46800,12 +46800,12 @@ function tree_of_class_type(sch, params, _sign) {
           const sty = repr(signature_of_class_type(cty).csig_self);
           if (!(Stdlib__List.memq(proxy(sty), visited_objects.contents) || !Stdlib__List.for_all(is_Tvar, params))) {
             return {
-                    TAG: /* Octy_constr */0,
-                    _0: tree_of_path(sign._0),
-                    _1: Stdlib__List.map((function (param) {
-                            return tree_of_typexp(true, param);
-                          }), sign._1)
-                  };
+              TAG: /* Octy_constr */0,
+              _0: tree_of_path(sign._0),
+              _1: Stdlib__List.map((function (param) {
+                      return tree_of_typexp(true, param);
+                    }), sign._1)
+            };
           }
           _sign = cty;
           continue ;
@@ -46813,44 +46813,44 @@ function tree_of_class_type(sch, params, _sign) {
           const sign$1 = sign._0;
           const sty$1 = repr(sign$1.csig_self);
           const self_ty = is_aliased(sty$1) ? ({
-                TAG: /* Otyp_var */10,
-                _0: false,
-                _1: name_of_type(proxy(sty$1))
-              }) : undefined;
+              TAG: /* Otyp_var */10,
+              _0: false,
+              _1: name_of_type(proxy(sty$1))
+            }) : undefined;
           const match = flatten_fields(object_fields(sign$1.csig_self));
           const csil = Stdlib__List.fold_left((function (csil, param) {
                   return {
-                          hd: {
-                            TAG: /* Ocsg_constraint */0,
-                            _0: param[0],
-                            _1: param[1]
-                          },
-                          tl: csil
-                        };
+                    hd: {
+                      TAG: /* Ocsg_constraint */0,
+                      _0: param[0],
+                      _1: param[1]
+                    },
+                    tl: csil
+                  };
                 }), /* [] */0, tree_of_constraints(params));
           const all_vars = Curry._3(Meths.fold, (function (l, param, all) {
                   return {
-                          hd: [
-                            l,
-                            param[0],
-                            param[1],
-                            param[2]
-                          ],
-                          tl: all
-                        };
+                    hd: [
+                      l,
+                      param[0],
+                      param[1],
+                      param[2]
+                    ],
+                    tl: all
+                  };
                 }), sign$1.csig_vars, /* [] */0);
           const all_vars$1 = Stdlib__List.rev(all_vars);
           const csil$1 = Stdlib__List.fold_left((function (csil, param) {
                   return {
-                          hd: {
-                            TAG: /* Ocsg_value */2,
-                            _0: param[0],
-                            _1: param[1] === /* Mutable */1,
-                            _2: param[2] === /* Virtual */0,
-                            _3: tree_of_typexp(sch, param[3])
-                          },
-                          tl: csil
-                        };
+                    hd: {
+                      TAG: /* Ocsg_value */2,
+                      _0: param[0],
+                      _1: param[1] === /* Mutable */1,
+                      _2: param[2] === /* Virtual */0,
+                      _3: tree_of_typexp(sch, param[3])
+                    },
+                    tl: csil
+                  };
                 }), csil, all_vars$1);
           const partial_arg = sign$1.csig_concr;
           const csil$2 = Stdlib__List.fold_left((function (param, param$1) {
@@ -46869,21 +46869,21 @@ function tree_of_class_type(sch, params, _sign) {
                   const tty = tree_of_typexp(sch, match[0]);
                   remove_names(match[1]);
                   return {
-                          hd: {
-                            TAG: /* Ocsg_method */1,
-                            _0: lab,
-                            _1: priv,
-                            _2: virt,
-                            _3: tty
-                          },
-                          tl: param
-                        };
+                    hd: {
+                      TAG: /* Ocsg_method */1,
+                      _0: lab,
+                      _1: priv,
+                      _2: virt,
+                      _3: tty
+                    },
+                    tl: param
+                  };
                 }), csil$1, match[0]);
           return {
-                  TAG: /* Octy_signature */2,
-                  _0: self_ty,
-                  _1: Stdlib__List.rev(csil$2)
-                };
+            TAG: /* Octy_signature */2,
+            _0: self_ty,
+            _1: Stdlib__List.rev(csil$2)
+          };
       case /* Cty_arrow */2 :
           const ty = sign._1;
           const l = sign._0;
@@ -46914,11 +46914,11 @@ function tree_of_class_type(sch, params, _sign) {
           }
           const tr = tree_of_typexp(sch, ty$1);
           return {
-                  TAG: /* Octy_arrow */1,
-                  _0: lab,
-                  _1: tr,
-                  _2: tree_of_class_type(sch, params, sign._2)
-                };
+            TAG: /* Octy_arrow */1,
+            _0: lab,
+            _1: tr,
+            _2: tree_of_class_type(sch, params, sign._2)
+          };
       
     }
   };
@@ -46935,21 +46935,21 @@ function tree_of_class_param(param, variance) {
   let tmp;
   tmp = /* tag */typeof match === "number" || typeof match === "string" || match.TAG !== /* Otyp_var */10 ? "?" : match._1;
   return [
-          tmp,
-          is_Tvar(repr(param)) ? [
-              true,
-              true
-            ] : variance
-        ];
+    tmp,
+    is_Tvar(repr(param)) ? [
+        true,
+        true
+      ] : variance
+  ];
 }
 
 function class_variance(param) {
   return Stdlib__List.map((function (v) {
-                return [
-                        Curry._2(Types_Variance.mem, /* May_pos */0, v),
-                        Curry._2(Types_Variance.mem, /* May_neg */1, v)
-                      ];
-              }), param);
+          return [
+            Curry._2(Types_Variance.mem, /* May_pos */0, v),
+            Curry._2(Types_Variance.mem, /* May_neg */1, v)
+          ];
+        }), param);
 }
 
 function tree_of_class_declaration(id, cl, rs) {
@@ -46966,13 +46966,13 @@ function tree_of_class_declaration(id, cl, rs) {
   }
   const vir_flag = cl.cty_new === undefined;
   return {
-          TAG: /* Osig_class */0,
-          _0: vir_flag,
-          _1: id.name,
-          _2: Stdlib__List.map2(tree_of_class_param, params, class_variance(cl.cty_variance)),
-          _3: tree_of_class_type(true, params, cl.cty_type),
-          _4: tree_of_rec(rs)
-        };
+    TAG: /* Osig_class */0,
+    _0: vir_flag,
+    _1: id.name,
+    _2: Stdlib__List.map2(tree_of_class_param, params, class_variance(cl.cty_variance)),
+    _3: tree_of_class_type(true, params, cl.cty_type),
+    _4: tree_of_rec(rs)
+  };
 }
 
 function class_declaration$1(id, ppf, cl) {
@@ -47004,13 +47004,13 @@ function tree_of_cltype_declaration(id, cl, rs) {
           }
         }), sign.csig_vars, false);
   return {
-          TAG: /* Osig_class_type */1,
-          _0: virt,
-          _1: id.name,
-          _2: Stdlib__List.map2(tree_of_class_param, params, class_variance(cl.clty_variance)),
-          _3: tree_of_class_type(true, params, cl.clty_type),
-          _4: tree_of_rec(rs)
-        };
+    TAG: /* Osig_class_type */1,
+    _0: virt,
+    _1: id.name,
+    _2: Stdlib__List.map2(tree_of_class_param, params, class_variance(cl.clty_variance)),
+    _3: tree_of_class_type(true, params, cl.clty_type),
+    _4: tree_of_rec(rs)
+  };
 }
 
 function cltype_declaration$1(id, ppf, cl) {
@@ -47030,68 +47030,68 @@ function filter_rem_sig(item, rem) {
     case /* Sig_class */5 :
         if (!rem) {
           return [
-                  /* [] */0,
-                  rem
-                ];
+            /* [] */0,
+            rem
+          ];
         }
         const match = rem.tl;
         if (!match) {
           return [
-                  /* [] */0,
-                  rem
-                ];
+            /* [] */0,
+            rem
+          ];
         }
         const match$1 = match.tl;
         if (match$1) {
           return [
-                  {
-                    hd: rem.hd,
-                    tl: {
-                      hd: match.hd,
-                      tl: {
-                        hd: match$1.hd,
-                        tl: /* [] */0
-                      }
-                    }
-                  },
-                  match$1.tl
-                ];
+            {
+              hd: rem.hd,
+              tl: {
+                hd: match.hd,
+                tl: {
+                  hd: match$1.hd,
+                  tl: /* [] */0
+                }
+              }
+            },
+            match$1.tl
+          ];
         } else {
           return [
-                  /* [] */0,
-                  rem
-                ];
+            /* [] */0,
+            rem
+          ];
         }
     case /* Sig_class_type */6 :
         if (!rem) {
           return [
-                  /* [] */0,
-                  rem
-                ];
+            /* [] */0,
+            rem
+          ];
         }
         const match$2 = rem.tl;
         if (match$2) {
           return [
-                  {
-                    hd: rem.hd,
-                    tl: {
-                      hd: match$2.hd,
-                      tl: /* [] */0
-                    }
-                  },
-                  match$2.tl
-                ];
+            {
+              hd: rem.hd,
+              tl: {
+                hd: match$2.hd,
+                tl: /* [] */0
+              }
+            },
+            match$2.tl
+          ];
         } else {
           return [
-                  /* [] */0,
-                  rem
-                ];
+            /* [] */0,
+            rem
+          ];
         }
     default:
       return [
-              /* [] */0,
-              rem
-            ];
+        /* [] */0,
+        rem
+      ];
   }
 }
 
@@ -47132,9 +47132,9 @@ function hide_rec_items(param) {
           return /* [] */0;
       case /* Trec_next */2 :
           return {
-                  hd: match._0,
-                  tl: get_ids(param.tl)
-                };
+            hd: match._0,
+            tl: get_ids(param.tl)
+          };
       
     }
   };
@@ -47156,14 +47156,14 @@ function tree_of_modtype(p) {
   switch (p.TAG) {
     case /* Mty_ident */0 :
         return {
-                TAG: /* Omty_ident */1,
-                _0: tree_of_path(p._0)
-              };
+          TAG: /* Omty_ident */1,
+          _0: tree_of_path(p._0)
+        };
     case /* Mty_signature */1 :
         return {
-                TAG: /* Omty_signature */2,
-                _0: tree_of_signature(p._0)
-              };
+          TAG: /* Omty_signature */2,
+          _0: tree_of_signature(p._0)
+        };
     case /* Mty_functor */2 :
         const ty_res = p._2;
         const ty_arg = p._1;
@@ -47178,16 +47178,16 @@ function tree_of_modtype(p) {
           res = tree_of_modtype(ty_res);
         }
         return {
-                TAG: /* Omty_functor */0,
-                _0: param.name,
-                _1: may_map(tree_of_modtype, ty_arg),
-                _2: res
-              };
+          TAG: /* Omty_functor */0,
+          _0: param.name,
+          _1: may_map(tree_of_modtype, ty_arg),
+          _2: res
+        };
     case /* Mty_alias */3 :
         return {
-                TAG: /* Omty_alias */3,
-                _0: tree_of_path(p._0)
-              };
+          TAG: /* Omty_alias */3,
+          _0: tree_of_path(p._0)
+        };
     
   }
 }
@@ -47195,10 +47195,10 @@ function tree_of_modtype(p) {
 function tree_of_signature(sg) {
   const partial_arg = printing_env.contents;
   return wrap_env((function (env) {
-                return env;
-              }), (function (param) {
-                return tree_of_signature_rec(partial_arg, false, param);
-              }), sg);
+          return env;
+        }), (function (param) {
+          return tree_of_signature_rec(partial_arg, false, param);
+        }), sg);
 }
 
 function tree_of_signature_rec(env$p, in_type_group, param) {
@@ -47323,10 +47323,10 @@ function tree_of_modtype_declaration(id, decl) {
   const mty = decl.mtd_type;
   const mty$1 = mty !== undefined ? tree_of_modtype(mty) : /* Omty_abstract */0;
   return {
-          TAG: /* Osig_modtype */3,
-          _0: id.name,
-          _1: mty$1
-        };
+    TAG: /* Osig_modtype */3,
+    _0: id.name,
+    _1: mty$1
+  };
 }
 
 function modtype$1(ppf, mty) {
@@ -47506,57 +47506,57 @@ function type_path_expansion(tp, ppf, tp$p) {
     return path(ppf, tp);
   } else {
     return Curry._4(Stdlib__Format.fprintf(ppf)({
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_gen */18,
+                _0: {
+                  TAG: /* Open_box */1,
+                  _0: {
                     TAG: /* Format */0,
                     _0: {
-                      TAG: /* Formatting_gen */18,
-                      _0: {
-                        TAG: /* Open_box */1,
-                        _0: {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "<2>",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "<2>"
-                        }
-                      },
+                      TAG: /* String_literal */11,
+                      _0: "<2>",
+                      _1: /* End_of_format */0
+                    },
+                    _1: "<2>"
+                  }
+                },
+                _1: {
+                  TAG: /* Alpha */15,
+                  _0: {
+                    TAG: /* Formatting_lit */17,
+                    _0: {
+                      TAG: /* Break */0,
+                      _0: "@ ",
+                      _1: 1,
+                      _2: 0
+                    },
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '=' */61,
                       _1: {
-                        TAG: /* Alpha */15,
+                        TAG: /* Formatting_lit */17,
                         _0: {
-                          TAG: /* Formatting_lit */17,
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Break */0,
-                            _0: "@ ",
-                            _1: 1,
-                            _2: 0
-                          },
-                          _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '=' */61,
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
                         }
                       }
-                    },
-                    _1: "@[<2>%a@ =@ %a@]"
-                  }), path, tp, path, tp$p);
+                    }
+                  }
+                }
+              },
+              _1: "@[<2>%a@ =@ %a@]"
+            }), path, tp, path, tp$p);
   }
 }
 
@@ -47686,18 +47686,18 @@ function filter_trace(keep_last, param) {
     return rem$p;
   } else {
     return {
-            hd: [
-              t1,
-              t1$p
-            ],
-            tl: {
-              hd: [
-                t2,
-                t2$p
-              ],
-              tl: rem$p
-            }
-          };
+      hd: [
+        t1,
+        t1$p
+      ],
+      tl: {
+        hd: [
+          t2,
+          t2$p
+        ],
+        tl: rem$p
+      }
+    };
   }
 }
 
@@ -47709,27 +47709,27 @@ function type_path_list(ppf, param) {
   const tp = match[0];
   if (param.tl) {
     return Curry._4(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Alpha */15,
-                      _0: {
-                        TAG: /* Formatting_lit */17,
-                        _0: {
-                          TAG: /* Break */0,
-                          _0: "@;<2 0>",
-                          _1: 2,
-                          _2: 0
-                        },
-                        _1: {
-                          TAG: /* Alpha */15,
-                          _0: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "%a@;<2 0>%a"
-                  }), (function (param, param$1) {
-                  return type_path_expansion(tp, param, param$1);
-                }), match[1], type_path_list, param.tl);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Alpha */15,
+                _0: {
+                  TAG: /* Formatting_lit */17,
+                  _0: {
+                    TAG: /* Break */0,
+                    _0: "@;<2 0>",
+                    _1: 2,
+                    _2: 0
+                  },
+                  _1: {
+                    TAG: /* Alpha */15,
+                    _0: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "%a@;<2 0>%a"
+            }), (function (param, param$1) {
+            return type_path_expansion(tp, param, param$1);
+          }), match[1], type_path_list, param.tl);
   } else {
     return type_path_expansion(tp, ppf, match[1]);
   }
@@ -47751,19 +47751,19 @@ function hide_variant_name(t) {
   const init = row_repr_aux(/* [] */0, row$1);
   const level = row_more(row$1).level;
   return newty2(t$1.level, {
-              TAG: /* Tvariant */8,
-              _0: {
-                row_fields: init.row_fields,
-                row_more: newty2(level, {
-                      TAG: /* Tvar */0,
-                      _0: undefined
-                    }),
-                row_bound: init.row_bound,
-                row_closed: init.row_closed,
-                row_fixed: init.row_fixed,
-                row_name: undefined
-              }
-            });
+        TAG: /* Tvariant */8,
+        _0: {
+          row_fields: init.row_fields,
+          row_more: newty2(level, {
+                TAG: /* Tvar */0,
+                _0: undefined
+              }),
+          row_bound: init.row_bound,
+          row_closed: init.row_closed,
+          row_fixed: init.row_fixed,
+          row_name: undefined
+        }
+      });
 }
 
 function prepare_expansion(param) {
@@ -47774,9 +47774,9 @@ function prepare_expansion(param) {
     mark_loops(t$p);
   }
   return [
-          t,
-          t$p
-        ];
+    t,
+    t$p
+  ];
 }
 
 function may_prepare_expansion(compact, param) {
@@ -47785,9 +47785,9 @@ function may_prepare_expansion(compact, param) {
   const match = repr(t$p).desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     return prepare_expansion([
-                t,
-                t$p
-              ]);
+          t,
+          t$p
+        ]);
   }
   switch (match.TAG) {
     case /* Tobject */4 :
@@ -47795,21 +47795,21 @@ function may_prepare_expansion(compact, param) {
         break;
     default:
       return prepare_expansion([
-                  t,
-                  t$p
-                ]);
+            t,
+            t$p
+          ]);
   }
   if (compact) {
     mark_loops(t);
     return [
-            t,
-            t
-          ];
+      t,
+      t
+    ];
   } else {
     return prepare_expansion([
-                t,
-                t$p
-              ]);
+          t,
+          t$p
+        ]);
   }
 }
 
@@ -47829,33 +47829,33 @@ function print_tags(ppf, fields) {
               _1: "`%s"
             }), fields.hd[0]);
     return Stdlib__List.iter((function (param) {
-                  Curry._1(Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* Char_literal */12,
-                              _0: /* ',' */44,
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
-                                _1: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* '`' */96,
-                                  _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
-                            },
-                            _1: ",@ `%s"
-                          }), param[0]);
-                }), fields.tl);
+            Curry._1(Stdlib__Format.fprintf(ppf)({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Char_literal */12,
+                        _0: /* ',' */44,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
+                          _0: {
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
+                          _1: {
+                            TAG: /* Char_literal */12,
+                            _0: /* '`' */96,
+                            _1: {
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
+                              _1: /* End_of_format */0
+                            }
+                          }
+                        }
+                      },
+                      _1: ",@ `%s"
+                    }), param[0]);
+          }), fields.tl);
   }
   
 }
@@ -47983,21 +47983,21 @@ function mismatch(unif, param) {
       return m;
     } else if (has_explanation(unif, t, t$p)) {
       return [
-              t,
-              t$p
-            ];
+        t,
+        t$p
+      ];
     } else {
       return ;
     }
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              36822,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          36822,
+          9
+        ]
+      });
 }
 
 function explanation(unif, mis, ppf) {
@@ -48043,63 +48043,63 @@ function explanation(unif, mis, ppf) {
                     const p = match$1._0;
                     if (unif && t3.level < binding_time(p)) {
                       return Curry._2(Stdlib__Format.fprintf(ppf)({
-                                      TAG: /* Format */0,
+                                TAG: /* Format */0,
+                                _0: {
+                                  TAG: /* Formatting_lit */17,
+                                  _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@,",
+                                    _1: 0,
+                                    _2: 0
+                                  },
+                                  _1: {
+                                    TAG: /* Formatting_gen */18,
+                                    _0: {
+                                      TAG: /* Open_box */1,
                                       _0: {
+                                        TAG: /* Format */0,
+                                        _0: /* End_of_format */0,
+                                        _1: ""
+                                      }
+                                    },
+                                    _1: {
+                                      TAG: /* String_literal */11,
+                                      _0: "The type constructor",
+                                      _1: {
                                         TAG: /* Formatting_lit */17,
                                         _0: {
                                           TAG: /* Break */0,
-                                          _0: "@,",
-                                          _1: 0,
-                                          _2: 0
+                                          _0: "@;<1 2>",
+                                          _1: 1,
+                                          _2: 2
                                         },
                                         _1: {
-                                          TAG: /* Formatting_gen */18,
+                                          TAG: /* Alpha */15,
                                           _0: {
-                                            TAG: /* Open_box */1,
+                                            TAG: /* Formatting_lit */17,
                                             _0: {
-                                              TAG: /* Format */0,
-                                              _0: /* End_of_format */0,
-                                              _1: ""
-                                            }
-                                          },
-                                          _1: {
-                                            TAG: /* String_literal */11,
-                                            _0: "The type constructor",
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
                                             _1: {
-                                              TAG: /* Formatting_lit */17,
-                                              _0: {
-                                                TAG: /* Break */0,
-                                                _0: "@;<1 2>",
-                                                _1: 1,
-                                                _2: 2
-                                              },
+                                              TAG: /* String_literal */11,
+                                              _0: "would escape its scope",
                                               _1: {
-                                                TAG: /* Alpha */15,
-                                                _0: {
-                                                  TAG: /* Formatting_lit */17,
-                                                  _0: {
-                                                    TAG: /* Break */0,
-                                                    _0: "@ ",
-                                                    _1: 1,
-                                                    _2: 0
-                                                  },
-                                                  _1: {
-                                                    TAG: /* String_literal */11,
-                                                    _0: "would escape its scope",
-                                                    _1: {
-                                                      TAG: /* Formatting_lit */17,
-                                                      _0: /* Close_box */0,
-                                                      _1: /* End_of_format */0
-                                                    }
-                                                  }
-                                                }
+                                                TAG: /* Formatting_lit */17,
+                                                _0: /* Close_box */0,
+                                                _1: /* End_of_format */0
                                               }
                                             }
                                           }
                                         }
-                                      },
-                                      _1: "@,@[The type constructor@;<1 2>%a@ would escape its scope@]"
-                                    }), path, p);
+                                      }
+                                    }
+                                  }
+                                },
+                                _1: "@,@[The type constructor@;<1 2>%a@ would escape its scope@]"
+                              }), path, p);
                     }
                     exit$1 = 5;
                     break;
@@ -48139,63 +48139,63 @@ function explanation(unif, mis, ppf) {
                 case /* Tvar */0 :
                     if (unif && t4.level < binding_time(p$1)) {
                       return Curry._2(Stdlib__Format.fprintf(ppf)({
-                                      TAG: /* Format */0,
+                                TAG: /* Format */0,
+                                _0: {
+                                  TAG: /* Formatting_lit */17,
+                                  _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@,",
+                                    _1: 0,
+                                    _2: 0
+                                  },
+                                  _1: {
+                                    TAG: /* Formatting_gen */18,
+                                    _0: {
+                                      TAG: /* Open_box */1,
                                       _0: {
+                                        TAG: /* Format */0,
+                                        _0: /* End_of_format */0,
+                                        _1: ""
+                                      }
+                                    },
+                                    _1: {
+                                      TAG: /* String_literal */11,
+                                      _0: "The type constructor",
+                                      _1: {
                                         TAG: /* Formatting_lit */17,
                                         _0: {
                                           TAG: /* Break */0,
-                                          _0: "@,",
-                                          _1: 0,
-                                          _2: 0
+                                          _0: "@;<1 2>",
+                                          _1: 1,
+                                          _2: 2
                                         },
                                         _1: {
-                                          TAG: /* Formatting_gen */18,
+                                          TAG: /* Alpha */15,
                                           _0: {
-                                            TAG: /* Open_box */1,
+                                            TAG: /* Formatting_lit */17,
                                             _0: {
-                                              TAG: /* Format */0,
-                                              _0: /* End_of_format */0,
-                                              _1: ""
-                                            }
-                                          },
-                                          _1: {
-                                            TAG: /* String_literal */11,
-                                            _0: "The type constructor",
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
                                             _1: {
-                                              TAG: /* Formatting_lit */17,
-                                              _0: {
-                                                TAG: /* Break */0,
-                                                _0: "@;<1 2>",
-                                                _1: 1,
-                                                _2: 2
-                                              },
+                                              TAG: /* String_literal */11,
+                                              _0: "would escape its scope",
                                               _1: {
-                                                TAG: /* Alpha */15,
-                                                _0: {
-                                                  TAG: /* Formatting_lit */17,
-                                                  _0: {
-                                                    TAG: /* Break */0,
-                                                    _0: "@ ",
-                                                    _1: 1,
-                                                    _2: 0
-                                                  },
-                                                  _1: {
-                                                    TAG: /* String_literal */11,
-                                                    _0: "would escape its scope",
-                                                    _1: {
-                                                      TAG: /* Formatting_lit */17,
-                                                      _0: /* Close_box */0,
-                                                      _1: /* End_of_format */0
-                                                    }
-                                                  }
-                                                }
+                                                TAG: /* Formatting_lit */17,
+                                                _0: /* Close_box */0,
+                                                _1: /* End_of_format */0
                                               }
                                             }
                                           }
                                         }
-                                      },
-                                      _1: "@,@[The type constructor@;<1 2>%a@ would escape its scope@]"
-                                    }), path, p$1);
+                                      }
+                                    }
+                                  }
+                                },
+                                _1: "@,@[The type constructor@;<1 2>%a@ would escape its scope@]"
+                              }), path, p$1);
                     }
                     exit$4 = 9;
                     break;
@@ -48240,44 +48240,6 @@ function explanation(unif, mis, ppf) {
                         const l1 = match$2.hd[0];
                         if (l1 === match$4.hd[0]) {
                           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: {
-                                              TAG: /* Break */0,
-                                              _0: "@,",
-                                              _1: 0,
-                                              _2: 0
-                                            },
-                                            _1: {
-                                              TAG: /* String_literal */11,
-                                              _0: "Types for tag `",
-                                              _1: {
-                                                TAG: /* String */2,
-                                                _0: /* No_padding */0,
-                                                _1: {
-                                                  TAG: /* String_literal */11,
-                                                  _0: " are incompatible",
-                                                  _1: /* End_of_format */0
-                                                }
-                                              }
-                                            }
-                                          },
-                                          _1: "@,Types for tag `%s are incompatible"
-                                        }), l1);
-                        } else {
-                          return ;
-                        }
-                      }
-                      exit$5 = 10;
-                    }
-                  } else if (match$3) {
-                    let exit$6 = 0;
-                    if (match$4) {
-                      exit$6 = 11;
-                    } else {
-                      if (match$5) {
-                        return Stdlib__Format.fprintf(ppf)({
                                     TAG: /* Format */0,
                                     _0: {
                                       TAG: /* Formatting_lit */17,
@@ -48289,24 +48251,83 @@ function explanation(unif, mis, ppf) {
                                       },
                                       _1: {
                                         TAG: /* String_literal */11,
-                                        _0: "These two variant types have no intersection",
-                                        _1: /* End_of_format */0
+                                        _0: "Types for tag `",
+                                        _1: {
+                                          TAG: /* String */2,
+                                          _0: /* No_padding */0,
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: " are incompatible",
+                                            _1: /* End_of_format */0
+                                          }
+                                        }
                                       }
                                     },
-                                    _1: "@,These two variant types have no intersection"
-                                  });
+                                    _1: "@,Types for tag `%s are incompatible"
+                                  }), l1);
+                        } else {
+                          return ;
+                        }
+                      }
+                      exit$5 = 10;
+                    }
+                  } else if (match$3) {
+                    let exit$6 = 0;
+                    if (match$4) {
+                      exit$6 = 11;
+                    } else {
+                      if (match$5) {
+                        return Stdlib__Format.fprintf(ppf)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* Formatting_lit */17,
+                                _0: {
+                                  TAG: /* Break */0,
+                                  _0: "@,",
+                                  _1: 0,
+                                  _2: 0
+                                },
+                                _1: {
+                                  TAG: /* String_literal */11,
+                                  _0: "These two variant types have no intersection",
+                                  _1: /* End_of_format */0
+                                }
+                              },
+                              _1: "@,These two variant types have no intersection"
+                            });
                       }
                       exit$6 = 11;
                     }
                     if (exit$6 === 11) {
                       return Curry._2(Stdlib__Format.fprintf(ppf)({
-                                      TAG: /* Format */0,
+                                TAG: /* Format */0,
+                                _0: {
+                                  TAG: /* Formatting_lit */17,
+                                  _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@,",
+                                    _1: 0,
+                                    _2: 0
+                                  },
+                                  _1: {
+                                    TAG: /* Formatting_gen */18,
+                                    _0: {
+                                      TAG: /* Open_box */1,
                                       _0: {
+                                        TAG: /* Format */0,
+                                        _0: /* End_of_format */0,
+                                        _1: ""
+                                      }
+                                    },
+                                    _1: {
+                                      TAG: /* String_literal */11,
+                                      _0: "The first variant type does not allow tag(s)",
+                                      _1: {
                                         TAG: /* Formatting_lit */17,
                                         _0: {
                                           TAG: /* Break */0,
-                                          _0: "@,",
-                                          _1: 0,
+                                          _0: "@ ",
+                                          _1: 1,
                                           _2: 0
                                         },
                                         _1: {
@@ -48315,54 +48336,33 @@ function explanation(unif, mis, ppf) {
                                             TAG: /* Open_box */1,
                                             _0: {
                                               TAG: /* Format */0,
-                                              _0: /* End_of_format */0,
-                                              _1: ""
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: "<hov>",
+                                                _1: /* End_of_format */0
+                                              },
+                                              _1: "<hov>"
                                             }
                                           },
                                           _1: {
-                                            TAG: /* String_literal */11,
-                                            _0: "The first variant type does not allow tag(s)",
-                                            _1: {
+                                            TAG: /* Alpha */15,
+                                            _0: {
                                               TAG: /* Formatting_lit */17,
-                                              _0: {
-                                                TAG: /* Break */0,
-                                                _0: "@ ",
-                                                _1: 1,
-                                                _2: 0
-                                              },
+                                              _0: /* Close_box */0,
                                               _1: {
-                                                TAG: /* Formatting_gen */18,
-                                                _0: {
-                                                  TAG: /* Open_box */1,
-                                                  _0: {
-                                                    TAG: /* Format */0,
-                                                    _0: {
-                                                      TAG: /* String_literal */11,
-                                                      _0: "<hov>",
-                                                      _1: /* End_of_format */0
-                                                    },
-                                                    _1: "<hov>"
-                                                  }
-                                                },
-                                                _1: {
-                                                  TAG: /* Alpha */15,
-                                                  _0: {
-                                                    TAG: /* Formatting_lit */17,
-                                                    _0: /* Close_box */0,
-                                                    _1: {
-                                                      TAG: /* Formatting_lit */17,
-                                                      _0: /* Close_box */0,
-                                                      _1: /* End_of_format */0
-                                                    }
-                                                  }
-                                                }
+                                                TAG: /* Formatting_lit */17,
+                                                _0: /* Close_box */0,
+                                                _1: /* End_of_format */0
                                               }
                                             }
                                           }
                                         }
-                                      },
-                                      _1: "@,@[The first variant type does not allow tag(s)@ @[<hov>%a@]@]"
-                                    }), print_tags, match$4);
+                                      }
+                                    }
+                                  }
+                                },
+                                _1: "@,@[The first variant type does not allow tag(s)@ @[<hov>%a@]@]"
+                              }), print_tags, match$4);
                     }
                     
                   } else {
@@ -48373,13 +48373,34 @@ function explanation(unif, mis, ppf) {
                       return ;
                     } else {
                       return Curry._2(Stdlib__Format.fprintf(ppf)({
-                                      TAG: /* Format */0,
+                                TAG: /* Format */0,
+                                _0: {
+                                  TAG: /* Formatting_lit */17,
+                                  _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@,",
+                                    _1: 0,
+                                    _2: 0
+                                  },
+                                  _1: {
+                                    TAG: /* Formatting_gen */18,
+                                    _0: {
+                                      TAG: /* Open_box */1,
                                       _0: {
+                                        TAG: /* Format */0,
+                                        _0: /* End_of_format */0,
+                                        _1: ""
+                                      }
+                                    },
+                                    _1: {
+                                      TAG: /* String_literal */11,
+                                      _0: "The second variant type does not allow tag(s)",
+                                      _1: {
                                         TAG: /* Formatting_lit */17,
                                         _0: {
                                           TAG: /* Break */0,
-                                          _0: "@,",
-                                          _1: 0,
+                                          _0: "@ ",
+                                          _1: 1,
                                           _2: 0
                                         },
                                         _1: {
@@ -48388,54 +48409,33 @@ function explanation(unif, mis, ppf) {
                                             TAG: /* Open_box */1,
                                             _0: {
                                               TAG: /* Format */0,
-                                              _0: /* End_of_format */0,
-                                              _1: ""
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: "<hov>",
+                                                _1: /* End_of_format */0
+                                              },
+                                              _1: "<hov>"
                                             }
                                           },
                                           _1: {
-                                            TAG: /* String_literal */11,
-                                            _0: "The second variant type does not allow tag(s)",
-                                            _1: {
+                                            TAG: /* Alpha */15,
+                                            _0: {
                                               TAG: /* Formatting_lit */17,
-                                              _0: {
-                                                TAG: /* Break */0,
-                                                _0: "@ ",
-                                                _1: 1,
-                                                _2: 0
-                                              },
+                                              _0: /* Close_box */0,
                                               _1: {
-                                                TAG: /* Formatting_gen */18,
-                                                _0: {
-                                                  TAG: /* Open_box */1,
-                                                  _0: {
-                                                    TAG: /* Format */0,
-                                                    _0: {
-                                                      TAG: /* String_literal */11,
-                                                      _0: "<hov>",
-                                                      _1: /* End_of_format */0
-                                                    },
-                                                    _1: "<hov>"
-                                                  }
-                                                },
-                                                _1: {
-                                                  TAG: /* Alpha */15,
-                                                  _0: {
-                                                    TAG: /* Formatting_lit */17,
-                                                    _0: /* Close_box */0,
-                                                    _1: {
-                                                      TAG: /* Formatting_lit */17,
-                                                      _0: /* Close_box */0,
-                                                      _1: /* End_of_format */0
-                                                    }
-                                                  }
-                                                }
+                                                TAG: /* Formatting_lit */17,
+                                                _0: /* Close_box */0,
+                                                _1: /* End_of_format */0
                                               }
                                             }
                                           }
                                         }
-                                      },
-                                      _1: "@,@[The second variant type does not allow tag(s)@ @[<hov>%a@]@]"
-                                    }), print_tags, match$2);
+                                      }
+                                    }
+                                  }
+                                },
+                                _1: "@,@[The second variant type does not allow tag(s)@ @[<hov>%a@]@]"
+                              }), print_tags, match$2);
                     }
                   }
                   break;
@@ -48497,49 +48497,49 @@ function explanation(unif, mis, ppf) {
     switch (exit$1) {
       case 3 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* Formatting_lit */17,
-                        _0: {
-                          TAG: /* Break */0,
-                          _0: "@,",
-                          _1: 0,
-                          _2: 0
-                        },
-                        _1: {
-                          TAG: /* String_literal */11,
-                          _0: "Self type cannot escape its class",
-                          _1: /* End_of_format */0
-                        }
-                      },
-                      _1: "@,Self type cannot escape its class"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Formatting_lit */17,
+                  _0: {
+                    TAG: /* Break */0,
+                    _0: "@,",
+                    _1: 0,
+                    _2: 0
+                  },
+                  _1: {
+                    TAG: /* String_literal */11,
+                    _0: "Self type cannot escape its class",
+                    _1: /* End_of_format */0
+                  }
+                },
+                _1: "@,Self type cannot escape its class"
+              });
       case 4 :
           return Curry._2(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_lit */17,
+                      _0: {
+                        TAG: /* Break */0,
+                        _0: "@,",
+                        _1: 0,
+                        _2: 0
+                      },
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "The universal variable ",
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Formatting_lit */17,
-                            _0: {
-                              TAG: /* Break */0,
-                              _0: "@,",
-                              _1: 0,
-                              _2: 0
-                            },
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: "The universal variable ",
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: " would escape its scope",
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          },
-                          _1: "@,The universal variable %a would escape its scope"
-                        }), type_expr$1, is_Tunivar(t3) ? t3 : t4);
+                            TAG: /* String_literal */11,
+                            _0: " would escape its scope",
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "@,The universal variable %a would escape its scope"
+                  }), type_expr$1, is_Tunivar(t3) ? t3 : t4);
       case 5 :
           const match$6 = is_Tvar(t3) ? [
               t3,
@@ -48552,140 +48552,140 @@ function explanation(unif, mis, ppf) {
           const t = match$6[0];
           if (occur_in(empty, t, t$p)) {
             return Curry._4(Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@,",
+                          _1: 0,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Formatting_gen */18,
+                          _0: {
+                            TAG: /* Open_box */1,
                             _0: {
-                              TAG: /* Formatting_lit */17,
+                              TAG: /* Format */0,
                               _0: {
-                                TAG: /* Break */0,
-                                _0: "@,",
-                                _1: 0,
-                                _2: 0
+                                TAG: /* String_literal */11,
+                                _0: "<hov>",
+                                _1: /* End_of_format */0
                               },
-                              _1: {
-                                TAG: /* Formatting_gen */18,
-                                _0: {
-                                  TAG: /* Open_box */1,
-                                  _0: {
-                                    TAG: /* Format */0,
-                                    _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: "<hov>",
-                                      _1: /* End_of_format */0
-                                    },
-                                    _1: "<hov>"
-                                  }
-                                },
+                              _1: "<hov>"
+                            }
+                          },
+                          _1: {
+                            TAG: /* String_literal */11,
+                            _0: "The type variable ",
+                            _1: {
+                              TAG: /* Alpha */15,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: " occurs inside",
                                 _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: "The type variable ",
+                                  TAG: /* Formatting_lit */17,
+                                  _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@ ",
+                                    _1: 1,
+                                    _2: 0
+                                  },
                                   _1: {
                                     TAG: /* Alpha */15,
                                     _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: " occurs inside",
-                                      _1: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: {
-                                          TAG: /* Break */0,
-                                          _0: "@ ",
-                                          _1: 1,
-                                          _2: 0
-                                        },
-                                        _1: {
-                                          TAG: /* Alpha */15,
-                                          _0: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: /* Close_box */0,
-                                            _1: /* End_of_format */0
-                                          }
-                                        }
-                                      }
+                                      TAG: /* Formatting_lit */17,
+                                      _0: /* Close_box */0,
+                                      _1: /* End_of_format */0
                                     }
                                   }
                                 }
                               }
-                            },
-                            _1: "@,@[<hov>The type variable %a occurs inside@ %a@]"
-                          }), type_expr$1, t, type_expr$1, t$p);
+                            }
+                          }
+                        }
+                      },
+                      _1: "@,@[<hov>The type variable %a occurs inside@ %a@]"
+                    }), type_expr$1, t, type_expr$1, t$p);
           } else {
             return Curry._3(Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@,",
+                          _1: 0,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Formatting_gen */18,
+                          _0: {
+                            TAG: /* Open_box */1,
                             _0: {
-                              TAG: /* Formatting_lit */17,
+                              TAG: /* Format */0,
                               _0: {
-                                TAG: /* Break */0,
-                                _0: "@,",
-                                _1: 0,
-                                _2: 0
+                                TAG: /* String_literal */11,
+                                _0: "<hov>",
+                                _1: /* End_of_format */0
                               },
-                              _1: {
-                                TAG: /* Formatting_gen */18,
-                                _0: {
-                                  TAG: /* Open_box */1,
-                                  _0: {
-                                    TAG: /* Format */0,
-                                    _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: "<hov>",
-                                      _1: /* End_of_format */0
-                                    },
-                                    _1: "<hov>"
-                                  }
-                                },
+                              _1: "<hov>"
+                            }
+                          },
+                          _1: {
+                            TAG: /* String_literal */11,
+                            _0: "This instance of ",
+                            _1: {
+                              TAG: /* Alpha */15,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: " is ambiguous:",
                                 _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: "This instance of ",
+                                  TAG: /* Formatting_lit */17,
+                                  _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@ ",
+                                    _1: 1,
+                                    _2: 0
+                                  },
                                   _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: " is ambiguous:",
-                                      _1: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: {
-                                          TAG: /* Break */0,
-                                          _0: "@ ",
-                                          _1: 1,
-                                          _2: 0
-                                        },
-                                        _1: {
-                                          TAG: /* String */2,
-                                          _0: /* No_padding */0,
-                                          _1: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: /* Close_box */0,
-                                            _1: /* End_of_format */0
-                                          }
-                                        }
-                                      }
+                                    TAG: /* String */2,
+                                    _0: /* No_padding */0,
+                                    _1: {
+                                      TAG: /* Formatting_lit */17,
+                                      _0: /* Close_box */0,
+                                      _1: /* End_of_format */0
                                     }
                                   }
                                 }
                               }
-                            },
-                            _1: "@,@[<hov>This instance of %a is ambiguous:@ %s@]"
-                          }), type_expr$1, t$p, "it would escape the scope of its equation");
+                            }
+                          }
+                        }
+                      },
+                      _1: "@,@[<hov>This instance of %a is ambiguous:@ %s@]"
+                    }), type_expr$1, t$p, "it would escape the scope of its equation");
           }
       case 6 :
           if (lab === dummy_method) {
             return Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Formatting_lit */17,
-                          _0: {
-                            TAG: /* Break */0,
-                            _0: "@,",
-                            _1: 0,
-                            _2: 0
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Self type cannot be unified with a closed object type",
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "@,Self type cannot be unified with a closed object type"
-                      });
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_lit */17,
+                    _0: {
+                      TAG: /* Break */0,
+                      _0: "@,",
+                      _1: 0,
+                      _2: 0
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Self type cannot be unified with a closed object type",
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "@,Self type cannot be unified with a closed object type"
+                });
           }
           exit = 2;
           break;
@@ -48694,46 +48694,46 @@ function explanation(unif, mis, ppf) {
     switch (exit) {
       case 1 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_lit */17,
+                      _0: {
+                        TAG: /* Break */0,
+                        _0: "@,",
+                        _1: 0,
+                        _2: 0
+                      },
+                      _1: {
+                        TAG: /* Formatting_gen */18,
+                        _0: {
+                          TAG: /* Open_box */1,
                           _0: {
-                            TAG: /* Formatting_lit */17,
-                            _0: {
-                              TAG: /* Break */0,
-                              _0: "@,",
-                              _1: 0,
-                              _2: 0
-                            },
+                            TAG: /* Format */0,
+                            _0: /* End_of_format */0,
+                            _1: ""
+                          }
+                        },
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: "The ",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* Formatting_gen */18,
-                              _0: {
-                                TAG: /* Open_box */1,
-                                _0: {
-                                  TAG: /* Format */0,
-                                  _0: /* End_of_format */0,
-                                  _1: ""
-                                }
-                              },
+                              TAG: /* String_literal */11,
+                              _0: " object type has an abstract row, it cannot be closed",
                               _1: {
-                                TAG: /* String_literal */11,
-                                _0: "The ",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " object type has an abstract row, it cannot be closed",
-                                    _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: /* Close_box */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* Formatting_lit */17,
+                                _0: /* Close_box */0,
+                                _1: /* End_of_format */0
                               }
                             }
-                          },
-                          _1: "@,@[The %s object type has an abstract row, it cannot be closed@]"
-                        }), Caml_obj.caml_equal(t4.desc, /* Tnil */0) ? "first" : "second");
+                          }
+                        }
+                      }
+                    },
+                    _1: "@,@[The %s object type has an abstract row, it cannot be closed@]"
+                  }), Caml_obj.caml_equal(t4.desc, /* Tnil */0) ? "first" : "second");
       case 2 :
           let exit$7 = 0;
           if (/* tag */typeof match === "number" || typeof match === "string") {
@@ -48756,31 +48756,31 @@ function explanation(unif, mis, ppf) {
                           const match$8 = match$1._3.desc;
                           if (/* tag */(typeof match$8 === "number" || typeof match$8 === "string") && l === match$1._0) {
                             return Curry._1(Stdlib__Format.fprintf(ppf)({
-                                            TAG: /* Format */0,
-                                            _0: {
-                                              TAG: /* Formatting_lit */17,
-                                              _0: {
-                                                TAG: /* Break */0,
-                                                _0: "@,",
-                                                _1: 0,
-                                                _2: 0
-                                              },
-                                              _1: {
-                                                TAG: /* String_literal */11,
-                                                _0: "Types for method ",
-                                                _1: {
-                                                  TAG: /* String */2,
-                                                  _0: /* No_padding */0,
-                                                  _1: {
-                                                    TAG: /* String_literal */11,
-                                                    _0: " are incompatible",
-                                                    _1: /* End_of_format */0
-                                                  }
-                                                }
-                                              }
-                                            },
-                                            _1: "@,Types for method %s are incompatible"
-                                          }), l);
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_lit */17,
+                                        _0: {
+                                          TAG: /* Break */0,
+                                          _0: "@,",
+                                          _1: 0,
+                                          _2: 0
+                                        },
+                                        _1: {
+                                          TAG: /* String_literal */11,
+                                          _0: "Types for method ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: " are incompatible",
+                                              _1: /* End_of_format */0
+                                            }
+                                          }
+                                        }
+                                      },
+                                      _1: "@,Types for method %s are incompatible"
+                                    }), l);
                           } else {
                             return ;
                           }
@@ -48802,42 +48802,42 @@ function explanation(unif, mis, ppf) {
                     }
                     if (exit$9 === 5) {
                       return Curry._1(Stdlib__Format.fprintf(ppf)({
-                                      TAG: /* Format */0,
+                                TAG: /* Format */0,
+                                _0: {
+                                  TAG: /* Formatting_lit */17,
+                                  _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@,",
+                                    _1: 0,
+                                    _2: 0
+                                  },
+                                  _1: {
+                                    TAG: /* Formatting_gen */18,
+                                    _0: {
+                                      TAG: /* Open_box */1,
                                       _0: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: {
-                                          TAG: /* Break */0,
-                                          _0: "@,",
-                                          _1: 0,
-                                          _2: 0
-                                        },
+                                        TAG: /* Format */0,
+                                        _0: /* End_of_format */0,
+                                        _1: ""
+                                      }
+                                    },
+                                    _1: {
+                                      TAG: /* String_literal */11,
+                                      _0: "The second object type has no method ",
+                                      _1: {
+                                        TAG: /* String */2,
+                                        _0: /* No_padding */0,
                                         _1: {
-                                          TAG: /* Formatting_gen */18,
-                                          _0: {
-                                            TAG: /* Open_box */1,
-                                            _0: {
-                                              TAG: /* Format */0,
-                                              _0: /* End_of_format */0,
-                                              _1: ""
-                                            }
-                                          },
-                                          _1: {
-                                            TAG: /* String_literal */11,
-                                            _0: "The second object type has no method ",
-                                            _1: {
-                                              TAG: /* String */2,
-                                              _0: /* No_padding */0,
-                                              _1: {
-                                                TAG: /* Formatting_lit */17,
-                                                _0: /* Close_box */0,
-                                                _1: /* End_of_format */0
-                                              }
-                                            }
-                                          }
+                                          TAG: /* Formatting_lit */17,
+                                          _0: /* Close_box */0,
+                                          _1: /* End_of_format */0
                                         }
-                                      },
-                                      _1: "@,@[The second object type has no method %s@]"
-                                    }), l);
+                                      }
+                                    }
+                                  }
+                                },
+                                _1: "@,@[The second object type has no method %s@]"
+                              }), l);
                     }
                     
                   }
@@ -48848,42 +48848,42 @@ function explanation(unif, mis, ppf) {
           }
           if (exit$7 === 3) {
             return Curry._1(Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@,",
+                          _1: 0,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Formatting_gen */18,
+                          _0: {
+                            TAG: /* Open_box */1,
                             _0: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@,",
-                                _1: 0,
-                                _2: 0
-                              },
+                              TAG: /* Format */0,
+                              _0: /* End_of_format */0,
+                              _1: ""
+                            }
+                          },
+                          _1: {
+                            TAG: /* String_literal */11,
+                            _0: "The first object type has no method ",
+                            _1: {
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
                               _1: {
-                                TAG: /* Formatting_gen */18,
-                                _0: {
-                                  TAG: /* Open_box */1,
-                                  _0: {
-                                    TAG: /* Format */0,
-                                    _0: /* End_of_format */0,
-                                    _1: ""
-                                  }
-                                },
-                                _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: "The first object type has no method ",
-                                  _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: /* Close_box */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* Formatting_lit */17,
+                                _0: /* Close_box */0,
+                                _1: /* End_of_format */0
                               }
-                            },
-                            _1: "@,@[The first object type has no method %s@]"
-                          }), match$1._0);
+                            }
+                          }
+                        }
+                      },
+                      _1: "@,@[The first object type has no method %s@]"
+                    }), match$1._0);
           }
           break;
       
@@ -48980,9 +48980,9 @@ function report_unification_error(ppf, env, unifOpt, tr, txt1, txt2) {
           trace_same_names(tr);
           const tr$1 = Stdlib__List.map((function (param) {
                   return [
-                          param[0],
-                          hide_variant_name(param[1])
-                        ];
+                    param[0],
+                    hide_variant_name(param[1])
+                  ];
                 }), tr);
           const mis = mismatch(unif, tr$1);
           if (tr$1) {
@@ -49107,23 +49107,23 @@ function report_unification_error(ppf, env, unifOpt, tr, txt1, txt2) {
               }
             } else {
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          36921,
-                          20
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/ocaml_typedtree_test.ml",
+                      36921,
+                      20
+                    ]
+                  });
             }
           } else {
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "jscomp/test/ocaml_typedtree_test.ml",
-                        36921,
-                        20
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "jscomp/test/ocaml_typedtree_test.ml",
+                    36921,
+                    20
+                  ]
+                });
           }
         }));
 }
@@ -49173,9 +49173,9 @@ function class_declarations(env, cty1, cty2) {
   const match$1 = cty2.cty_new;
   if (match === undefined && match$1 !== undefined) {
     return {
-            hd: /* CM_Virtual_class */0,
-            tl: /* [] */0
-          };
+      hd: /* CM_Virtual_class */0,
+      tl: /* [] */0
+    };
   }
   return match_class_declarations(env, cty1.cty_params, cty1.cty_type, cty2.cty_params, cty2.cty_type);
 }
@@ -49183,490 +49183,490 @@ function class_declarations(env, cty1, cty2) {
 function include_err(ppf, lab) {
   if (/* tag */typeof lab === "number" || typeof lab === "string") {
     return Stdlib__Format.fprintf(ppf)({
-                TAG: /* Format */0,
-                _0: {
-                  TAG: /* String_literal */11,
-                  _0: "A class cannot be changed from virtual to concrete",
-                  _1: /* End_of_format */0
-                },
-                _1: "A class cannot be changed from virtual to concrete"
-              });
+          TAG: /* Format */0,
+          _0: {
+            TAG: /* String_literal */11,
+            _0: "A class cannot be changed from virtual to concrete",
+            _1: /* End_of_format */0
+          },
+          _1: "A class cannot be changed from virtual to concrete"
+        });
   }
   switch (lab.TAG) {
     case /* CM_Parameter_arity_mismatch */0 :
         return Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "The classes do not have the same number of type parameters",
-                      _1: /* End_of_format */0
-                    },
-                    _1: "The classes do not have the same number of type parameters"
-                  });
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "The classes do not have the same number of type parameters",
+                _1: /* End_of_format */0
+              },
+              _1: "The classes do not have the same number of type parameters"
+            });
     case /* CM_Type_parameter_mismatch */1 :
         return report_unification_error(ppf, lab._0, false, lab._1, (function (ppf) {
-                      Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: "A type parameter has type",
-                              _1: /* End_of_format */0
-                            },
-                            _1: "A type parameter has type"
-                          });
-                    }), (function (ppf) {
-                      Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: "but is expected to have type",
-                              _1: /* End_of_format */0
-                            },
-                            _1: "but is expected to have type"
-                          });
-                    }));
+                Stdlib__Format.fprintf(ppf)({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: "A type parameter has type",
+                        _1: /* End_of_format */0
+                      },
+                      _1: "A type parameter has type"
+                    });
+              }), (function (ppf) {
+                Stdlib__Format.fprintf(ppf)({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: "but is expected to have type",
+                        _1: /* End_of_format */0
+                      },
+                      _1: "but is expected to have type"
+                    });
+              }));
     case /* CM_Class_type_mismatch */2 :
         const cty2 = lab._2;
         const cty1 = lab._1;
         return wrap_printing_env(lab._0, (function (param) {
-                      Curry._5(Stdlib__Format.fprintf(ppf)({
+                Curry._5(Stdlib__Format.fprintf(ppf)({
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* Formatting_gen */18,
+                            _0: {
+                              TAG: /* Open_box */1,
+                              _0: {
                                 TAG: /* Format */0,
+                                _0: /* End_of_format */0,
+                                _1: ""
+                              }
+                            },
+                            _1: {
+                              TAG: /* String_literal */11,
+                              _0: "The class type",
+                              _1: {
+                                TAG: /* Formatting_lit */17,
                                 _0: {
-                                  TAG: /* Formatting_gen */18,
+                                  TAG: /* Break */0,
+                                  _0: "@;<1 2>",
+                                  _1: 1,
+                                  _2: 2
+                                },
+                                _1: {
+                                  TAG: /* Alpha */15,
                                   _0: {
-                                    TAG: /* Open_box */1,
+                                    TAG: /* Formatting_lit */17,
                                     _0: {
-                                      TAG: /* Format */0,
-                                      _0: /* End_of_format */0,
-                                      _1: ""
-                                    }
-                                  },
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: "The class type",
+                                      TAG: /* Break */0,
+                                      _0: "@ ",
+                                      _1: 1,
+                                      _2: 0
+                                    },
                                     _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@;<1 2>",
-                                        _1: 1,
-                                        _2: 2
-                                      },
+                                      TAG: /* String */2,
+                                      _0: /* No_padding */0,
                                       _1: {
-                                        TAG: /* Alpha */15,
+                                        TAG: /* Formatting_lit */17,
                                         _0: {
-                                          TAG: /* Formatting_lit */17,
+                                          TAG: /* Break */0,
+                                          _0: "@;<1 2>",
+                                          _1: 1,
+                                          _2: 2
+                                        },
+                                        _1: {
+                                          TAG: /* Alpha */15,
                                           _0: {
-                                            TAG: /* Break */0,
-                                            _0: "@ ",
-                                            _1: 1,
-                                            _2: 0
-                                          },
-                                          _1: {
-                                            TAG: /* String */2,
-                                            _0: /* No_padding */0,
-                                            _1: {
-                                              TAG: /* Formatting_lit */17,
-                                              _0: {
-                                                TAG: /* Break */0,
-                                                _0: "@;<1 2>",
-                                                _1: 1,
-                                                _2: 2
-                                              },
-                                              _1: {
-                                                TAG: /* Alpha */15,
-                                                _0: {
-                                                  TAG: /* Formatting_lit */17,
-                                                  _0: /* Close_box */0,
-                                                  _1: /* End_of_format */0
-                                                }
-                                              }
-                                            }
+                                            TAG: /* Formatting_lit */17,
+                                            _0: /* Close_box */0,
+                                            _1: /* End_of_format */0
                                           }
                                         }
                                       }
                                     }
                                   }
-                                },
-                                _1: "@[The class type@;<1 2>%a@ %s@;<1 2>%a@]"
-                              }), class_type$2, cty1, "is not matched by the class type", class_type$2, cty2);
-                    }));
+                                }
+                              }
+                            }
+                          },
+                          _1: "@[The class type@;<1 2>%a@ %s@;<1 2>%a@]"
+                        }), class_type$2, cty1, "is not matched by the class type", class_type$2, cty2);
+              }));
     case /* CM_Parameter_mismatch */3 :
         return report_unification_error(ppf, lab._0, false, lab._1, (function (ppf) {
-                      Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: "A parameter has type",
-                              _1: /* End_of_format */0
-                            },
-                            _1: "A parameter has type"
-                          });
-                    }), (function (ppf) {
-                      Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: "but is expected to have type",
-                              _1: /* End_of_format */0
-                            },
-                            _1: "but is expected to have type"
-                          });
-                    }));
+                Stdlib__Format.fprintf(ppf)({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: "A parameter has type",
+                        _1: /* End_of_format */0
+                      },
+                      _1: "A parameter has type"
+                    });
+              }), (function (ppf) {
+                Stdlib__Format.fprintf(ppf)({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: "but is expected to have type",
+                        _1: /* End_of_format */0
+                      },
+                      _1: "but is expected to have type"
+                    });
+              }));
     case /* CM_Val_type_mismatch */4 :
         const lab$1 = lab._0;
         return report_unification_error(ppf, lab._1, false, lab._2, (function (ppf) {
-                      Curry._1(Stdlib__Format.fprintf(ppf)({
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "The instance variable ",
-                                  _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
-                                      _1: {
-                                        TAG: /* String_literal */11,
-                                        _0: "has type",
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
-                                },
-                                _1: "The instance variable %s@ has type"
-                              }), lab$1);
-                    }), (function (ppf) {
-                      Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: "but is expected to have type",
-                              _1: /* End_of_format */0
-                            },
-                            _1: "but is expected to have type"
-                          });
-                    }));
-    case /* CM_Meth_type_mismatch */5 :
-        const lab$2 = lab._0;
-        return report_unification_error(ppf, lab._1, false, lab._2, (function (ppf) {
-                      Curry._1(Stdlib__Format.fprintf(ppf)({
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "The method ",
-                                  _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
-                                      _1: {
-                                        TAG: /* String_literal */11,
-                                        _0: "has type",
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
-                                },
-                                _1: "The method %s@ has type"
-                              }), lab$2);
-                    }), (function (ppf) {
-                      Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: "but is expected to have type",
-                              _1: /* End_of_format */0
-                            },
-                            _1: "but is expected to have type"
-                          });
-                    }));
-    case /* CM_Non_mutable_value */6 :
-        return Curry._1(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Formatting_gen */18,
+                Curry._1(Stdlib__Format.fprintf(ppf)({
+                          TAG: /* Format */0,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
-                          _1: {
                             TAG: /* String_literal */11,
-                            _0: "The non-mutable instance variable ",
+                            _0: "The instance variable ",
                             _1: {
                               TAG: /* String */2,
                               _0: /* No_padding */0,
                               _1: {
-                                TAG: /* String_literal */11,
-                                _0: " cannot become mutable",
+                                TAG: /* Formatting_lit */17,
+                                _0: {
+                                  TAG: /* Break */0,
+                                  _0: "@ ",
+                                  _1: 1,
+                                  _2: 0
+                                },
                                 _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
+                                  TAG: /* String_literal */11,
+                                  _0: "has type",
                                   _1: /* End_of_format */0
                                 }
                               }
                             }
-                          }
-                        },
-                        _1: "@[The non-mutable instance variable %s cannot become mutable@]"
-                      }), lab._0);
-    case /* CM_Non_concrete_value */7 :
-        return Curry._1(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
                           },
-                          _1: {
+                          _1: "The instance variable %s@ has type"
+                        }), lab$1);
+              }), (function (ppf) {
+                Stdlib__Format.fprintf(ppf)({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: "but is expected to have type",
+                        _1: /* End_of_format */0
+                      },
+                      _1: "but is expected to have type"
+                    });
+              }));
+    case /* CM_Meth_type_mismatch */5 :
+        const lab$2 = lab._0;
+        return report_unification_error(ppf, lab._1, false, lab._2, (function (ppf) {
+                Curry._1(Stdlib__Format.fprintf(ppf)({
+                          TAG: /* Format */0,
+                          _0: {
                             TAG: /* String_literal */11,
-                            _0: "The virtual instance variable ",
+                            _0: "The method ",
                             _1: {
                               TAG: /* String */2,
                               _0: /* No_padding */0,
                               _1: {
-                                TAG: /* String_literal */11,
-                                _0: " cannot become concrete",
+                                TAG: /* Formatting_lit */17,
+                                _0: {
+                                  TAG: /* Break */0,
+                                  _0: "@ ",
+                                  _1: 1,
+                                  _2: 0
+                                },
                                 _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
+                                  TAG: /* String_literal */11,
+                                  _0: "has type",
                                   _1: /* End_of_format */0
                                 }
                               }
                             }
-                          }
-                        },
-                        _1: "@[The virtual instance variable %s cannot become concrete@]"
-                      }), lab._0);
-    case /* CM_Missing_value */8 :
+                          },
+                          _1: "The method %s@ has type"
+                        }), lab$2);
+              }), (function (ppf) {
+                Stdlib__Format.fprintf(ppf)({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: "but is expected to have type",
+                        _1: /* End_of_format */0
+                      },
+                      _1: "but is expected to have type"
+                    });
+              }));
+    case /* CM_Non_mutable_value */6 :
         return Curry._1(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "The non-mutable instance variable ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " cannot become mutable",
                           _1: {
-                            TAG: /* String_literal */11,
-                            _0: "The first class type has no instance variable ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: /* Close_box */0,
-                                _1: /* End_of_format */0
-                              }
-                            }
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "@[The first class type has no instance variable %s@]"
-                      }), lab._0);
-    case /* CM_Missing_method */9 :
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[The non-mutable instance variable %s cannot become mutable@]"
+                }), lab._0);
+    case /* CM_Non_concrete_value */7 :
         return Curry._1(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "The virtual instance variable ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " cannot become concrete",
                           _1: {
-                            TAG: /* String_literal */11,
-                            _0: "The first class type has no method ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: /* Close_box */0,
-                                _1: /* End_of_format */0
-                              }
-                            }
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "@[The first class type has no method %s@]"
-                      }), lab._0);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[The virtual instance variable %s cannot become concrete@]"
+                }), lab._0);
+    case /* CM_Missing_value */8 :
+        return Curry._1(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
+                        TAG: /* Format */0,
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "The first class type has no instance variable ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
+                          _0: /* Close_box */0,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[The first class type has no instance variable %s@]"
+                }), lab._0);
+    case /* CM_Missing_method */9 :
+        return Curry._1(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
+                        TAG: /* Format */0,
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "The first class type has no method ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
+                          _0: /* Close_box */0,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[The first class type has no method %s@]"
+                }), lab._0);
     case /* CM_Hide_public */10 :
         return Curry._1(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "The public method ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " cannot be hidden",
                           _1: {
-                            TAG: /* String_literal */11,
-                            _0: "The public method ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: " cannot be hidden",
-                                _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "@[The public method %s cannot be hidden@]"
-                      }), lab._0);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[The public method %s cannot be hidden@]"
+                }), lab._0);
     case /* CM_Hide_virtual */11 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "The virtual ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
                           _1: {
-                            TAG: /* String_literal */11,
-                            _0: "The virtual ",
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                              TAG: /* String_literal */11,
+                              _0: " cannot be hidden",
                               _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " cannot be hidden",
-                                    _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: /* Close_box */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* Formatting_lit */17,
+                                _0: /* Close_box */0,
+                                _1: /* End_of_format */0
                               }
                             }
                           }
-                        },
-                        _1: "@[The virtual %s %s cannot be hidden@]"
-                      }), lab._0, lab._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[The virtual %s %s cannot be hidden@]"
+                }), lab._0, lab._1);
     case /* CM_Public_method */12 :
         return Curry._1(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "The public method ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: " cannot become private",
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
-                        },
-                        _1: "@[The public method %s cannot become private"
-                      }), lab._0);
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "The public method ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " cannot become private",
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[The public method %s cannot become private"
+                }), lab._0);
     case /* CM_Private_method */13 :
         return Curry._1(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "The private method ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: " cannot become public",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "The private method %s cannot become public"
-                      }), lab._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "The private method ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " cannot become public",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "The private method %s cannot become public"
+                }), lab._0);
     case /* CM_Virtual_method */14 :
         return Curry._1(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "The virtual method ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: " cannot become concrete",
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
-                        },
-                        _1: "@[The virtual method %s cannot become concrete"
-                      }), lab._0);
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "The virtual method ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " cannot become concrete",
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[The virtual method %s cannot become concrete"
+                }), lab._0);
     
   }
 }
@@ -49822,9 +49822,9 @@ function type_manifest(env, ty1, params1, ty2, params2, priv2) {
               }
               const match$6 = Stdlib__List.split(Stdlib__List.map((function (param) {
                           return [
-                                  param[2],
-                                  param[4]
-                                ];
+                            param[2],
+                            param[4]
+                          ];
                         }), match$5[0]));
               return equal$5(env, true, Stdlib.$at(params1, match$6[0]), Stdlib.$at(params2, match$6[1]));
             }
@@ -49993,249 +49993,249 @@ function type_manifest(env, ty1, params1, ty2, params2, priv2) {
 function report_type_mismatch(first, second, decl, ppf) {
   return function (param) {
     return Stdlib__List.iter((function (err) {
-                  if (Caml_obj.caml_equal(err, /* Manifest */4)) {
-                    return ;
-                  } else {
-                    return Curry._2(Stdlib__Format.fprintf(ppf)({
+            if (Caml_obj.caml_equal(err, /* Manifest */4)) {
+              return ;
+            } else {
+              return Curry._2(Stdlib__Format.fprintf(ppf)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* Formatting_lit */17,
+                          _0: {
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
+                          _1: {
+                            TAG: /* Alpha */15,
+                            _0: {
+                              TAG: /* Char_literal */12,
+                              _0: /* '.' */46,
+                              _1: /* End_of_format */0
+                            }
+                          }
+                        },
+                        _1: "@ %a."
+                      }), (function (param, param$1) {
+                      if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
+                        switch (param$1) {
+                          case /* Arity */0 :
+                              return Stdlib__Format.fprintf(param)({
                                     TAG: /* Format */0,
                                     _0: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: {
-                                          TAG: /* Char_literal */12,
-                                          _0: /* '.' */46,
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
+                                      TAG: /* String_literal */11,
+                                      _0: "They have different arities",
+                                      _1: /* End_of_format */0
                                     },
-                                    _1: "@ %a."
-                                  }), (function (param, param$1) {
-                                  if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
-                                    switch (param$1) {
-                                      case /* Arity */0 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "They have different arities",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "They have different arities"
-                                                    });
-                                      case /* Privacy */1 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "A private type would be revealed",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "A private type would be revealed"
-                                                    });
-                                      case /* Kind */2 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "Their kinds differ",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "Their kinds differ"
-                                                    });
-                                      case /* Constraint */3 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "Their constraints differ",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "Their constraints differ"
-                                                    });
-                                      case /* Manifest */4 :
-                                          return ;
-                                      case /* Variance */5 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "Their variances do not agree",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "Their variances do not agree"
-                                                    });
-                                      
-                                    }
-                                  } else {
-                                    switch (param$1.TAG) {
-                                      case /* Field_type */0 :
-                                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The types for field ",
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " are not equal",
-                                                                _1: /* End_of_format */0
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "The types for field %s are not equal"
-                                                        }), param$1._0.name);
-                                      case /* Field_mutable */1 :
-                                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The mutability of field ",
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " is different",
-                                                                _1: /* End_of_format */0
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "The mutability of field %s is different"
-                                                        }), param$1._0.name);
-                                      case /* Field_arity */2 :
-                                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The arities for field ",
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " differ",
-                                                                _1: /* End_of_format */0
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "The arities for field %s differ"
-                                                        }), param$1._0.name);
-                                      case /* Field_names */3 :
-                                          return Curry._3(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "Fields number ",
-                                                            _1: {
-                                                              TAG: /* Int */4,
-                                                              _0: /* Int_i */3,
-                                                              _1: /* No_padding */0,
-                                                              _2: /* No_precision */0,
-                                                              _3: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " have different names, ",
-                                                                _1: {
-                                                                  TAG: /* String */2,
-                                                                  _0: /* No_padding */0,
-                                                                  _1: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: " and ",
-                                                                    _1: {
-                                                                      TAG: /* String */2,
-                                                                      _0: /* No_padding */0,
-                                                                      _1: /* End_of_format */0
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "Fields number %i have different names, %s and %s"
-                                                        }), param$1._0, param$1._1.name, param$1._2.name);
-                                      case /* Field_missing */4 :
-                                          return Curry._3(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The field ",
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " is only present in ",
-                                                                _1: {
-                                                                  TAG: /* String */2,
-                                                                  _0: /* No_padding */0,
-                                                                  _1: {
-                                                                    TAG: /* Char_literal */12,
-                                                                    _0: /* ' ' */32,
-                                                                    _1: {
-                                                                      TAG: /* String */2,
-                                                                      _0: /* No_padding */0,
-                                                                      _1: /* End_of_format */0
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "The field %s is only present in %s %s"
-                                                        }), param$1._1.name, param$1._0 ? second : first, decl);
-                                      case /* Record_representation */5 :
-                                          return Curry._3(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "Their internal representations differ:",
-                                                            _1: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* Char_literal */12,
-                                                                  _0: /* ' ' */32,
-                                                                  _1: {
-                                                                    TAG: /* String */2,
-                                                                    _0: /* No_padding */0,
-                                                                    _1: {
-                                                                      TAG: /* Char_literal */12,
-                                                                      _0: /* ' ' */32,
-                                                                      _1: {
-                                                                        TAG: /* String */2,
-                                                                        _0: /* No_padding */0,
-                                                                        _1: /* End_of_format */0
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "Their internal representations differ:@ %s %s %s"
-                                                        }), param$1._0 ? second : first, decl, "uses unboxed float representation");
-                                      
-                                    }
-                                  }
-                                }), err);
-                  }
-                }), param);
+                                    _1: "They have different arities"
+                                  });
+                          case /* Privacy */1 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "A private type would be revealed",
+                                      _1: /* End_of_format */0
+                                    },
+                                    _1: "A private type would be revealed"
+                                  });
+                          case /* Kind */2 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "Their kinds differ",
+                                      _1: /* End_of_format */0
+                                    },
+                                    _1: "Their kinds differ"
+                                  });
+                          case /* Constraint */3 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "Their constraints differ",
+                                      _1: /* End_of_format */0
+                                    },
+                                    _1: "Their constraints differ"
+                                  });
+                          case /* Manifest */4 :
+                              return ;
+                          case /* Variance */5 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "Their variances do not agree",
+                                      _1: /* End_of_format */0
+                                    },
+                                    _1: "Their variances do not agree"
+                                  });
+                          
+                        }
+                      } else {
+                        switch (param$1.TAG) {
+                          case /* Field_type */0 :
+                              return Curry._1(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The types for field ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: " are not equal",
+                                              _1: /* End_of_format */0
+                                            }
+                                          }
+                                        },
+                                        _1: "The types for field %s are not equal"
+                                      }), param$1._0.name);
+                          case /* Field_mutable */1 :
+                              return Curry._1(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The mutability of field ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: " is different",
+                                              _1: /* End_of_format */0
+                                            }
+                                          }
+                                        },
+                                        _1: "The mutability of field %s is different"
+                                      }), param$1._0.name);
+                          case /* Field_arity */2 :
+                              return Curry._1(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The arities for field ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: " differ",
+                                              _1: /* End_of_format */0
+                                            }
+                                          }
+                                        },
+                                        _1: "The arities for field %s differ"
+                                      }), param$1._0.name);
+                          case /* Field_names */3 :
+                              return Curry._3(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "Fields number ",
+                                          _1: {
+                                            TAG: /* Int */4,
+                                            _0: /* Int_i */3,
+                                            _1: /* No_padding */0,
+                                            _2: /* No_precision */0,
+                                            _3: {
+                                              TAG: /* String_literal */11,
+                                              _0: " have different names, ",
+                                              _1: {
+                                                TAG: /* String */2,
+                                                _0: /* No_padding */0,
+                                                _1: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: " and ",
+                                                  _1: {
+                                                    TAG: /* String */2,
+                                                    _0: /* No_padding */0,
+                                                    _1: /* End_of_format */0
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "Fields number %i have different names, %s and %s"
+                                      }), param$1._0, param$1._1.name, param$1._2.name);
+                          case /* Field_missing */4 :
+                              return Curry._3(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The field ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: " is only present in ",
+                                              _1: {
+                                                TAG: /* String */2,
+                                                _0: /* No_padding */0,
+                                                _1: {
+                                                  TAG: /* Char_literal */12,
+                                                  _0: /* ' ' */32,
+                                                  _1: {
+                                                    TAG: /* String */2,
+                                                    _0: /* No_padding */0,
+                                                    _1: /* End_of_format */0
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "The field %s is only present in %s %s"
+                                      }), param$1._1.name, param$1._0 ? second : first, decl);
+                          case /* Record_representation */5 :
+                              return Curry._3(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "Their internal representations differ:",
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* String */2,
+                                              _0: /* No_padding */0,
+                                              _1: {
+                                                TAG: /* Char_literal */12,
+                                                _0: /* ' ' */32,
+                                                _1: {
+                                                  TAG: /* String */2,
+                                                  _0: /* No_padding */0,
+                                                  _1: {
+                                                    TAG: /* Char_literal */12,
+                                                    _0: /* ' ' */32,
+                                                    _1: {
+                                                      TAG: /* String */2,
+                                                      _0: /* No_padding */0,
+                                                      _1: /* End_of_format */0
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "Their internal representations differ:@ %s %s %s"
+                                      }), param$1._0 ? second : first, decl, "uses unboxed float representation");
+                          
+                        }
+                      }
+                    }), err);
+            }
+          }), param);
   };
 }
 
@@ -50247,13 +50247,13 @@ function compare_variants(env, decl1, decl2, _n, _cstrs1, _cstrs2) {
     if (!cstrs1) {
       if (cstrs2) {
         return {
-                hd: {
-                  TAG: /* Field_missing */4,
-                  _0: true,
-                  _1: cstrs2.hd.cd_id
-                },
-                tl: /* [] */0
-              };
+          hd: {
+            TAG: /* Field_missing */4,
+            _0: true,
+            _1: cstrs2.hd.cd_id
+          },
+          tl: /* [] */0
+        };
       } else {
         return /* [] */0;
       }
@@ -50261,13 +50261,13 @@ function compare_variants(env, decl1, decl2, _n, _cstrs1, _cstrs2) {
     const c = cstrs1.hd;
     if (!cstrs2) {
       return {
-              hd: {
-                TAG: /* Field_missing */4,
-                _0: false,
-                _1: c.cd_id
-              },
-              tl: /* [] */0
-            };
+        hd: {
+          TAG: /* Field_missing */4,
+          _0: false,
+          _1: c.cd_id
+        },
+        tl: /* [] */0
+      };
     }
     const match = cstrs2.hd;
     const ret2 = match.cd_res;
@@ -50278,33 +50278,33 @@ function compare_variants(env, decl1, decl2, _n, _cstrs1, _cstrs2) {
     const cstr1 = c.cd_id;
     if (cstr1.name !== cstr2.name) {
       return {
-              hd: {
-                TAG: /* Field_names */3,
-                _0: n,
-                _1: cstr1,
-                _2: cstr2
-              },
-              tl: /* [] */0
-            };
+        hd: {
+          TAG: /* Field_names */3,
+          _0: n,
+          _1: cstr1,
+          _2: cstr2
+        },
+        tl: /* [] */0
+      };
     }
     if (Stdlib__List.length(arg1) !== Stdlib__List.length(arg2)) {
       return {
-              hd: {
-                TAG: /* Field_arity */2,
-                _0: cstr1
-              },
-              tl: /* [] */0
-            };
+        hd: {
+          TAG: /* Field_arity */2,
+          _0: cstr1
+        },
+        tl: /* [] */0
+      };
     }
     if (ret1 !== undefined) {
       if (ret2 === undefined) {
         return {
-                hd: {
-                  TAG: /* Field_type */0,
-                  _0: cstr1
-                },
-                tl: /* [] */0
-              };
+          hd: {
+            TAG: /* Field_type */0,
+            _0: cstr1
+          },
+          tl: /* [] */0
+        };
       }
       if (!equal$5(env, true, {
               hd: ret1,
@@ -50314,39 +50314,39 @@ function compare_variants(env, decl1, decl2, _n, _cstrs1, _cstrs2) {
               tl: /* [] */0
             })) {
         return {
-                hd: {
-                  TAG: /* Field_type */0,
-                  _0: cstr1
-                },
-                tl: /* [] */0
-              };
+          hd: {
+            TAG: /* Field_type */0,
+            _0: cstr1
+          },
+          tl: /* [] */0
+        };
       }
       
     } else if (ret2 !== undefined) {
       return {
-              hd: {
-                TAG: /* Field_type */0,
-                _0: cstr1
-              },
-              tl: /* [] */0
-            };
+        hd: {
+          TAG: /* Field_type */0,
+          _0: cstr1
+        },
+        tl: /* [] */0
+      };
     }
     if (!for_all2((function (ty1, ty2) {
               return equal$5(env, true, {
-                          hd: ty1,
-                          tl: decl1.type_params
-                        }, {
-                          hd: ty2,
-                          tl: decl2.type_params
-                        });
+                    hd: ty1,
+                    tl: decl1.type_params
+                  }, {
+                    hd: ty2,
+                    tl: decl2.type_params
+                  });
             }), arg1, arg2)) {
       return {
-              hd: {
-                TAG: /* Field_type */0,
-                _0: cstr1
-              },
-              tl: /* [] */0
-            };
+        hd: {
+          TAG: /* Field_type */0,
+          _0: cstr1
+        },
+        tl: /* [] */0
+      };
     }
     _cstrs2 = cstrs2.tl;
     _cstrs1 = cstrs1.tl;
@@ -50363,13 +50363,13 @@ function compare_records(env, decl1, decl2, _n, _labels1, _labels2) {
     if (!labels1) {
       if (labels2) {
         return {
-                hd: {
-                  TAG: /* Field_missing */4,
-                  _0: true,
-                  _1: labels2.hd.ld_id
-                },
-                tl: /* [] */0
-              };
+          hd: {
+            TAG: /* Field_missing */4,
+            _0: true,
+            _1: labels2.hd.ld_id
+          },
+          tl: /* [] */0
+        };
       } else {
         return /* [] */0;
       }
@@ -50377,36 +50377,36 @@ function compare_records(env, decl1, decl2, _n, _labels1, _labels2) {
     const l = labels1.hd;
     if (!labels2) {
       return {
-              hd: {
-                TAG: /* Field_missing */4,
-                _0: false,
-                _1: l.ld_id
-              },
-              tl: /* [] */0
-            };
+        hd: {
+          TAG: /* Field_missing */4,
+          _0: false,
+          _1: l.ld_id
+        },
+        tl: /* [] */0
+      };
     }
     const match = labels2.hd;
     const lab2 = match.ld_id;
     const lab1 = l.ld_id;
     if (lab1.name !== lab2.name) {
       return {
-              hd: {
-                TAG: /* Field_names */3,
-                _0: n,
-                _1: lab1,
-                _2: lab2
-              },
-              tl: /* [] */0
-            };
+        hd: {
+          TAG: /* Field_names */3,
+          _0: n,
+          _1: lab1,
+          _2: lab2
+        },
+        tl: /* [] */0
+      };
     }
     if (l.ld_mutable !== match.ld_mutable) {
       return {
-              hd: {
-                TAG: /* Field_mutable */1,
-                _0: lab1
-              },
-              tl: /* [] */0
-            };
+        hd: {
+          TAG: /* Field_mutable */1,
+          _0: lab1
+        },
+        tl: /* [] */0
+      };
     }
     if (!equal$5(env, true, {
             hd: l.ld_type,
@@ -50416,12 +50416,12 @@ function compare_records(env, decl1, decl2, _n, _labels1, _labels2) {
             tl: decl2.type_params
           })) {
       return {
-              hd: {
-                TAG: /* Field_type */0,
-                _0: lab1
-              },
-              tl: /* [] */0
-            };
+        hd: {
+          TAG: /* Field_type */0,
+          _0: lab1
+        },
+        tl: /* [] */0
+      };
     }
     _labels2 = labels2.tl;
     _labels1 = labels1.tl;
@@ -50434,15 +50434,15 @@ function type_declarations$1(equalityOpt, env, name, decl1, id, decl2) {
   const equality = equalityOpt !== undefined ? equalityOpt : false;
   if (decl1.type_arity !== decl2.type_arity) {
     return {
-            hd: /* Arity */0,
-            tl: /* [] */0
-          };
+      hd: /* Arity */0,
+      tl: /* [] */0
+    };
   }
   if (!private_flags(decl1, decl2)) {
     return {
-            hd: /* Privacy */1,
-            tl: /* [] */0
-          };
+      hd: /* Privacy */1,
+      tl: /* [] */0
+    };
   }
   const match = decl1.type_kind;
   const match$1 = decl2.type_kind;
@@ -50456,9 +50456,9 @@ function type_declarations$1(equalityOpt, env, name, decl1, id, decl2) {
   if (exit === 1) {
     if (/* tag */typeof match === "number" || typeof match === "string") {
       err = match === /* Type_abstract */0 || !/* tag */(typeof match$1 === "number" || typeof match$1 === "string") ? ({
-            hd: /* Kind */2,
-            tl: /* [] */0
-          }) : /* [] */0;
+          hd: /* Kind */2,
+          tl: /* [] */0
+        }) : /* [] */0;
     } else if (match.TAG === /* Type_record */0) {
       if (/* tag */typeof match$1 === "number" || typeof match$1 === "string" || match$1.TAG !== /* Type_record */0) {
         err = {
@@ -50469,12 +50469,12 @@ function type_declarations$1(equalityOpt, env, name, decl1, id, decl2) {
         const rep2 = match$1._1;
         const err$1 = compare_records(env, decl1, decl2, 1, match._0, match$1._0);
         err = Caml_obj.caml_notequal(err$1, /* [] */0) || match._1 === rep2 ? err$1 : ({
-              hd: {
-                TAG: /* Record_representation */5,
-                _0: rep2 === /* Record_float */1
-              },
-              tl: /* [] */0
-            });
+            hd: {
+              TAG: /* Record_representation */5,
+              _0: rep2 === /* Record_float */1
+            },
+            tl: /* [] */0
+          });
       }
     } else {
       const cstrs1 = match._0;
@@ -50508,9 +50508,9 @@ function type_declarations$1(equalityOpt, env, name, decl1, id, decl2) {
   if (match$3 !== undefined) {
     if (match$2 !== undefined) {
       err$2 = type_manifest(env, match$2, decl1.type_params, match$3, decl2.type_params, decl2.type_private) ? /* [] */0 : ({
-            hd: /* Manifest */4,
-            tl: /* [] */0
-          });
+          hd: /* Manifest */4,
+          tl: /* [] */0
+        });
     } else {
       const ty1 = newty2(100000000, {
             TAG: /* Tconstr */3,
@@ -50531,19 +50531,19 @@ function type_declarations$1(equalityOpt, env, name, decl1, id, decl2) {
                 hd: match$3,
                 tl: /* [] */0
               }) ? /* [] */0 : ({
-                hd: /* Manifest */4,
-                tl: /* [] */0
-              })
+              hd: /* Manifest */4,
+              tl: /* [] */0
+            })
         ) : ({
-            hd: /* Constraint */3,
-            tl: /* [] */0
-          });
-    }
-  } else {
-    err$2 = equal$5(env, true, decl1.type_params, decl2.type_params) ? /* [] */0 : ({
           hd: /* Constraint */3,
           tl: /* [] */0
         });
+    }
+  } else {
+    err$2 = equal$5(env, true, decl1.type_params, decl2.type_params) ? /* [] */0 : ({
+        hd: /* Constraint */3,
+        tl: /* [] */0
+      });
   }
   if (Caml_obj.caml_notequal(err$2, /* [] */0)) {
     return err$2;
@@ -50569,17 +50569,17 @@ function type_declarations$1(equalityOpt, env, name, decl1, id, decl2) {
             const match$2 = Curry._1(Types_Variance.get_lower, v1);
             const match$3 = Curry._1(Types_Variance.get_lower, v2);
             return abstr ? (
-                      (!match$3[0] || match$2[0]) && (!match$3[1] || match$2[1]) && (!match$3[2] || match$2[2]) ? (
-                          match$3[3] ? match$2[3] : true
-                        ) : false
-                    ) : true;
+                (!match$3[0] || match$2[0]) && (!match$3[1] || match$2[1]) && (!match$3[2] || match$2[2]) ? (
+                    match$3[3] ? match$2[3] : true
+                  ) : false
+              ) : true;
           }), decl2.type_params, Stdlib__List.combine(decl1.type_variance, decl2.type_variance))) {
     return /* [] */0;
   } else {
     return {
-            hd: /* Variance */5,
-            tl: /* [] */0
-          };
+      hd: /* Variance */5,
+      tl: /* [] */0
+    };
   }
 }
 
@@ -50638,12 +50638,12 @@ function extension_constructors(env, id, ext1, ext2) {
   if (exit === 1) {
     tmp = for_all2((function (ty1, ty2) {
             return equal$5(env, true, {
-                        hd: ty1,
-                        tl: ext1.ext_type_params
-                      }, {
-                        hd: ty2,
-                        tl: ext2.ext_type_params
-                      });
+                  hd: ty1,
+                  tl: ext1.ext_type_params
+                }, {
+                  hd: ty2,
+                  tl: ext2.ext_type_params
+                });
           }), ext1.ext_args, ext2.ext_args);
   }
   if (!tmp) {
@@ -50679,25 +50679,25 @@ function strengthen$1(env, mty, p) {
   switch (sg.TAG) {
     case /* Mty_signature */1 :
         return {
-                TAG: /* Mty_signature */1,
-                _0: strengthen_sig(env, sg._0, p)
-              };
+          TAG: /* Mty_signature */1,
+          _0: strengthen_sig(env, sg._0, p)
+        };
     case /* Mty_functor */2 :
         const param = sg._0;
         if (applicative_functors.contents && param.name !== "*") {
           return {
-                  TAG: /* Mty_functor */2,
-                  _0: param,
-                  _1: sg._1,
-                  _2: strengthen$1(env, sg._2, {
-                        TAG: /* Papply */2,
-                        _0: p,
-                        _1: {
-                          TAG: /* Pident */0,
-                          _0: param
-                        }
-                      })
-                };
+            TAG: /* Mty_functor */2,
+            _0: param,
+            _1: sg._1,
+            _2: strengthen$1(env, sg._2, {
+                  TAG: /* Papply */2,
+                  _0: p,
+                  _1: {
+                    TAG: /* Pident */0,
+                    _0: param
+                  }
+                })
+          };
         } else {
           return sg;
         }
@@ -50742,36 +50742,36 @@ function strengthen_sig(env, sg, p) {
                 }
               });
           newdecl = Caml_obj.caml_equal(decl.type_kind, /* Type_abstract */0) ? ({
-                type_params: decl.type_params,
-                type_arity: decl.type_arity,
-                type_kind: decl.type_kind,
-                type_private: /* Public */1,
-                type_manifest: manif,
-                type_variance: decl.type_variance,
-                type_newtype_level: decl.type_newtype_level,
-                type_loc: decl.type_loc,
-                type_attributes: decl.type_attributes
-              }) : ({
-                type_params: decl.type_params,
-                type_arity: decl.type_arity,
-                type_kind: decl.type_kind,
-                type_private: decl.type_private,
-                type_manifest: manif,
-                type_variance: decl.type_variance,
-                type_newtype_level: decl.type_newtype_level,
-                type_loc: decl.type_loc,
-                type_attributes: decl.type_attributes
-              });
+              type_params: decl.type_params,
+              type_arity: decl.type_arity,
+              type_kind: decl.type_kind,
+              type_private: /* Public */1,
+              type_manifest: manif,
+              type_variance: decl.type_variance,
+              type_newtype_level: decl.type_newtype_level,
+              type_loc: decl.type_loc,
+              type_attributes: decl.type_attributes
+            }) : ({
+              type_params: decl.type_params,
+              type_arity: decl.type_arity,
+              type_kind: decl.type_kind,
+              type_private: decl.type_private,
+              type_manifest: manif,
+              type_variance: decl.type_variance,
+              type_newtype_level: decl.type_newtype_level,
+              type_loc: decl.type_loc,
+              type_attributes: decl.type_attributes
+            });
         }
         return {
-                hd: {
-                  TAG: /* Sig_type */1,
-                  _0: id,
-                  _1: newdecl,
-                  _2: sigelt._2
-                },
-                tl: strengthen_sig(env, sg.tl, p)
-              };
+          hd: {
+            TAG: /* Sig_type */1,
+            _0: id,
+            _1: newdecl,
+            _2: sigelt._2
+          },
+          tl: strengthen_sig(env, sg.tl, p)
+        };
     case /* Sig_module */3 :
         const md = sigelt._1;
         const id$1 = sigelt._0;
@@ -50782,53 +50782,53 @@ function strengthen_sig(env, sg, p) {
               _2: -1
             });
         return {
-                hd: {
-                  TAG: /* Sig_module */3,
-                  _0: id$1,
-                  _1: str,
-                  _2: sigelt._2
-                },
-                tl: strengthen_sig(add_module_declaration(undefined, id$1, md, env), sg.tl, p)
-              };
+          hd: {
+            TAG: /* Sig_module */3,
+            _0: id$1,
+            _1: str,
+            _2: sigelt._2
+          },
+          tl: strengthen_sig(add_module_declaration(undefined, id$1, md, env), sg.tl, p)
+        };
     case /* Sig_modtype */4 :
         const decl$1 = sigelt._1;
         const id$2 = sigelt._0;
         const match$3 = decl$1.mtd_type;
         const newdecl$1 = match$3 !== undefined ? decl$1 : ({
-              mtd_type: {
-                TAG: /* Mty_ident */0,
-                _0: {
-                  TAG: /* Pdot */1,
-                  _0: p,
-                  _1: id$2.name,
-                  _2: -1
-                }
-              },
-              mtd_attributes: decl$1.mtd_attributes,
-              mtd_loc: decl$1.mtd_loc
-            });
+            mtd_type: {
+              TAG: /* Mty_ident */0,
+              _0: {
+                TAG: /* Pdot */1,
+                _0: p,
+                _1: id$2.name,
+                _2: -1
+              }
+            },
+            mtd_attributes: decl$1.mtd_attributes,
+            mtd_loc: decl$1.mtd_loc
+          });
         return {
-                hd: {
-                  TAG: /* Sig_modtype */4,
-                  _0: id$2,
-                  _1: newdecl$1
-                },
-                tl: strengthen_sig(add_modtype$1(id$2, decl$1, env), sg.tl, p)
-              };
+          hd: {
+            TAG: /* Sig_modtype */4,
+            _0: id$2,
+            _1: newdecl$1
+          },
+          tl: strengthen_sig(add_modtype$1(id$2, decl$1, env), sg.tl, p)
+        };
     default:
       return {
-              hd: sigelt,
-              tl: strengthen_sig(env, sg.tl, p)
-            };
+        hd: sigelt,
+        tl: strengthen_sig(env, sg.tl, p)
+      };
   }
 }
 
 function strengthen_decl(env, md, p) {
   return {
-          md_type: strengthen$1(env, md.md_type, p),
-          md_attributes: md.md_attributes,
-          md_loc: md.md_loc
-        };
+    md_type: strengthen$1(env, md.md_type, p),
+    md_attributes: md.md_attributes,
+    md_loc: md.md_loc
+  };
 }
 
 strengthen.contents = strengthen$1;
@@ -50847,9 +50847,9 @@ function nondep_supertype(env, mid, mty) {
             continue ;
         case /* Mty_signature */1 :
             return {
-                    TAG: /* Mty_signature */1,
-                    _0: nondep_sig(env, va, mty._0)
-                  };
+              TAG: /* Mty_signature */1,
+              _0: nondep_sig(env, va, mty._0)
+            };
         case /* Mty_functor */2 :
             const arg = mty._1;
             const param = mty._0;
@@ -50867,16 +50867,16 @@ function nondep_supertype(env, mid, mty) {
               
             }
             return {
-                    TAG: /* Mty_functor */2,
-                    _0: param,
-                    _1: may_map((function (param) {
-                            return nondep_mty(env, var_inv, param);
-                          }), arg),
-                    _2: nondep_mty(add_module$1(true, param, arg !== undefined ? arg : ({
-                                  TAG: /* Mty_signature */1,
-                                  _0: /* [] */0
-                                }), env), va, mty._2)
-                  };
+              TAG: /* Mty_functor */2,
+              _0: param,
+              _1: may_map((function (param) {
+                      return nondep_mty(env, var_inv, param);
+                    }), arg),
+              _2: nondep_mty(add_module$1(true, param, arg !== undefined ? arg : ({
+                          TAG: /* Mty_signature */1,
+                          _0: /* [] */0
+                        }), env), va, mty._2)
+            };
         case /* Mty_alias */3 :
             const p$1 = mty._0;
             if (!isfree(mid, p$1)) {
@@ -50898,65 +50898,65 @@ function nondep_supertype(env, mid, mty) {
       case /* Sig_value */0 :
           const d = item._1;
           return {
-                  hd: {
-                    TAG: /* Sig_value */0,
-                    _0: item._0,
-                    _1: {
-                      val_type: nondep_type(env, mid, d.val_type),
-                      val_kind: d.val_kind,
-                      val_loc: d.val_loc,
-                      val_attributes: d.val_attributes
-                    }
-                  },
-                  tl: rem$p
-                };
+            hd: {
+              TAG: /* Sig_value */0,
+              _0: item._0,
+              _1: {
+                val_type: nondep_type(env, mid, d.val_type),
+                val_kind: d.val_kind,
+                val_loc: d.val_loc,
+                val_attributes: d.val_attributes
+              }
+            },
+            tl: rem$p
+          };
       case /* Sig_type */1 :
           const id = item._0;
           return {
-                  hd: {
-                    TAG: /* Sig_type */1,
-                    _0: id,
-                    _1: nondep_type_decl(env, mid, id, va === /* Co */0, item._1),
-                    _2: item._2
-                  },
-                  tl: rem$p
-                };
+            hd: {
+              TAG: /* Sig_type */1,
+              _0: id,
+              _1: nondep_type_decl(env, mid, id, va === /* Co */0, item._1),
+              _2: item._2
+            },
+            tl: rem$p
+          };
       case /* Sig_typext */2 :
           return {
-                  hd: {
-                    TAG: /* Sig_typext */2,
-                    _0: item._0,
-                    _1: nondep_extension_constructor(env, mid, item._1),
-                    _2: item._2
-                  },
-                  tl: rem$p
-                };
+            hd: {
+              TAG: /* Sig_typext */2,
+              _0: item._0,
+              _1: nondep_extension_constructor(env, mid, item._1),
+              _2: item._2
+            },
+            tl: rem$p
+          };
       case /* Sig_module */3 :
           const md = item._1;
           return {
-                  hd: {
-                    TAG: /* Sig_module */3,
-                    _0: item._0,
-                    _1: {
-                      md_type: nondep_mty(env, va, md.md_type),
-                      md_attributes: md.md_attributes,
-                      md_loc: md.md_loc
-                    },
-                    _2: item._2
-                  },
-                  tl: rem$p
-                };
+            hd: {
+              TAG: /* Sig_module */3,
+              _0: item._0,
+              _1: {
+                md_type: nondep_mty(env, va, md.md_type),
+                md_attributes: md.md_attributes,
+                md_loc: md.md_loc
+              },
+              _2: item._2
+            },
+            tl: rem$p
+          };
       case /* Sig_modtype */4 :
           const id$1 = item._0;
           try {
             return {
-                    hd: {
-                      TAG: /* Sig_modtype */4,
-                      _0: id$1,
-                      _1: nondep_modtype_decl(env, item._1)
-                    },
-                    tl: rem$p
-                  };
+              hd: {
+                TAG: /* Sig_modtype */4,
+                _0: id$1,
+                _1: nondep_modtype_decl(env, item._1)
+              },
+              tl: rem$p
+            };
           }
           catch (raw_exn){
             const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -50964,22 +50964,22 @@ function nondep_supertype(env, mid, mty) {
               switch (va) {
                 case /* Co */0 :
                     return {
-                            hd: {
-                              TAG: /* Sig_modtype */4,
-                              _0: id$1,
-                              _1: {
-                                mtd_type: undefined,
-                                mtd_attributes: /* [] */0,
-                                mtd_loc: none
-                              }
-                            },
-                            tl: rem$p
-                          };
+                      hd: {
+                        TAG: /* Sig_modtype */4,
+                        _0: id$1,
+                        _1: {
+                          mtd_type: undefined,
+                          mtd_attributes: /* [] */0,
+                          mtd_loc: none
+                        }
+                      },
+                      tl: rem$p
+                    };
                 case /* Contra */1 :
                 case /* Strict */2 :
                     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                              MEL_EXN_ID: Stdlib.Not_found
-                            });
+                          MEL_EXN_ID: Stdlib.Not_found
+                        });
                 
               }
             } else {
@@ -50988,35 +50988,35 @@ function nondep_supertype(env, mid, mty) {
           }
       case /* Sig_class */5 :
           return {
-                  hd: {
-                    TAG: /* Sig_class */5,
-                    _0: item._0,
-                    _1: nondep_class_declaration(env, mid, item._1),
-                    _2: item._2
-                  },
-                  tl: rem$p
-                };
+            hd: {
+              TAG: /* Sig_class */5,
+              _0: item._0,
+              _1: nondep_class_declaration(env, mid, item._1),
+              _2: item._2
+            },
+            tl: rem$p
+          };
       case /* Sig_class_type */6 :
           return {
-                  hd: {
-                    TAG: /* Sig_class_type */6,
-                    _0: item._0,
-                    _1: nondep_cltype_declaration(env, mid, item._1),
-                    _2: item._2
-                  },
-                  tl: rem$p
-                };
+            hd: {
+              TAG: /* Sig_class_type */6,
+              _0: item._0,
+              _1: nondep_cltype_declaration(env, mid, item._1),
+              _2: item._2
+            },
+            tl: rem$p
+          };
       
     }
   };
   const nondep_modtype_decl = function (env, mtd) {
     return {
-            mtd_type: may_map((function (param) {
-                    return nondep_mty(env, /* Strict */2, param);
-                  }), mtd.mtd_type),
-            mtd_attributes: mtd.mtd_attributes,
-            mtd_loc: mtd.mtd_loc
-          };
+      mtd_type: may_map((function (param) {
+              return nondep_mty(env, /* Strict */2, param);
+            }), mtd.mtd_type),
+      mtd_attributes: mtd.mtd_attributes,
+      mtd_loc: mtd.mtd_loc
+    };
   };
   return nondep_mty(env, /* Co */0, mty);
 }
@@ -51032,23 +51032,23 @@ function enrich_typedecl(env, p, decl) {
       return decl;
     } else {
       return {
-              type_params: decl.type_params,
-              type_arity: decl.type_arity,
-              type_kind: decl.type_kind,
-              type_private: decl.type_private,
-              type_manifest: newty2(100000000, {
-                    TAG: /* Tconstr */3,
-                    _0: p,
-                    _1: decl.type_params,
-                    _2: {
-                      contents: /* Mnil */0
-                    }
-                  }),
-              type_variance: decl.type_variance,
-              type_newtype_level: decl.type_newtype_level,
-              type_loc: decl.type_loc,
-              type_attributes: decl.type_attributes
-            };
+        type_params: decl.type_params,
+        type_arity: decl.type_arity,
+        type_kind: decl.type_kind,
+        type_private: decl.type_private,
+        type_manifest: newty2(100000000, {
+              TAG: /* Tconstr */3,
+              _0: p,
+              _1: decl.type_params,
+              _2: {
+                contents: /* Mnil */0
+              }
+            }),
+        type_variance: decl.type_variance,
+        type_newtype_level: decl.type_newtype_level,
+        type_loc: decl.type_loc,
+        type_attributes: decl.type_attributes
+      };
     }
   }
   catch (raw_exn){
@@ -51063,45 +51063,45 @@ function enrich_typedecl(env, p, decl) {
 function enrich_modtype(env, p, mty) {
   if (mty.TAG === /* Mty_signature */1) {
     return {
-            TAG: /* Mty_signature */1,
-            _0: Stdlib__List.map((function (param) {
-                    switch (param.TAG) {
-                      case /* Sig_type */1 :
-                          const id = param._0;
-                          return {
-                                  TAG: /* Sig_type */1,
-                                  _0: id,
-                                  _1: enrich_typedecl(env, {
-                                        TAG: /* Pdot */1,
-                                        _0: p,
-                                        _1: id.name,
-                                        _2: -1
-                                      }, param._1),
-                                  _2: param._2
-                                };
-                      case /* Sig_module */3 :
-                          const md = param._1;
-                          const id$1 = param._0;
-                          return {
-                                  TAG: /* Sig_module */3,
-                                  _0: id$1,
-                                  _1: {
-                                    md_type: enrich_modtype(env, {
-                                          TAG: /* Pdot */1,
-                                          _0: p,
-                                          _1: id$1.name,
-                                          _2: -1
-                                        }, md.md_type),
-                                    md_attributes: md.md_attributes,
-                                    md_loc: md.md_loc
-                                  },
-                                  _2: param._2
-                                };
-                      default:
-                        return param;
-                    }
-                  }), mty._0)
-          };
+      TAG: /* Mty_signature */1,
+      _0: Stdlib__List.map((function (param) {
+              switch (param.TAG) {
+                case /* Sig_type */1 :
+                    const id = param._0;
+                    return {
+                      TAG: /* Sig_type */1,
+                      _0: id,
+                      _1: enrich_typedecl(env, {
+                            TAG: /* Pdot */1,
+                            _0: p,
+                            _1: id.name,
+                            _2: -1
+                          }, param._1),
+                      _2: param._2
+                    };
+                case /* Sig_module */3 :
+                    const md = param._1;
+                    const id$1 = param._0;
+                    return {
+                      TAG: /* Sig_module */3,
+                      _0: id$1,
+                      _1: {
+                        md_type: enrich_modtype(env, {
+                              TAG: /* Pdot */1,
+                              _0: p,
+                              _1: id$1.name,
+                              _2: -1
+                            }, md.md_type),
+                        md_attributes: md.md_attributes,
+                        md_loc: md.md_loc
+                      },
+                      _2: param._2
+                    };
+                default:
+                  return param;
+              }
+            }), mty._0)
+    };
   } else {
     return mty;
   }
@@ -51135,23 +51135,23 @@ function type_paths_sig(_env, p, _pos, _sg) {
           continue ;
       case /* Sig_type */1 :
           return {
-                  hd: {
-                    TAG: /* Pdot */1,
-                    _0: p,
-                    _1: match._0.name,
-                    _2: -1
-                  },
-                  tl: type_paths_sig(env, p, pos, sg.tl)
-                };
+            hd: {
+              TAG: /* Pdot */1,
+              _0: p,
+              _1: match._0.name,
+              _2: -1
+            },
+            tl: type_paths_sig(env, p, pos, sg.tl)
+          };
       case /* Sig_module */3 :
           const md = match._1;
           const id = match._0;
           return Stdlib.$at(type_paths(env, {
-                          TAG: /* Pdot */1,
-                          _0: p,
-                          _1: id.name,
-                          _2: pos
-                        }, md.md_type), type_paths_sig(add_module_declaration(undefined, id, md, env), p, pos + 1 | 0, sg.tl));
+                    TAG: /* Pdot */1,
+                    _0: p,
+                    _1: id.name,
+                    _2: pos
+                  }, md.md_type), type_paths_sig(add_module_declaration(undefined, id, md, env), p, pos + 1 | 0, sg.tl));
       case /* Sig_modtype */4 :
           _sg = sg.tl;
           _env = add_modtype$1(match._0, match._1, env);
@@ -51181,15 +51181,15 @@ function contains_type(env, _path) {
               return contains_type(env, mty);
             }
             throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                      MEL_EXN_ID: Stdlib.Exit
-                    });
+                  MEL_EXN_ID: Stdlib.Exit
+                });
           }
           catch (raw_exn){
             const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn.MEL_EXN_ID === Stdlib.Not_found) {
               throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                        MEL_EXN_ID: Stdlib.Exit
-                      });
+                    MEL_EXN_ID: Stdlib.Exit
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
           }
@@ -51208,38 +51208,38 @@ function contains_type(env, _path) {
 function contains_type_sig(env) {
   return function (param) {
     return Stdlib__List.iter((function (param) {
-                  switch (param.TAG) {
-                    case /* Sig_type */1 :
-                        const match = param._1;
-                        if (match.type_manifest !== undefined) {
-                          let tmp = match.type_kind;
-                          if (!/* tag */(typeof tmp === "number" || typeof tmp === "string")) {
-                            return ;
-                          }
-                          if (tmp !== /* Type_abstract */0) {
-                            return ;
-                          }
-                          if (match.type_private !== /* Private */0) {
-                            return ;
-                          }
-                          throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                    MEL_EXN_ID: Stdlib.Exit
-                                  });
-                        } else {
-                          throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                    MEL_EXN_ID: Stdlib.Exit
-                                  });
-                        }
-                    case /* Sig_module */3 :
-                        return contains_type(env, param._1.md_type);
-                    case /* Sig_modtype */4 :
-                        throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                  MEL_EXN_ID: Stdlib.Exit
-                                });
-                    default:
+            switch (param.TAG) {
+              case /* Sig_type */1 :
+                  const match = param._1;
+                  if (match.type_manifest !== undefined) {
+                    let tmp = match.type_kind;
+                    if (!/* tag */(typeof tmp === "number" || typeof tmp === "string")) {
+                      return ;
+                    }
+                    if (tmp !== /* Type_abstract */0) {
                       return ;
+                    }
+                    if (match.type_private !== /* Private */0) {
+                      return ;
+                    }
+                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                          MEL_EXN_ID: Stdlib.Exit
+                        });
+                  } else {
+                    throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                          MEL_EXN_ID: Stdlib.Exit
+                        });
                   }
-                }), param);
+              case /* Sig_module */3 :
+                  return contains_type(env, param._1.md_type);
+              case /* Sig_modtype */4 :
+                  throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
+                        MEL_EXN_ID: Stdlib.Exit
+                      });
+              default:
+                return ;
+            }
+          }), param);
   };
 }
 
@@ -51283,12 +51283,12 @@ function create$8(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r.h;
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$7(l, v, r) {
@@ -51299,9 +51299,9 @@ function bal$7(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const lr = l.r;
     const lv = l.v;
@@ -51313,24 +51313,24 @@ function bal$7(l, v, r) {
       return create$8(create$8(ll, lv, lr.l), lr.v, create$8(lr.r, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   const rr = r.r;
   const rv = r.v;
@@ -51342,20 +51342,20 @@ function bal$7(l, v, r) {
     return create$8(create$8(l, v, rl.l), rl.v, create$8(rl.r, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Set.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Set.bal"
+      });
 }
 
 function add$9(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = t.r;
   const v = t.v;
@@ -51382,12 +51382,12 @@ function add$9(x, t) {
 
 function singleton$3(x) {
   return {
-          TAG: /* Node */0,
-          l: /* Empty */0,
-          v: x,
-          r: /* Empty */0,
-          h: 1
-        };
+    TAG: /* Node */0,
+    l: /* Empty */0,
+    v: x,
+    r: /* Empty */0,
+    h: 1
+  };
 }
 
 function add_min_element$2(x, param) {
@@ -51427,10 +51427,10 @@ function join$3(l, v, r) {
 function split$3(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            false,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      false,
+      /* Empty */0
+    ];
   }
   const r = param.r;
   const v = param.v;
@@ -51438,25 +51438,25 @@ function split$3(x, param) {
   const c = Curry._2(P.compare, x, v);
   if (c === 0) {
     return [
-            l,
-            true,
-            r
-          ];
+      l,
+      true,
+      r
+    ];
   }
   if (c < 0) {
     const match = split$3(x, l);
     return [
-            match[0],
-            match[1],
-            join$3(match[2], v, r)
-          ];
+      match[0],
+      match[1],
+      join$3(match[2], v, r)
+    ];
   }
   const match$1 = split$3(x, r);
   return [
-          join$3(l, v, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    join$3(l, v, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function union$4(s1, s2) {
@@ -51509,13 +51509,13 @@ function create$9(l, x, d, r) {
   const hl = height$8(l);
   const hr = height$8(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$8(l, x, d, r) {
@@ -51526,9 +51526,9 @@ function bal$8(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -51541,25 +51541,25 @@ function bal$8(l, x, d, r) {
       return create$9(create$9(ll, lv, ld, lr.l), lr.v, lr.d, create$9(lr.r, x, d, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -51572,21 +51572,21 @@ function bal$8(l, x, d, r) {
     return create$9(create$9(l, x, d, rl.l), rl.v, rl.d, create$9(rl.r, rv, rd, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add$10(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -51598,13 +51598,13 @@ function add$10(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -51628,8 +51628,8 @@ function find$5(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(P.compare, x, param.v);
     if (c === 0) {
@@ -51660,12 +51660,12 @@ function create$10(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r.h;
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$9(l, v, r) {
@@ -51676,9 +51676,9 @@ function bal$9(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const lr = l.r;
     const lv = l.v;
@@ -51690,24 +51690,24 @@ function bal$9(l, v, r) {
       return create$10(create$10(ll, lv, lr.l), lr.v, create$10(lr.r, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   const rr = r.r;
   const rv = r.v;
@@ -51719,20 +51719,20 @@ function bal$9(l, v, r) {
     return create$10(create$10(l, v, rl.l), rl.v, create$10(rl.r, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Set.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Set.bal"
+      });
 }
 
 function add$11(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = t.r;
   const v = t.v;
@@ -51759,12 +51759,12 @@ function add$11(x, t) {
 
 function singleton$4(x) {
   return {
-          TAG: /* Node */0,
-          l: /* Empty */0,
-          v: x,
-          r: /* Empty */0,
-          h: 1
-        };
+    TAG: /* Node */0,
+    l: /* Empty */0,
+    v: x,
+    r: /* Empty */0,
+    h: 1
+  };
 }
 
 function add_min_element$3(x, param) {
@@ -51804,10 +51804,10 @@ function join$4(l, v, r) {
 function split$4(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            false,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      false,
+      /* Empty */0
+    ];
   }
   const r = param.r;
   const v = param.v;
@@ -51815,25 +51815,25 @@ function split$4(x, param) {
   const c = Curry._2(funarg$4.compare, x, v);
   if (c === 0) {
     return [
-            l,
-            true,
-            r
-          ];
+      l,
+      true,
+      r
+    ];
   }
   if (c < 0) {
     const match = split$4(x, l);
     return [
-            match[0],
-            match[1],
-            join$4(match[2], v, r)
-          ];
+      match[0],
+      match[1],
+      join$4(match[2], v, r)
+    ];
   }
   const match$1 = split$4(x, r);
   return [
-          join$4(l, v, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    join$4(l, v, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function mem$5(x, _param) {
@@ -51911,9 +51911,9 @@ function rollback_path(subst, _p) {
     const p = _p;
     try {
       return {
-              TAG: /* Pident */0,
-              _0: Curry._2(find$5, p, subst)
-            };
+        TAG: /* Pident */0,
+        _0: Curry._2(find$5, p, subst)
+      };
     }
     catch (raw_exn){
       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -51992,20 +51992,20 @@ function collect_arg_paths(mty) {
     switch (p.TAG) {
       case /* Mty_signature */1 :
           return Stdlib__List.iter((function (param) {
-                        if (param.TAG !== /* Sig_module */3) {
-                          return ;
-                        }
-                        const id$p = param._0;
-                        subst.contents = Curry._3(add$10, {
-                              TAG: /* Pdot */1,
-                              _0: {
-                                TAG: /* Pident */0,
-                                _0: id
-                              },
-                              _1: id$p.name,
-                              _2: -1
-                            }, id$p, subst.contents);
-                      }), p._0);
+                  if (param.TAG !== /* Sig_module */3) {
+                    return ;
+                  }
+                  const id$p = param._0;
+                  subst.contents = Curry._3(add$10, {
+                        TAG: /* Pdot */1,
+                        _0: {
+                          TAG: /* Pident */0,
+                          _0: id
+                        },
+                        _1: id$p.name,
+                        _2: -1
+                      }, id$p, subst.contents);
+                }), p._0);
       case /* Mty_ident */0 :
       case /* Mty_functor */2 :
           return ;
@@ -52035,8 +52035,8 @@ function collect_arg_paths(mty) {
   it_module_type(it, mty);
   it_module_type(unmark_iterators, mty);
   return Curry._3(fold$6, (function (p) {
-                return Curry._1(union$5, collect_ids(subst.contents, bindings.contents, p));
-              }), paths.contents, /* Empty */0);
+          return Curry._1(union$5, collect_ids(subst.contents, bindings.contents, p));
+        }), paths.contents, /* Empty */0);
 }
 
 function remove_aliases(env, excl, _mty) {
@@ -52045,9 +52045,9 @@ function remove_aliases(env, excl, _mty) {
     switch (mty.TAG) {
       case /* Mty_signature */1 :
           return {
-                  TAG: /* Mty_signature */1,
-                  _0: remove_aliases_sig(env, excl, mty._0)
-                };
+            TAG: /* Mty_signature */1,
+            _0: remove_aliases_sig(env, excl, mty._0)
+          };
       case /* Mty_ident */0 :
       case /* Mty_functor */2 :
           return mty;
@@ -52076,34 +52076,34 @@ function remove_aliases_sig(env, excl, sg) {
         let mty$1;
         mty$1 = mty.TAG === /* Mty_alias */3 && Curry._2(mem$5, id, excl) ? md.md_type : remove_aliases(env, excl, mty);
         return {
-                hd: {
-                  TAG: /* Sig_module */3,
-                  _0: id,
-                  _1: {
-                    md_type: mty$1,
-                    md_attributes: md.md_attributes,
-                    md_loc: md.md_loc
-                  },
-                  _2: it._2
-                },
-                tl: remove_aliases_sig(add_module$1(undefined, id, mty$1, env), excl, sg.tl)
-              };
+          hd: {
+            TAG: /* Sig_module */3,
+            _0: id,
+            _1: {
+              md_type: mty$1,
+              md_attributes: md.md_attributes,
+              md_loc: md.md_loc
+            },
+            _2: it._2
+          },
+          tl: remove_aliases_sig(add_module$1(undefined, id, mty$1, env), excl, sg.tl)
+        };
     case /* Sig_modtype */4 :
         const mtd = it._1;
         const id$1 = it._0;
         return {
-                hd: {
-                  TAG: /* Sig_modtype */4,
-                  _0: id$1,
-                  _1: mtd
-                },
-                tl: remove_aliases_sig(add_modtype$1(id$1, mtd, env), excl, sg.tl)
-              };
+          hd: {
+            TAG: /* Sig_modtype */4,
+            _0: id$1,
+            _1: mtd
+          },
+          tl: remove_aliases_sig(add_modtype$1(id$1, mtd, env), excl, sg.tl)
+        };
     default:
       return {
-              hd: it,
-              tl: remove_aliases_sig(env, excl, sg.tl)
-            };
+        hd: it,
+        tl: remove_aliases_sig(env, excl, sg.tl)
+      };
   }
 }
 
@@ -52126,24 +52126,24 @@ function value_descriptions(env, cxt, subst, id, vd1, vd2) {
         const p1 = match._0;
         if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
           return {
-                  TAG: /* Tcoerce_primitive */2,
-                  _0: id,
-                  _1: p1
-                };
+            TAG: /* Tcoerce_primitive */2,
+            _0: id,
+            _1: p1
+          };
         }
         if (match$1.TAG !== /* Val_prim */0) {
           return {
-                  TAG: /* Tcoerce_primitive */2,
-                  _0: id,
-                  _1: p1
-                };
+            TAG: /* Tcoerce_primitive */2,
+            _0: id,
+            _1: p1
+          };
         }
         if (Caml_obj.caml_equal(p1, match$1._0)) {
           return /* Tcoerce_none */0;
         }
         throw new Caml_js_exceptions.MelangeError(Dont_match, {
-                  MEL_EXN_ID: Dont_match
-                });
+              MEL_EXN_ID: Dont_match
+            });
       }
       if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
         return /* Tcoerce_none */0;
@@ -52152,33 +52152,33 @@ function value_descriptions(env, cxt, subst, id, vd1, vd2) {
         return /* Tcoerce_none */0;
       }
       throw new Caml_js_exceptions.MelangeError(Dont_match, {
-                MEL_EXN_ID: Dont_match
-              });
+            MEL_EXN_ID: Dont_match
+          });
     } else {
       throw new Caml_js_exceptions.MelangeError(Dont_match, {
-                MEL_EXN_ID: Dont_match
-              });
+            MEL_EXN_ID: Dont_match
+          });
     }
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Dont_match) {
       throw new Caml_js_exceptions.MelangeError($$Error$5, {
-                MEL_EXN_ID: $$Error$5,
-                _1: {
-                  hd: [
-                    cxt,
-                    env,
-                    {
-                      TAG: /* Value_descriptions */1,
-                      _0: id,
-                      _1: vd1,
-                      _2: vd2$1
-                    }
-                  ],
-                  tl: /* [] */0
+            MEL_EXN_ID: $$Error$5,
+            _1: {
+              hd: [
+                cxt,
+                env,
+                {
+                  TAG: /* Value_descriptions */1,
+                  _0: id,
+                  _1: vd1,
+                  _2: vd2$1
                 }
-              });
+              ],
+              tl: /* [] */0
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -52193,22 +52193,22 @@ function type_declarations$2(env, old_envOpt, cxt, subst, id, decl1, decl2) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError($$Error$5, {
-            MEL_EXN_ID: $$Error$5,
-            _1: {
-              hd: [
-                cxt,
-                old_env,
-                {
-                  TAG: /* Type_declarations */2,
-                  _0: id,
-                  _1: decl1,
-                  _2: decl2$1,
-                  _3: err
-                }
-              ],
-              tl: /* [] */0
+        MEL_EXN_ID: $$Error$5,
+        _1: {
+          hd: [
+            cxt,
+            old_env,
+            {
+              TAG: /* Type_declarations */2,
+              _0: id,
+              _1: decl1,
+              _2: decl2$1,
+              _3: err
             }
-          });
+          ],
+          tl: /* [] */0
+        }
+      });
 }
 
 function extension_constructors$1(env, cxt, subst, id, ext1, ext2) {
@@ -52217,21 +52217,21 @@ function extension_constructors$1(env, cxt, subst, id, ext1, ext2) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError($$Error$5, {
-            MEL_EXN_ID: $$Error$5,
-            _1: {
-              hd: [
-                cxt,
-                env,
-                {
-                  TAG: /* Extension_constructors */3,
-                  _0: id,
-                  _1: ext1,
-                  _2: ext2$1
-                }
-              ],
-              tl: /* [] */0
+        MEL_EXN_ID: $$Error$5,
+        _1: {
+          hd: [
+            cxt,
+            env,
+            {
+              TAG: /* Extension_constructors */3,
+              _0: id,
+              _1: ext1,
+              _2: ext2$1
             }
-          });
+          ],
+          tl: /* [] */0
+        }
+      });
 }
 
 function class_type_declarations$1(old_env, env, cxt, subst, id, decl1, decl2) {
@@ -52241,22 +52241,22 @@ function class_type_declarations$1(old_env, env, cxt, subst, id, decl1, decl2) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError($$Error$5, {
-            MEL_EXN_ID: $$Error$5,
-            _1: {
-              hd: [
-                cxt,
-                old_env,
-                {
-                  TAG: /* Class_type_declarations */7,
-                  _0: id,
-                  _1: decl1,
-                  _2: decl2$1,
-                  _3: reason
-                }
-              ],
-              tl: /* [] */0
+        MEL_EXN_ID: $$Error$5,
+        _1: {
+          hd: [
+            cxt,
+            old_env,
+            {
+              TAG: /* Class_type_declarations */7,
+              _0: id,
+              _1: decl1,
+              _2: decl2$1,
+              _3: reason
             }
-          });
+          ],
+          tl: /* [] */0
+        }
+      });
 }
 
 function class_declarations$1(old_env, env, cxt, subst, id, decl1, decl2) {
@@ -52266,22 +52266,22 @@ function class_declarations$1(old_env, env, cxt, subst, id, decl1, decl2) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError($$Error$5, {
-            MEL_EXN_ID: $$Error$5,
-            _1: {
-              hd: [
-                cxt,
-                old_env,
-                {
-                  TAG: /* Class_declarations */8,
-                  _0: id,
-                  _1: decl1,
-                  _2: decl2$1,
-                  _3: reason
-                }
-              ],
-              tl: /* [] */0
+        MEL_EXN_ID: $$Error$5,
+        _1: {
+          hd: [
+            cxt,
+            old_env,
+            {
+              TAG: /* Class_declarations */8,
+              _0: id,
+              _1: decl1,
+              _2: decl2$1,
+              _3: reason
             }
-          });
+          ],
+          tl: /* [] */0
+        }
+      });
 }
 
 const Dont_match$1 = /* @__PURE__ */Caml_exceptions.create("Ocaml_typedtree_test.Includemod.Dont_match");
@@ -52308,19 +52308,19 @@ function expand_module_path(env, cxt, path) {
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Stdlib.Not_found) {
       throw new Caml_js_exceptions.MelangeError($$Error$5, {
-                MEL_EXN_ID: $$Error$5,
-                _1: {
-                  hd: [
-                    cxt,
-                    env,
-                    {
-                      TAG: /* Unbound_modtype_path */9,
-                      _0: path
-                    }
-                  ],
-                  tl: /* [] */0
+            MEL_EXN_ID: $$Error$5,
+            _1: {
+              hd: [
+                cxt,
+                env,
+                {
+                  TAG: /* Unbound_modtype_path */9,
+                  _0: path
                 }
-              });
+              ],
+              tl: /* [] */0
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -52334,19 +52334,19 @@ function expand_module_alias(env, cxt, path) {
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Stdlib.Not_found) {
       throw new Caml_js_exceptions.MelangeError($$Error$5, {
-                MEL_EXN_ID: $$Error$5,
-                _1: {
-                  hd: [
-                    cxt,
-                    env,
-                    {
-                      TAG: /* Unbound_module_path */10,
-                      _0: path
-                    }
-                  ],
-                  tl: /* [] */0
+            MEL_EXN_ID: $$Error$5,
+            _1: {
+              hd: [
+                cxt,
+                env,
+                {
+                  TAG: /* Unbound_module_path */10,
+                  _0: path
                 }
-              });
+              ],
+              tl: /* [] */0
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -52377,73 +52377,73 @@ function item_ident_name(param) {
     case /* Sig_value */0 :
         const id = param._0;
         return [
-                id,
-                param._1.val_loc,
-                {
-                  TAG: /* Field_value */0,
-                  _0: id.name
-                }
-              ];
+          id,
+          param._1.val_loc,
+          {
+            TAG: /* Field_value */0,
+            _0: id.name
+          }
+        ];
     case /* Sig_type */1 :
         const id$1 = param._0;
         return [
-                id$1,
-                param._1.type_loc,
-                {
-                  TAG: /* Field_type */1,
-                  _0: id$1.name
-                }
-              ];
+          id$1,
+          param._1.type_loc,
+          {
+            TAG: /* Field_type */1,
+            _0: id$1.name
+          }
+        ];
     case /* Sig_typext */2 :
         const id$2 = param._0;
         return [
-                id$2,
-                param._1.ext_loc,
-                {
-                  TAG: /* Field_typext */2,
-                  _0: id$2.name
-                }
-              ];
+          id$2,
+          param._1.ext_loc,
+          {
+            TAG: /* Field_typext */2,
+            _0: id$2.name
+          }
+        ];
     case /* Sig_module */3 :
         const id$3 = param._0;
         return [
-                id$3,
-                param._1.md_loc,
-                {
-                  TAG: /* Field_module */3,
-                  _0: id$3.name
-                }
-              ];
+          id$3,
+          param._1.md_loc,
+          {
+            TAG: /* Field_module */3,
+            _0: id$3.name
+          }
+        ];
     case /* Sig_modtype */4 :
         const id$4 = param._0;
         return [
-                id$4,
-                param._1.mtd_loc,
-                {
-                  TAG: /* Field_modtype */4,
-                  _0: id$4.name
-                }
-              ];
+          id$4,
+          param._1.mtd_loc,
+          {
+            TAG: /* Field_modtype */4,
+            _0: id$4.name
+          }
+        ];
     case /* Sig_class */5 :
         const id$5 = param._0;
         return [
-                id$5,
-                param._1.cty_loc,
-                {
-                  TAG: /* Field_class */5,
-                  _0: id$5.name
-                }
-              ];
+          id$5,
+          param._1.cty_loc,
+          {
+            TAG: /* Field_class */5,
+            _0: id$5.name
+          }
+        ];
     case /* Sig_class_type */6 :
         const id$6 = param._0;
         return [
-                id$6,
-                param._1.clty_loc,
-                {
-                  TAG: /* Field_classtype */6,
-                  _0: id$6.name
-                }
-              ];
+          id$6,
+          param._1.clty_loc,
+          {
+            TAG: /* Field_classtype */6,
+            _0: id$6.name
+          }
+        ];
     
   }
 }
@@ -52474,20 +52474,20 @@ function modtypes(env, cxt, subst, mty1, mty2) {
     const err = Caml_js_exceptions.internalToOCamlException(raw_err);
     if (err.MEL_EXN_ID === Dont_match$1) {
       throw new Caml_js_exceptions.MelangeError($$Error$5, {
-                MEL_EXN_ID: $$Error$5,
-                _1: {
-                  hd: [
-                    cxt,
-                    env,
-                    {
-                      TAG: /* Module_types */4,
-                      _0: mty1,
-                      _1: modtype(subst, mty2)
-                    }
-                  ],
-                  tl: /* [] */0
+            MEL_EXN_ID: $$Error$5,
+            _1: {
+              hd: [
+                cxt,
+                env,
+                {
+                  TAG: /* Module_types */4,
+                  _0: mty1,
+                  _1: modtype(subst, mty2)
                 }
-              });
+              ],
+              tl: /* [] */0
+            }
+          });
     }
     if (err.MEL_EXN_ID === $$Error$5) {
       if (mty1.TAG === /* Mty_alias */3) {
@@ -52497,20 +52497,20 @@ function modtypes(env, cxt, subst, mty1, mty2) {
         throw new Caml_js_exceptions.MelangeError(err.MEL_EXN_ID, err);
       }
       throw new Caml_js_exceptions.MelangeError($$Error$5, {
-                MEL_EXN_ID: $$Error$5,
-                _1: {
-                  hd: [
-                    cxt,
-                    env,
-                    {
-                      TAG: /* Module_types */4,
-                      _0: mty1,
-                      _1: modtype(subst, mty2)
-                    }
-                  ],
-                  tl: err._1
+            MEL_EXN_ID: $$Error$5,
+            _1: {
+              hd: [
+                cxt,
+                env,
+                {
+                  TAG: /* Module_types */4,
+                  _0: mty1,
+                  _1: modtype(subst, mty2)
                 }
-              });
+              ],
+              tl: err._1
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(err.MEL_EXN_ID, err);
   }
@@ -52536,8 +52536,8 @@ function try_modtypes(env, cxt, subst, _mty1, mty2) {
             case /* Mty_functor */2 :
             case /* Mty_alias */3 :
                 throw new Caml_js_exceptions.MelangeError(Dont_match$1, {
-                          MEL_EXN_ID: Dont_match$1
-                        });
+                      MEL_EXN_ID: Dont_match$1
+                    });
             
           }
           break;
@@ -52573,20 +52573,20 @@ function try_modtypes(env, cxt, subst, _mty1, mty2) {
                       return /* Tcoerce_none */0;
                     } else {
                       return {
-                              TAG: /* Tcoerce_functor */1,
-                              _0: cc_arg,
-                              _1: cc_res
-                            };
+                        TAG: /* Tcoerce_functor */1,
+                        _0: cc_arg,
+                        _1: cc_res
+                      };
                     }
                   }
                   throw new Caml_js_exceptions.MelangeError(Dont_match$1, {
-                            MEL_EXN_ID: Dont_match$1
-                          });
+                        MEL_EXN_ID: Dont_match$1
+                      });
               case /* Mty_signature */1 :
               case /* Mty_alias */3 :
                   throw new Caml_js_exceptions.MelangeError(Dont_match$1, {
-                            MEL_EXN_ID: Dont_match$1
-                          });
+                        MEL_EXN_ID: Dont_match$1
+                      });
               
             }
           } else {
@@ -52596,8 +52596,8 @@ function try_modtypes(env, cxt, subst, _mty1, mty2) {
               case /* Mty_functor */2 :
                   if (mty2._1 !== undefined) {
                     throw new Caml_js_exceptions.MelangeError(Dont_match$1, {
-                              MEL_EXN_ID: Dont_match$1
-                            });
+                          MEL_EXN_ID: Dont_match$1
+                        });
                   }
                   const cc = modtypes(env, {
                         hd: {
@@ -52610,16 +52610,16 @@ function try_modtypes(env, cxt, subst, _mty1, mty2) {
                     return /* Tcoerce_none */0;
                   } else {
                     return {
-                            TAG: /* Tcoerce_functor */1,
-                            _0: /* Tcoerce_none */0,
-                            _1: cc
-                          };
+                      TAG: /* Tcoerce_functor */1,
+                      _0: /* Tcoerce_none */0,
+                      _1: cc
+                    };
                   }
               case /* Mty_signature */1 :
               case /* Mty_alias */3 :
                   throw new Caml_js_exceptions.MelangeError(Dont_match$1, {
-                            MEL_EXN_ID: Dont_match$1
-                          });
+                        MEL_EXN_ID: Dont_match$1
+                      });
               
             }
           }
@@ -52630,19 +52630,19 @@ function try_modtypes(env, cxt, subst, _mty1, mty2) {
             const p2 = mty2._0;
             if (is_functor_arg(p2, env)) {
               throw new Caml_js_exceptions.MelangeError($$Error$5, {
-                        MEL_EXN_ID: $$Error$5,
-                        _1: {
-                          hd: [
-                            cxt,
-                            env,
-                            {
-                              TAG: /* Invalid_module_alias */11,
-                              _0: p2
-                            }
-                          ],
-                          tl: /* [] */0
+                    MEL_EXN_ID: $$Error$5,
+                    _1: {
+                      hd: [
+                        cxt,
+                        env,
+                        {
+                          TAG: /* Invalid_module_alias */11,
+                          _0: p2
                         }
-                      });
+                      ],
+                      tl: /* [] */0
+                    }
+                  });
             }
             if (same(p1$1, p2)) {
               return /* Tcoerce_none */0;
@@ -52653,8 +52653,8 @@ function try_modtypes(env, cxt, subst, _mty1, mty2) {
               return /* Tcoerce_none */0;
             }
             throw new Caml_js_exceptions.MelangeError(Dont_match$1, {
-                      MEL_EXN_ID: Dont_match$1
-                    });
+                  MEL_EXN_ID: Dont_match$1
+                });
           }
           let p1$3;
           try {
@@ -52666,19 +52666,19 @@ function try_modtypes(env, cxt, subst, _mty1, mty2) {
               const match = exn._1;
               if (match.TAG === /* Missing_module */3) {
                 throw new Caml_js_exceptions.MelangeError($$Error$5, {
-                          MEL_EXN_ID: $$Error$5,
-                          _1: {
-                            hd: [
-                              cxt,
-                              env,
-                              {
-                                TAG: /* Unbound_module_path */10,
-                                _0: match._2
-                              }
-                            ],
-                            tl: /* [] */0
+                      MEL_EXN_ID: $$Error$5,
+                      _1: {
+                        hd: [
+                          cxt,
+                          env,
+                          {
+                            TAG: /* Unbound_module_path */10,
+                            _0: match._2
                           }
-                        });
+                        ],
+                        tl: /* [] */0
+                      }
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
             }
@@ -52686,10 +52686,10 @@ function try_modtypes(env, cxt, subst, _mty1, mty2) {
           }
           const mty1$1 = strengthen$1(env, expand_module_alias(env, cxt, p1$3), p1$3);
           return {
-                  TAG: /* Tcoerce_alias */3,
-                  _0: p1$3,
-                  _1: modtypes(env, cxt, subst, mty1$1, mty2)
-                };
+            TAG: /* Tcoerce_alias */3,
+            _0: p1$3,
+            _1: modtypes(env, cxt, subst, mty1$1, mty2)
+          };
       
     }
     if (mty2.TAG === /* Mty_ident */0) {
@@ -52702,19 +52702,6 @@ function try_modtypes(env, cxt, subst, _mty1, mty2) {
           
         } else {
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      38374,
-                      6
-                    ]
-                  });
-        }
-      }
-      if (mty2$1.TAG === /* Mty_ident */0) {
-        return try_modtypes(env, cxt, identity, mty1, expand_module_path(env, cxt, mty2$1._0));
-      }
-      throw new Caml_js_exceptions.MelangeError("Assert_failure", {
                 MEL_EXN_ID: "Assert_failure",
                 _1: [
                   "jscomp/test/ocaml_typedtree_test.ml",
@@ -52722,10 +52709,23 @@ function try_modtypes(env, cxt, subst, _mty1, mty2) {
                   6
                 ]
               });
+        }
+      }
+      if (mty2$1.TAG === /* Mty_ident */0) {
+        return try_modtypes(env, cxt, identity, mty1, expand_module_path(env, cxt, mty2$1._0));
+      }
+      throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              38374,
+              6
+            ]
+          });
     }
     throw new Caml_js_exceptions.MelangeError(Dont_match$1, {
-              MEL_EXN_ID: Dont_match$1
-            });
+          MEL_EXN_ID: Dont_match$1
+        });
   };
 }
 
@@ -52736,21 +52736,21 @@ function signatures(env, cxt, subst, sig1, sig2) {
           const l = param[0];
           if (item.TAG === /* Sig_module */3) {
             return [
-                    {
-                      hd: [
-                        item._0,
-                        pos,
-                        /* Tcoerce_none */0
-                      ],
-                      tl: l
-                    },
-                    pos + 1 | 0
-                  ];
+              {
+                hd: [
+                  item._0,
+                  pos,
+                  /* Tcoerce_none */0
+                ],
+                tl: l
+              },
+              pos + 1 | 0
+            ];
           } else {
             return [
-                    l,
-                    is_runtime_component(item) ? pos + 1 | 0 : pos
-                  ];
+              l,
+              is_runtime_component(item) ? pos + 1 | 0 : pos
+            ];
           }
         }), [
         /* [] */0,
@@ -52764,9 +52764,9 @@ function signatures(env, cxt, subst, sig1, sig2) {
       const pos = _pos;
       if (!param) {
         return [
-                pos,
-                tbl
-              ];
+          pos,
+          tbl
+        ];
       }
       const item = param.hd;
       const match = item_ident_name(item);
@@ -52852,30 +52852,30 @@ function signatures(env, cxt, subst, sig1, sig2) {
               new_subst = subst;
           }
           return pair_components(new_subst, {
-                      hd: [
-                        match$2[1],
-                        item2,
-                        match$2[2]
-                      ],
-                      tl: paired
-                    }, unpaired, rem);
+                hd: [
+                  match$2[1],
+                  item2,
+                  match$2[2]
+                ],
+                tl: paired
+              }, unpaired, rem);
         }
         catch (raw_exn){
           const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
           if (exn.MEL_EXN_ID === Stdlib.Not_found) {
             const unpaired$1 = match$1[1] ? ({
-                  hd: [
-                    cxt,
-                    env,
-                    {
-                      TAG: /* Missing_field */0,
-                      _0: id2,
-                      _1: match[1],
-                      _2: kind_of_field_desc(name2$1)
-                    }
-                  ],
-                  tl: unpaired
-                }) : unpaired;
+                hd: [
+                  cxt,
+                  env,
+                  {
+                    TAG: /* Missing_field */0,
+                    _0: id2,
+                    _1: match[1],
+                    _2: kind_of_field_desc(name2$1)
+                  }
+                ],
+                tl: unpaired
+              }) : unpaired;
             _param = rem;
             _unpaired = unpaired$1;
             continue ;
@@ -52885,9 +52885,9 @@ function signatures(env, cxt, subst, sig1, sig2) {
       } else {
         if (unpaired) {
           throw new Caml_js_exceptions.MelangeError($$Error$5, {
-                    MEL_EXN_ID: $$Error$5,
-                    _1: unpaired
-                  });
+                MEL_EXN_ID: $$Error$5,
+                _1: unpaired
+              });
         }
         const cc = signature_components(env, new_env, cxt, subst, Stdlib__List.rev(paired));
         if (len1 === len2) {
@@ -52914,17 +52914,17 @@ function signatures(env, cxt, subst, sig1, sig2) {
             return /* Tcoerce_none */0;
           } else {
             return {
-                    TAG: /* Tcoerce_structure */0,
-                    _0: cc,
-                    _1: id_pos_list
-                  };
+              TAG: /* Tcoerce_structure */0,
+              _0: cc,
+              _1: id_pos_list
+            };
           }
         } else {
           return {
-                  TAG: /* Tcoerce_structure */0,
-                  _0: cc,
-                  _1: id_pos_list
-                };
+            TAG: /* Tcoerce_structure */0,
+            _0: cc,
+            _1: id_pos_list
+          };
         }
       }
     };
@@ -52952,12 +52952,12 @@ function signature_components(old_env, env, cxt, subst, paired) {
           const p = valdecl2.val_kind;
           if (/* tag */typeof p === "number" || typeof p === "string" || p.TAG !== /* Val_prim */0) {
             return {
-                    hd: [
-                      pos,
-                      cc
-                    ],
-                    tl: comps_rec(rem)
-                  };
+              hd: [
+                pos,
+                cc
+              ],
+              tl: comps_rec(rem)
+            };
           } else {
             return comps_rec(rem);
           }
@@ -52975,12 +52975,12 @@ function signature_components(old_env, env, cxt, subst, paired) {
         if (match$4.TAG === /* Sig_typext */2) {
           extension_constructors$1(env, cxt, subst, match$1._0, match$1._1, match$4._1);
           return {
-                  hd: [
-                    match[2],
-                    /* Tcoerce_none */0
-                  ],
-                  tl: comps_rec(paired.tl)
-                };
+            hd: [
+              match[2],
+              /* Tcoerce_none */0
+            ],
+            tl: comps_rec(paired.tl)
+          };
         }
         break;
     case /* Sig_module */3 :
@@ -52998,12 +52998,12 @@ function signature_components(old_env, env, cxt, subst, paired) {
                     _0: id1
                   }), match$5._1.md_type);
           return {
-                  hd: [
-                    match[2],
-                    cc$1
-                  ],
-                  tl: comps_rec(paired.tl)
-                };
+            hd: [
+              match[2],
+              cc$1
+            ],
+            tl: comps_rec(paired.tl)
+          };
         }
         break;
     case /* Sig_modtype */4 :
@@ -53018,12 +53018,12 @@ function signature_components(old_env, env, cxt, subst, paired) {
         if (match$7.TAG === /* Sig_class */5) {
           class_declarations$1(old_env, env, cxt, subst, match$1._0, match$1._1, match$7._1);
           return {
-                  hd: [
-                    match[2],
-                    /* Tcoerce_none */0
-                  ],
-                  tl: comps_rec(paired.tl)
-                };
+            hd: [
+              match[2],
+              /* Tcoerce_none */0
+            ],
+            tl: comps_rec(paired.tl)
+          };
         }
         break;
     case /* Sig_class_type */6 :
@@ -53036,13 +53036,13 @@ function signature_components(old_env, env, cxt, subst, paired) {
     
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              38499,
-              6
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          38499,
+          6
+        ]
+      });
 }
 
 function modtype_infos(env, cxt, subst, id, info1, info2) {
@@ -53066,12 +53066,12 @@ function modtype_infos(env, cxt, subst, id, info1, info2) {
       }
     } else if (match$1 !== undefined) {
       return check_modtype_equiv(env, cxt$p, {
-                  TAG: /* Mty_ident */0,
-                  _0: {
-                    TAG: /* Pident */0,
-                    _0: id
-                  }
-                }, match$1);
+            TAG: /* Mty_ident */0,
+            _0: {
+              TAG: /* Pident */0,
+              _0: id
+            }
+          }, match$1);
     } else {
       return ;
     }
@@ -53080,21 +53080,21 @@ function modtype_infos(env, cxt, subst, id, info1, info2) {
     const reasons = Caml_js_exceptions.internalToOCamlException(raw_reasons);
     if (reasons.MEL_EXN_ID === $$Error$5) {
       throw new Caml_js_exceptions.MelangeError($$Error$5, {
-                MEL_EXN_ID: $$Error$5,
-                _1: {
-                  hd: [
-                    cxt,
-                    env,
-                    {
-                      TAG: /* Modtype_infos */5,
-                      _0: id,
-                      _1: info1,
-                      _2: info2$1
-                    }
-                  ],
-                  tl: reasons._1
+            MEL_EXN_ID: $$Error$5,
+            _1: {
+              hd: [
+                cxt,
+                env,
+                {
+                  TAG: /* Modtype_infos */5,
+                  _0: id,
+                  _1: info1,
+                  _2: info2$1
                 }
-              });
+              ],
+              tl: reasons._1
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(reasons.MEL_EXN_ID, reasons);
   }
@@ -53107,16 +53107,16 @@ function check_modtype_equiv(env, cxt, mty1, mty2) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError($$Error$5, {
-            MEL_EXN_ID: $$Error$5,
-            _1: {
-              hd: [
-                cxt,
-                env,
-                /* Modtype_permutation */0
-              ],
-              tl: /* [] */0
-            }
-          });
+        MEL_EXN_ID: $$Error$5,
+        _1: {
+          hd: [
+            cxt,
+            env,
+            /* Modtype_permutation */0
+          ],
+          tl: /* [] */0
+        }
+      });
 }
 
 function check_modtype_inclusion$1(env, mty1, path1, mty2) {
@@ -53128,8 +53128,8 @@ function check_modtype_inclusion$1(env, mty1, path1, mty2) {
     const reasons = Caml_js_exceptions.internalToOCamlException(raw_reasons);
     if (reasons.MEL_EXN_ID === $$Error$5) {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     throw new Caml_js_exceptions.MelangeError(reasons.MEL_EXN_ID, reasons);
   }
@@ -53145,20 +53145,20 @@ function compunit(env, impl_name, impl_sig, intf_name, intf_sig) {
     const reasons = Caml_js_exceptions.internalToOCamlException(raw_reasons);
     if (reasons.MEL_EXN_ID === $$Error$5) {
       throw new Caml_js_exceptions.MelangeError($$Error$5, {
-                MEL_EXN_ID: $$Error$5,
-                _1: {
-                  hd: [
-                    /* [] */0,
-                    empty,
-                    {
-                      TAG: /* Interface_mismatch */6,
-                      _0: impl_name,
-                      _1: intf_name
-                    }
-                  ],
-                  tl: reasons._1
+            MEL_EXN_ID: $$Error$5,
+            _1: {
+              hd: [
+                /* [] */0,
+                empty,
+                {
+                  TAG: /* Interface_mismatch */6,
+                  _0: impl_name,
+                  _1: intf_name
                 }
-              });
+              ],
+              tl: reasons._1
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(reasons.MEL_EXN_ID, reasons);
   }
@@ -53187,53 +53187,53 @@ function show_loc(msg, ppf, loc) {
     return ;
   } else {
     return Curry._3(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_lit */17,
+                _0: /* Force_newline */3,
+                _1: {
+                  TAG: /* Formatting_gen */18,
+                  _0: {
+                    TAG: /* Open_box */1,
                     _0: {
-                      TAG: /* Formatting_lit */17,
-                      _0: /* Force_newline */3,
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: "<2>",
+                        _1: /* End_of_format */0
+                      },
+                      _1: "<2>"
+                    }
+                  },
+                  _1: {
+                    TAG: /* Alpha */15,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ':' */58,
                       _1: {
-                        TAG: /* Formatting_gen */18,
+                        TAG: /* Formatting_lit */17,
                         _0: {
-                          TAG: /* Open_box */1,
-                          _0: {
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: "<2>",
-                              _1: /* End_of_format */0
-                            },
-                            _1: "<2>"
-                          }
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
                         },
                         _1: {
-                          TAG: /* Alpha */15,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ':' */58,
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
+                          _1: {
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
                         }
                       }
-                    },
-                    _1: "@\n@[<2>%a:@ %s@]"
-                  }), print_loc, loc, msg);
+                    }
+                  }
+                }
+              },
+              _1: "@\n@[<2>%a:@ %s@]"
+            }), print_loc, loc, msg);
   }
 }
 
@@ -53245,14 +53245,14 @@ function show_locs(ppf, param) {
 function include_err$1(ppf, path$1) {
   if (/* tag */typeof path$1 === "number" || typeof path$1 === "string") {
     return Stdlib__Format.fprintf(ppf)({
-                TAG: /* Format */0,
-                _0: {
-                  TAG: /* String_literal */11,
-                  _0: "Illegal permutation of structure fields",
-                  _1: /* End_of_format */0
-                },
-                _1: "Illegal permutation of structure fields"
-              });
+          TAG: /* Format */0,
+          _0: {
+            TAG: /* String_literal */11,
+            _0: "Illegal permutation of structure fields",
+            _1: /* End_of_format */0
+          },
+          _1: "Illegal permutation of structure fields"
+        });
   }
   switch (path$1.TAG) {
     case /* Missing_field */0 :
@@ -53355,94 +53355,91 @@ function include_err$1(ppf, path$1) {
                 return value_description$1(id, param, param$1);
               }), d2);
         return show_locs(ppf, [
-                    d1.val_loc,
-                    d2.val_loc
-                  ]);
+              d1.val_loc,
+              d2.val_loc
+            ]);
     case /* Type_declarations */2 :
         const d2$1 = path$1._2;
         const d1$1 = path$1._1;
         const id$1 = path$1._0;
         return Curry.app(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<v>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<v>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
+                          TAG: /* Format */0,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<v>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<v>"
-                            }
+                            TAG: /* String_literal */11,
+                            _0: "<hv>",
+                            _1: /* End_of_format */0
                           },
+                          _1: "<hv>"
+                        }
+                      },
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ':' */58,
                           _1: {
-                            TAG: /* Formatting_gen */18,
+                            TAG: /* Formatting_lit */17,
                             _0: {
-                              TAG: /* Open_box */1,
+                              TAG: /* Break */0,
+                              _0: "@;<1 2>",
+                              _1: 1,
+                              _2: 2
+                            },
+                            _1: {
+                              TAG: /* Alpha */15,
                               _0: {
-                                TAG: /* Format */0,
+                                TAG: /* Formatting_lit */17,
                                 _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "<hv>",
-                                  _1: /* End_of_format */0
+                                  TAG: /* Break */0,
+                                  _0: "@ ",
+                                  _1: 1,
+                                  _2: 0
                                 },
-                                _1: "<hv>"
-                              }
-                            },
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ':' */58,
                                 _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@;<1 2>",
-                                    _1: 1,
-                                    _2: 2
-                                  },
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
                                   _1: {
-                                    TAG: /* Alpha */15,
+                                    TAG: /* Formatting_lit */17,
                                     _0: {
-                                      TAG: /* Formatting_lit */17,
+                                      TAG: /* Break */0,
+                                      _0: "@;<1 2>",
+                                      _1: 1,
+                                      _2: 2
+                                    },
+                                    _1: {
+                                      TAG: /* Alpha */15,
                                       _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
-                                      _1: {
-                                        TAG: /* String */2,
-                                        _0: /* No_padding */0,
+                                        TAG: /* Formatting_lit */17,
+                                        _0: /* Close_box */0,
                                         _1: {
-                                          TAG: /* Formatting_lit */17,
+                                          TAG: /* Alpha */15,
                                           _0: {
-                                            TAG: /* Break */0,
-                                            _0: "@;<1 2>",
-                                            _1: 1,
-                                            _2: 2
-                                          },
-                                          _1: {
                                             TAG: /* Alpha */15,
                                             _0: {
                                               TAG: /* Formatting_lit */17,
                                               _0: /* Close_box */0,
-                                              _1: {
-                                                TAG: /* Alpha */15,
-                                                _0: {
-                                                  TAG: /* Alpha */15,
-                                                  _0: {
-                                                    TAG: /* Formatting_lit */17,
-                                                    _0: /* Close_box */0,
-                                                    _1: /* End_of_format */0
-                                                  }
-                                                }
-                                              }
+                                              _1: /* End_of_format */0
                                             }
                                           }
                                         }
@@ -53453,29 +53450,32 @@ function include_err$1(ppf, path$1) {
                               }
                             }
                           }
-                        },
-                        _1: "@[<v>@[<hv>%s:@;<1 2>%a@ %s@;<1 2>%a@]%a%a@]"
-                      }), [
-                    "Type declarations do not match",
-                    (function (param, param$1) {
-                        return type_declaration$1(id$1, param, param$1);
-                      }),
-                    d1$1,
-                    "is not included in",
-                    (function (param, param$1) {
-                        return type_declaration$1(id$1, param, param$1);
-                      }),
-                    d2$1,
-                    show_locs,
-                    [
-                      d1$1.type_loc,
-                      d2$1.type_loc
-                    ],
-                    (function (param) {
-                        return report_type_mismatch("the first", "the second", "declaration", param);
-                      }),
-                    path$1._3
-                  ]);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<v>@[<hv>%s:@;<1 2>%a@ %s@;<1 2>%a@]%a%a@]"
+                }), [
+              "Type declarations do not match",
+              (function (param, param$1) {
+                  return type_declaration$1(id$1, param, param$1);
+                }),
+              d1$1,
+              "is not included in",
+              (function (param, param$1) {
+                  return type_declaration$1(id$1, param, param$1);
+                }),
+              d2$1,
+              show_locs,
+              [
+                d1$1.type_loc,
+                d2$1.type_loc
+              ],
+              (function (param) {
+                  return report_type_mismatch("the first", "the second", "declaration", param);
+                }),
+              path$1._3
+            ]);
     case /* Extension_constructors */3 :
         const x2 = path$1._2;
         const x1 = path$1._1;
@@ -53550,165 +53550,234 @@ function include_err$1(ppf, path$1) {
                 return extension_constructor$1(id$2, param, param$1);
               }), x2);
         return show_locs(ppf, [
-                    x1.ext_loc,
-                    x2.ext_loc
-                  ]);
+              x1.ext_loc,
+              x2.ext_loc
+            ]);
     case /* Module_types */4 :
         return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<hv 2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hv 2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Modules do not match:",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Open_box */1,
+                            TAG: /* Formatting_lit */17,
                             _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hv 2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hv 2>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Modules do not match:",
+                              TAG: /* Break */0,
+                              _0: "@;<1 -2>",
+                              _1: 1,
+                              _2: -2
+                            },
                             _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
+                              TAG: /* String_literal */11,
+                              _0: "is not included in",
                               _1: {
-                                TAG: /* Alpha */15,
+                                TAG: /* Formatting_lit */17,
                                 _0: {
-                                  TAG: /* Formatting_lit */17,
+                                  TAG: /* Break */0,
+                                  _0: "@ ",
+                                  _1: 1,
+                                  _2: 0
+                                },
+                                _1: {
+                                  TAG: /* Alpha */15,
                                   _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@;<1 -2>",
-                                    _1: 1,
-                                    _2: -2
-                                  },
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: "is not included in",
-                                    _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: /* Close_box */0,
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
+                                    TAG: /* Formatting_lit */17,
+                                    _0: /* Close_box */0,
+                                    _1: /* End_of_format */0
                                   }
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[<hv 2>Modules do not match:@ %a@;<1 -2>is not included in@ %a@]"
-                      }), modtype$1, path$1._0, modtype$1, path$1._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hv 2>Modules do not match:@ %a@;<1 -2>is not included in@ %a@]"
+                }), modtype$1, path$1._0, modtype$1, path$1._1);
     case /* Modtype_infos */5 :
         const id$3 = path$1._0;
         return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<hv 2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hv 2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Module type declarations do not match:",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Open_box */1,
+                            TAG: /* Formatting_lit */17,
                             _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hv 2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hv 2>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Module type declarations do not match:",
+                              TAG: /* Break */0,
+                              _0: "@;<1 -2>",
+                              _1: 1,
+                              _2: -2
+                            },
                             _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
+                              TAG: /* String_literal */11,
+                              _0: "does not match",
                               _1: {
-                                TAG: /* Alpha */15,
+                                TAG: /* Formatting_lit */17,
                                 _0: {
-                                  TAG: /* Formatting_lit */17,
+                                  TAG: /* Break */0,
+                                  _0: "@ ",
+                                  _1: 1,
+                                  _2: 0
+                                },
+                                _1: {
+                                  TAG: /* Alpha */15,
                                   _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@;<1 -2>",
-                                    _1: 1,
-                                    _2: -2
-                                  },
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: "does not match",
-                                    _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: /* Close_box */0,
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
+                                    TAG: /* Formatting_lit */17,
+                                    _0: /* Close_box */0,
+                                    _1: /* End_of_format */0
                                   }
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[<hv 2>Module type declarations do not match:@ %a@;<1 -2>does not match@ %a@]"
-                      }), (function (param, param$1) {
-                      return modtype_declaration$1(id$3, param, param$1);
-                    }), path$1._1, (function (param, param$1) {
-                      return modtype_declaration$1(id$3, param, param$1);
-                    }), path$1._2);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hv 2>Module type declarations do not match:@ %a@;<1 -2>does not match@ %a@]"
+                }), (function (param, param$1) {
+                return modtype_declaration$1(id$3, param, param$1);
+              }), path$1._1, (function (param, param$1) {
+                return modtype_declaration$1(id$3, param, param$1);
+              }), path$1._2);
     case /* Interface_mismatch */6 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Formatting_gen */18,
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "The implementation ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
                           },
                           _1: {
                             TAG: /* String_literal */11,
-                            _0: "The implementation ",
+                            _0: "does not match the interface ",
                             _1: {
                               TAG: /* String */2,
                               _0: /* No_padding */0,
+                              _1: {
+                                TAG: /* Char_literal */12,
+                                _0: /* ':' */58,
+                                _1: /* End_of_format */0
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[The implementation %s@ does not match the interface %s:"
+                }), path$1._0, path$1._1);
+    case /* Class_type_declarations */7 :
+        const id$4 = path$1._0;
+        return Curry._6(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: "<hv 2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hv 2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Class type declarations do not match:",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
+                          _0: {
+                            TAG: /* Formatting_lit */17,
+                            _0: {
+                              TAG: /* Break */0,
+                              _0: "@;<1 -2>",
+                              _1: 1,
+                              _2: -2
+                            },
+                            _1: {
+                              TAG: /* String_literal */11,
+                              _0: "does not match",
                               _1: {
                                 TAG: /* Formatting_lit */17,
                                 _0: {
@@ -53718,149 +53787,93 @@ function include_err$1(ppf, path$1) {
                                   _2: 0
                                 },
                                 _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: "does not match the interface ",
-                                  _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
+                                  TAG: /* Alpha */15,
+                                  _0: {
+                                    TAG: /* Formatting_lit */17,
+                                    _0: /* Close_box */0,
                                     _1: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* ':' */58,
-                                      _1: /* End_of_format */0
+                                      TAG: /* Formatting_lit */17,
+                                      _0: {
+                                        TAG: /* Break */0,
+                                        _0: "@ ",
+                                        _1: 1,
+                                        _2: 0
+                                      },
+                                      _1: {
+                                        TAG: /* Alpha */15,
+                                        _0: /* End_of_format */0
+                                      }
                                     }
                                   }
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[The implementation %s@ does not match the interface %s:"
-                      }), path$1._0, path$1._1);
-    case /* Class_type_declarations */7 :
-        const id$4 = path$1._0;
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hv 2>Class type declarations do not match:@ %a@;<1 -2>does not match@ %a@]@ %a"
+                }), (function (param, param$1) {
+                return cltype_declaration$1(id$4, param, param$1);
+              }), path$1._1, (function (param, param$1) {
+                return cltype_declaration$1(id$4, param, param$1);
+              }), path$1._2, report_error$3, path$1._3);
+    case /* Class_declarations */8 :
+        const id$5 = path$1._0;
         return Curry._6(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
+                        TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hv 2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hv 2>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Class type declarations do not match:",
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@;<1 -2>",
-                                    _1: 1,
-                                    _2: -2
-                                  },
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: "does not match",
-                                    _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: /* Close_box */0,
-                                          _1: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: {
-                                              TAG: /* Break */0,
-                                              _0: "@ ",
-                                              _1: 1,
-                                              _2: 0
-                                            },
-                                            _1: {
-                                              TAG: /* Alpha */15,
-                                              _0: /* End_of_format */0
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
+                          TAG: /* String_literal */11,
+                          _0: "<hv 2>",
+                          _1: /* End_of_format */0
                         },
-                        _1: "@[<hv 2>Class type declarations do not match:@ %a@;<1 -2>does not match@ %a@]@ %a"
-                      }), (function (param, param$1) {
-                      return cltype_declaration$1(id$4, param, param$1);
-                    }), path$1._1, (function (param, param$1) {
-                      return cltype_declaration$1(id$4, param, param$1);
-                    }), path$1._2, report_error$3, path$1._3);
-    case /* Class_declarations */8 :
-        const id$5 = path$1._0;
-        return Curry._6(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
+                        _1: "<hv 2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "Class declarations do not match:",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Open_box */1,
+                            TAG: /* Formatting_lit */17,
                             _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hv 2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hv 2>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "Class declarations do not match:",
+                              TAG: /* Break */0,
+                              _0: "@;<1 -2>",
+                              _1: 1,
+                              _2: -2
+                            },
                             _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
+                              TAG: /* String_literal */11,
+                              _0: "does not match",
                               _1: {
-                                TAG: /* Alpha */15,
+                                TAG: /* Formatting_lit */17,
                                 _0: {
-                                  TAG: /* Formatting_lit */17,
+                                  TAG: /* Break */0,
+                                  _0: "@ ",
+                                  _1: 1,
+                                  _2: 0
+                                },
+                                _1: {
+                                  TAG: /* Alpha */15,
                                   _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@;<1 -2>",
-                                    _1: 1,
-                                    _2: -2
-                                  },
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: "does not match",
+                                    TAG: /* Formatting_lit */17,
+                                    _0: /* Close_box */0,
                                     _1: {
                                       TAG: /* Formatting_lit */17,
                                       _0: {
@@ -53871,23 +53884,7 @@ function include_err$1(ppf, path$1) {
                                       },
                                       _1: {
                                         TAG: /* Alpha */15,
-                                        _0: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: /* Close_box */0,
-                                          _1: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: {
-                                              TAG: /* Break */0,
-                                              _0: "@ ",
-                                              _1: 1,
-                                              _2: 0
-                                            },
-                                            _1: {
-                                              TAG: /* Alpha */15,
-                                              _0: /* End_of_format */0
-                                            }
-                                          }
-                                        }
+                                        _0: /* End_of_format */0
                                       }
                                     }
                                   }
@@ -53895,56 +53892,59 @@ function include_err$1(ppf, path$1) {
                               }
                             }
                           }
-                        },
-                        _1: "@[<hv 2>Class declarations do not match:@ %a@;<1 -2>does not match@ %a@]@ %a"
-                      }), (function (param, param$1) {
-                      return class_declaration$1(id$5, param, param$1);
-                    }), path$1._1, (function (param, param$1) {
-                      return class_declaration$1(id$5, param, param$1);
-                    }), path$1._2, report_error$3, path$1._3);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hv 2>Class declarations do not match:@ %a@;<1 -2>does not match@ %a@]@ %a"
+                }), (function (param, param$1) {
+                return class_declaration$1(id$5, param, param$1);
+              }), path$1._1, (function (param, param$1) {
+                return class_declaration$1(id$5, param, param$1);
+              }), path$1._2, report_error$3, path$1._3);
     case /* Unbound_modtype_path */9 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Unbound module type ",
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: /* End_of_format */0
-                          }
-                        },
-                        _1: "Unbound module type %a"
-                      }), path, path$1._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Unbound module type ",
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: /* End_of_format */0
+                    }
+                  },
+                  _1: "Unbound module type %a"
+                }), path, path$1._0);
     case /* Unbound_module_path */10 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Unbound module ",
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: /* End_of_format */0
-                          }
-                        },
-                        _1: "Unbound module %a"
-                      }), path, path$1._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Unbound module ",
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: /* End_of_format */0
+                    }
+                  },
+                  _1: "Unbound module %a"
+                }), path, path$1._0);
     case /* Invalid_module_alias */11 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Module ",
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: " cannot be aliased",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "Module %a cannot be aliased"
-                      }), path, path$1._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Module ",
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: " cannot be aliased",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Module %a cannot be aliased"
+                }), path, path$1._0);
     
   }
 }
@@ -53952,154 +53952,154 @@ function include_err$1(ppf, path$1) {
 function context(ppf, param) {
   if (!param) {
     return Stdlib__Format.fprintf(ppf)({
-                TAG: /* Format */0,
-                _0: {
-                  TAG: /* String_literal */11,
-                  _0: "<here>",
-                  _1: /* End_of_format */0
-                },
-                _1: "<here>"
-              });
+          TAG: /* Format */0,
+          _0: {
+            TAG: /* String_literal */11,
+            _0: "<here>",
+            _1: /* End_of_format */0
+          },
+          _1: "<here>"
+        });
   }
   const id = param.hd;
   switch (id.TAG) {
     case /* Module */0 :
         return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* String_literal */11,
+                          _0: "<2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "module ",
+                      _1: {
+                        TAG: /* Alpha */15,
+                        _0: {
+                          TAG: /* Alpha */15,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<2>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "module ",
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "@[<2>module %a%a@]"
-                      }), ident$3, id._0, args, param.tl);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<2>module %a%a@]"
+                }), ident$3, id._0, args, param.tl);
     case /* Modtype */1 :
         return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<2>"
-                            }
-                          },
+                          TAG: /* String_literal */11,
+                          _0: "<2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "module type ",
+                      _1: {
+                        TAG: /* Alpha */15,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: " =",
                           _1: {
-                            TAG: /* String_literal */11,
-                            _0: "module type ",
+                            TAG: /* Formatting_lit */17,
+                            _0: {
+                              TAG: /* Break */0,
+                              _0: "@ ",
+                              _1: 1,
+                              _2: 0
+                            },
                             _1: {
                               TAG: /* Alpha */15,
                               _0: {
-                                TAG: /* String_literal */11,
-                                _0: " =",
-                                _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@ ",
-                                    _1: 1,
-                                    _2: 0
-                                  },
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: /* Close_box */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* Formatting_lit */17,
+                                _0: /* Close_box */0,
+                                _1: /* End_of_format */0
                               }
                             }
                           }
-                        },
-                        _1: "@[<2>module type %a =@ %a@]"
-                      }), ident$3, id._0, context_mty, param.tl);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<2>module type %a =@ %a@]"
+                }), ident$3, id._0, context_mty, param.tl);
     case /* Arg */2 :
         return Curry._4(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "functor (",
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: " : ",
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: ") -> ...",
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "functor (",
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: " : ",
+                        _1: {
+                          TAG: /* Alpha */15,
+                          _0: {
+                            TAG: /* String_literal */11,
+                            _0: ") -> ...",
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "functor (%a : %a) -> ..."
-                      }), ident$3, id._0, context_mty, param.tl);
+                        }
+                      }
+                    }
+                  },
+                  _1: "functor (%a : %a) -> ..."
+                }), ident$3, id._0, context_mty, param.tl);
     case /* Body */3 :
         return Curry._3(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "functor (",
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "functor (",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: ") ->",
+                        _1: {
+                          TAG: /* Formatting_lit */17,
+                          _0: {
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
                           _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: ") ->",
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
-                                _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Alpha */15,
+                            _0: /* End_of_format */0
                           }
-                        },
-                        _1: "functor (%s) ->@ %a"
-                      }), argname(id._0), context_mty, param.tl);
+                        }
+                      }
+                    }
+                  },
+                  _1: "functor (%s) ->@ %a"
+                }), argname(id._0), context_mty, param.tl);
     
   }
 }
@@ -54181,58 +54181,58 @@ function args(ppf, cxt) {
           break;
       case /* Arg */2 :
           return Curry._4(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '(' */40,
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '(' */40,
+                      _1: {
+                        TAG: /* Alpha */15,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: " :",
+                          _1: {
+                            TAG: /* Formatting_lit */17,
+                            _0: {
+                              TAG: /* Break */0,
+                              _0: "@ ",
+                              _1: 1,
+                              _2: 0
+                            },
                             _1: {
                               TAG: /* Alpha */15,
                               _0: {
                                 TAG: /* String_literal */11,
-                                _0: " :",
-                                _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@ ",
-                                    _1: 1,
-                                    _2: 0
-                                  },
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: ") : ...",
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                _0: ") : ...",
+                                _1: /* End_of_format */0
                               }
                             }
-                          },
-                          _1: "(%a :@ %a) : ..."
-                        }), ident$3, x._0, context_mty, cxt.tl);
+                          }
+                        }
+                      }
+                    },
+                    _1: "(%a :@ %a) : ..."
+                  }), ident$3, x._0, context_mty, cxt.tl);
       case /* Body */3 :
           return Curry._3(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '(' */40,
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ')' */41,
-                                _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: /* End_of_format */0
-                                }
-                              }
-                            }
-                          },
-                          _1: "(%s)%a"
-                        }), argname(x._0), args, cxt.tl);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '(' */40,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ')' */41,
+                          _1: {
+                            TAG: /* Alpha */15,
+                            _0: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "(%s)%a"
+                  }), argname(x._0), args, cxt.tl);
       
     }
   }
@@ -54295,32 +54295,32 @@ function path_of_context(param) {
           continue ;
         }
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/ocaml_typedtree_test.ml",
-                    38670,
-                    15
-                  ]
-                });
-      };
-    }
-    throw new Caml_js_exceptions.MelangeError("Assert_failure", {
               MEL_EXN_ID: "Assert_failure",
               _1: [
                 "jscomp/test/ocaml_typedtree_test.ml",
-                38672,
-                9
+                38670,
+                15
               ]
             });
+      };
+    }
+    throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            38672,
+            9
+          ]
+        });
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              38672,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          38672,
+          9
+        ]
+      });
 }
 
 function context$1(ppf, cxt) {
@@ -54330,50 +54330,63 @@ function context$1(ppf, cxt) {
             return param.TAG === /* Module */0 ? true : false;
           }), cxt)) {
     return Curry._2(Stdlib__Format.fprintf(ppf)({
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "In module ",
+                _1: {
+                  TAG: /* Alpha */15,
+                  _0: {
+                    TAG: /* Char_literal */12,
+                    _0: /* ':' */58,
+                    _1: {
+                      TAG: /* Formatting_lit */17,
+                      _0: {
+                        TAG: /* Break */0,
+                        _0: "@ ",
+                        _1: 1,
+                        _2: 0
+                      },
+                      _1: /* End_of_format */0
+                    }
+                  }
+                }
+              },
+              _1: "In module %a:@ "
+            }), path, path_of_context(cxt));
+  } else {
+    return Curry._2(Stdlib__Format.fprintf(ppf)({
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_gen */18,
+                _0: {
+                  TAG: /* Open_box */1,
+                  _0: {
                     TAG: /* Format */0,
                     _0: {
                       TAG: /* String_literal */11,
-                      _0: "In module ",
-                      _1: {
-                        TAG: /* Alpha */15,
-                        _0: {
-                          TAG: /* Char_literal */12,
-                          _0: /* ':' */58,
-                          _1: {
-                            TAG: /* Formatting_lit */17,
-                            _0: {
-                              TAG: /* Break */0,
-                              _0: "@ ",
-                              _1: 1,
-                              _2: 0
-                            },
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      }
+                      _0: "<hv 2>",
+                      _1: /* End_of_format */0
                     },
-                    _1: "In module %a:@ "
-                  }), path, path_of_context(cxt));
-  } else {
-    return Curry._2(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
+                    _1: "<hv 2>"
+                  }
+                },
+                _1: {
+                  TAG: /* String_literal */11,
+                  _0: "At position",
+                  _1: {
+                    TAG: /* Formatting_lit */17,
                     _0: {
-                      TAG: /* Formatting_gen */18,
+                      TAG: /* Break */0,
+                      _0: "@ ",
+                      _1: 1,
+                      _2: 0
+                    },
+                    _1: {
+                      TAG: /* Alpha */15,
                       _0: {
-                        TAG: /* Open_box */1,
-                        _0: {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "<hv 2>",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "<hv 2>"
-                        }
-                      },
-                      _1: {
-                        TAG: /* String_literal */11,
-                        _0: "At position",
+                        TAG: /* Formatting_lit */17,
+                        _0: /* Close_box */0,
                         _1: {
                           TAG: /* Formatting_lit */17,
                           _0: {
@@ -54382,28 +54395,15 @@ function context$1(ppf, cxt) {
                             _1: 1,
                             _2: 0
                           },
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: {
-                              TAG: /* Formatting_lit */17,
-                              _0: /* Close_box */0,
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
+                          _1: /* End_of_format */0
                         }
                       }
-                    },
-                    _1: "@[<hv 2>At position@ %a@]@ "
-                  }), context, cxt);
+                    }
+                  }
+                }
+              },
+              _1: "@[<hv 2>At position@ %a@]@ "
+            }), context, cxt);
   }
 }
 
@@ -54476,51 +54476,51 @@ function report_error$4(ppf, errs) {
   const print_errs = function (ppf) {
     return function (param) {
       return Stdlib__List.iter((function (param) {
-                    if (is_big(param[2])) {
-                      if (pe.contents) {
-                        Stdlib__Format.fprintf(ppf)({
-                              TAG: /* Format */0,
+              if (is_big(param[2])) {
+                if (pe.contents) {
+                  Stdlib__Format.fprintf(ppf)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: "...",
+                          _1: {
+                            TAG: /* Formatting_lit */17,
+                            _0: {
+                              TAG: /* Break */0,
+                              _0: "@ ",
+                              _1: 1,
+                              _2: 0
+                            },
+                            _1: /* End_of_format */0
+                          }
+                        },
+                        _1: "...@ "
+                      });
+                  pe.contents = false;
+                  return ;
+                } else {
+                  return ;
+                }
+              } else {
+                return Curry._2(Stdlib__Format.fprintf(ppf)({
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* Alpha */15,
+                            _0: {
+                              TAG: /* Formatting_lit */17,
                               _0: {
-                                TAG: /* String_literal */11,
-                                _0: "...",
-                                _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@ ",
-                                    _1: 1,
-                                    _2: 0
-                                  },
-                                  _1: /* End_of_format */0
-                                }
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
                               },
-                              _1: "...@ "
-                            });
-                        pe.contents = false;
-                        return ;
-                      } else {
-                        return ;
-                      }
-                    } else {
-                      return Curry._2(Stdlib__Format.fprintf(ppf)({
-                                      TAG: /* Format */0,
-                                      _0: {
-                                        TAG: /* Alpha */15,
-                                        _0: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: {
-                                            TAG: /* Break */0,
-                                            _0: "@ ",
-                                            _1: 1,
-                                            _2: 0
-                                          },
-                                          _1: /* End_of_format */0
-                                        }
-                                      },
-                                      _1: "%a@ "
-                                    }), include_err$2, param);
-                    }
-                  }), param);
+                              _1: /* End_of_format */0
+                            }
+                          },
+                          _1: "%a@ "
+                        }), include_err$2, param);
+              }
+            }), param);
     };
   };
   Curry._4(Stdlib__Format.fprintf(ppf)({
@@ -54600,13 +54600,13 @@ function record$2(ti) {
 
 function make_pat(desc, ty, tenv) {
   return {
-          pat_desc: desc,
-          pat_loc: none,
-          pat_extra: /* [] */0,
-          pat_type: ty,
-          pat_env: tenv,
-          pat_attributes: /* [] */0
-        };
+    pat_desc: desc,
+    pat_loc: none,
+    pat_extra: /* [] */0,
+    pat_type: ty,
+    pat_env: tenv,
+    pat_attributes: /* [] */0
+  };
 }
 
 const omega = make_pat(/* Tpat_any */0, none$2, empty);
@@ -54625,9 +54625,9 @@ function omegas(i) {
     return /* [] */0;
   } else {
     return {
-            hd: omega,
-            tl: omegas(i - 1 | 0)
-          };
+      hd: omega,
+      tl: omegas(i - 1 | 0)
+    };
   }
 }
 
@@ -54741,9 +54741,9 @@ function records_args(l1, l2) {
     }
     if (!l2$1) {
       return [
-              Stdlib__List.rev(r1),
-              Stdlib__List.rev(r2)
-            ];
+        Stdlib__List.rev(r1),
+        Stdlib__List.rev(r2)
+      ];
     }
     _l2 = l2$1.tl;
     _l1 = /* [] */0;
@@ -54988,13 +54988,13 @@ function compat(_p, _q) {
           continue ;
       case 3 :
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      39141,
-                      6
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  39141,
+                  6
+                ]
+              });
       
     }
   };
@@ -55014,25 +55014,25 @@ function compats(_ps, _qs) {
         continue ;
       }
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  39146,
-                  12
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              39146,
+              12
+            ]
+          });
     }
     if (!qs) {
       return true;
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                39146,
-                12
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            39146,
+            12
+          ]
+        });
   };
 }
 
@@ -55068,93 +55068,93 @@ function pretty_const(c) {
   switch (c.TAG) {
     case /* Const_int */0 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Int */4,
-                          _0: /* Int_d */0,
-                          _1: /* No_padding */0,
-                          _2: /* No_precision */0,
-                          _3: /* End_of_format */0
-                        },
-                        _1: "%d"
-                      }), c._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Int */4,
+                    _0: /* Int_d */0,
+                    _1: /* No_padding */0,
+                    _2: /* No_precision */0,
+                    _3: /* End_of_format */0
+                  },
+                  _1: "%d"
+                }), c._0);
     case /* Const_char */1 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Caml_char */1,
-                          _0: /* End_of_format */0
-                        },
-                        _1: "%C"
-                      }), c._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Caml_char */1,
+                    _0: /* End_of_format */0
+                  },
+                  _1: "%C"
+                }), c._0);
     case /* Const_string */2 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Caml_string */3,
-                          _0: /* No_padding */0,
-                          _1: /* End_of_format */0
-                        },
-                        _1: "%S"
-                      }), c._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Caml_string */3,
+                    _0: /* No_padding */0,
+                    _1: /* End_of_format */0
+                  },
+                  _1: "%S"
+                }), c._0);
     case /* Const_float */3 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: /* End_of_format */0
-                        },
-                        _1: "%s"
-                      }), c._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: /* End_of_format */0
+                  },
+                  _1: "%s"
+                }), c._0);
     case /* Const_int32 */4 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Int32 */5,
-                          _0: /* Int_d */0,
-                          _1: /* No_padding */0,
-                          _2: /* No_precision */0,
-                          _3: {
-                            TAG: /* Char_literal */12,
-                            _0: /* 'l' */108,
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "%ldl"
-                      }), c._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Int32 */5,
+                    _0: /* Int_d */0,
+                    _1: /* No_padding */0,
+                    _2: /* No_precision */0,
+                    _3: {
+                      TAG: /* Char_literal */12,
+                      _0: /* 'l' */108,
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "%ldl"
+                }), c._0);
     case /* Const_int64 */5 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Int64 */7,
-                          _0: /* Int_d */0,
-                          _1: /* No_padding */0,
-                          _2: /* No_precision */0,
-                          _3: {
-                            TAG: /* Char_literal */12,
-                            _0: /* 'L' */76,
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "%LdL"
-                      }), c._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Int64 */7,
+                    _0: /* Int_d */0,
+                    _1: /* No_padding */0,
+                    _2: /* No_precision */0,
+                    _3: {
+                      TAG: /* Char_literal */12,
+                      _0: /* 'L' */76,
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "%LdL"
+                }), c._0);
     case /* Const_nativeint */6 :
         return Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Nativeint */6,
-                          _0: /* Int_d */0,
-                          _1: /* No_padding */0,
-                          _2: /* No_precision */0,
-                          _3: {
-                            TAG: /* Char_literal */12,
-                            _0: /* 'n' */110,
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "%ndn"
-                      }), c._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Nativeint */6,
+                    _0: /* Int_d */0,
+                    _1: /* No_padding */0,
+                    _2: /* No_precision */0,
+                    _3: {
+                      TAG: /* Char_literal */12,
+                      _0: /* 'n' */110,
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "%ndn"
+                }), c._0);
     
   }
 }
@@ -55166,285 +55166,285 @@ function pretty_val(ppf, v) {
     let tmp = match.hd[0];
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return Curry._2(Stdlib__Format.fprintf(ppf)({
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Formatting_gen */18,
+                  _0: {
+                    TAG: /* Open_box */1,
+                    _0: {
                       TAG: /* Format */0,
+                      _0: /* End_of_format */0,
+                      _1: ""
+                    }
+                  },
+                  _1: {
+                    TAG: /* String_literal */11,
+                    _0: "(module ",
+                    _1: {
+                      TAG: /* Alpha */15,
                       _0: {
-                        TAG: /* Formatting_gen */18,
-                        _0: {
-                          TAG: /* Open_box */1,
-                          _0: {
-                            TAG: /* Format */0,
-                            _0: /* End_of_format */0,
-                            _1: ""
-                          }
-                        },
+                        TAG: /* Char_literal */12,
+                        _0: /* ')' */41,
                         _1: {
-                          TAG: /* String_literal */11,
-                          _0: "(module ",
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: {
-                              TAG: /* Char_literal */12,
-                              _0: /* ')' */41,
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: /* Close_box */0,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
+                          TAG: /* Formatting_lit */17,
+                          _0: /* Close_box */0,
+                          _1: /* End_of_format */0
                         }
-                      },
-                      _1: "@[(module %a)@]"
-                    }), pretty_val, {
-                  pat_desc: v.pat_desc,
-                  pat_loc: v.pat_loc,
-                  pat_extra: rem,
-                  pat_type: v.pat_type,
-                  pat_env: v.pat_env,
-                  pat_attributes: v.pat_attributes
-                });
+                      }
+                    }
+                  }
+                },
+                _1: "@[(module %a)@]"
+              }), pretty_val, {
+            pat_desc: v.pat_desc,
+            pat_loc: v.pat_loc,
+            pat_extra: rem,
+            pat_type: v.pat_type,
+            pat_env: v.pat_env,
+            pat_attributes: v.pat_attributes
+          });
     } else if (tmp.TAG === /* Tpat_constraint */0) {
       return Curry._2(Stdlib__Format.fprintf(ppf)({
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Formatting_gen */18,
+                  _0: {
+                    TAG: /* Open_box */1,
+                    _0: {
                       TAG: /* Format */0,
+                      _0: /* End_of_format */0,
+                      _1: ""
+                    }
+                  },
+                  _1: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '(' */40,
+                    _1: {
+                      TAG: /* Alpha */15,
                       _0: {
-                        TAG: /* Formatting_gen */18,
-                        _0: {
-                          TAG: /* Open_box */1,
-                          _0: {
-                            TAG: /* Format */0,
-                            _0: /* End_of_format */0,
-                            _1: ""
-                          }
-                        },
+                        TAG: /* String_literal */11,
+                        _0: " : _)",
                         _1: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '(' */40,
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: " : _)",
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: /* Close_box */0,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
+                          TAG: /* Formatting_lit */17,
+                          _0: /* Close_box */0,
+                          _1: /* End_of_format */0
                         }
-                      },
-                      _1: "@[(%a : _)@]"
-                    }), pretty_val, {
-                  pat_desc: v.pat_desc,
-                  pat_loc: v.pat_loc,
-                  pat_extra: rem,
-                  pat_type: v.pat_type,
-                  pat_env: v.pat_env,
-                  pat_attributes: v.pat_attributes
-                });
+                      }
+                    }
+                  }
+                },
+                _1: "@[(%a : _)@]"
+              }), pretty_val, {
+            pat_desc: v.pat_desc,
+            pat_loc: v.pat_loc,
+            pat_extra: rem,
+            pat_type: v.pat_type,
+            pat_env: v.pat_env,
+            pat_attributes: v.pat_attributes
+          });
     } else {
       return Curry._2(Stdlib__Format.fprintf(ppf)({
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Formatting_gen */18,
+                  _0: {
+                    TAG: /* Open_box */1,
+                    _0: {
                       TAG: /* Format */0,
+                      _0: /* End_of_format */0,
+                      _1: ""
+                    }
+                  },
+                  _1: {
+                    TAG: /* String_literal */11,
+                    _0: "(# ",
+                    _1: {
+                      TAG: /* Alpha */15,
                       _0: {
-                        TAG: /* Formatting_gen */18,
-                        _0: {
-                          TAG: /* Open_box */1,
-                          _0: {
-                            TAG: /* Format */0,
-                            _0: /* End_of_format */0,
-                            _1: ""
-                          }
-                        },
+                        TAG: /* Char_literal */12,
+                        _0: /* ')' */41,
                         _1: {
-                          TAG: /* String_literal */11,
-                          _0: "(# ",
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: {
-                              TAG: /* Char_literal */12,
-                              _0: /* ')' */41,
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: /* Close_box */0,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
+                          TAG: /* Formatting_lit */17,
+                          _0: /* Close_box */0,
+                          _1: /* End_of_format */0
                         }
-                      },
-                      _1: "@[(# %a)@]"
-                    }), pretty_val, {
-                  pat_desc: v.pat_desc,
-                  pat_loc: v.pat_loc,
-                  pat_extra: rem,
-                  pat_type: v.pat_type,
-                  pat_env: v.pat_env,
-                  pat_attributes: v.pat_attributes
-                });
+                      }
+                    }
+                  }
+                },
+                _1: "@[(# %a)@]"
+              }), pretty_val, {
+            pat_desc: v.pat_desc,
+            pat_loc: v.pat_loc,
+            pat_extra: rem,
+            pat_type: v.pat_type,
+            pat_env: v.pat_env,
+            pat_attributes: v.pat_attributes
+          });
     }
   }
   const c = v.pat_desc;
   if (/* tag */typeof c === "number" || typeof c === "string") {
     return Stdlib__Format.fprintf(ppf)({
-                TAG: /* Format */0,
-                _0: {
-                  TAG: /* Char_literal */12,
-                  _0: /* '_' */95,
-                  _1: /* End_of_format */0
-                },
-                _1: "_"
-              });
+          TAG: /* Format */0,
+          _0: {
+            TAG: /* Char_literal */12,
+            _0: /* '_' */95,
+            _1: /* End_of_format */0
+          },
+          _1: "_"
+        });
   }
   switch (c.TAG) {
     case /* Tpat_var */0 :
         return print$2(ppf, c._0);
     case /* Tpat_alias */1 :
         return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '(' */40,
+                      _1: {
+                        TAG: /* Alpha */15,
                         _0: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* Formatting_lit */17,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
                           },
                           _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '(' */40,
+                            TAG: /* String_literal */11,
+                            _0: "as ",
                             _1: {
                               TAG: /* Alpha */15,
                               _0: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
+                                TAG: /* Char_literal */12,
+                                _0: /* ')' */41,
                                 _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: "as ",
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* ')' */41,
-                                      _1: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
+                                  TAG: /* Formatting_lit */17,
+                                  _0: /* Close_box */0,
+                                  _1: /* End_of_format */0
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[(%a@ as %a)@]"
-                      }), pretty_val, c._0, print$2, c._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[(%a@ as %a)@]"
+                }), pretty_val, c._0, print$2, c._1);
     case /* Tpat_constant */2 :
         return Curry._1(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: /* End_of_format */0
-                        },
-                        _1: "%s"
-                      }), pretty_const(c._0));
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: /* End_of_format */0
+                  },
+                  _1: "%s"
+                }), pretty_const(c._0));
     case /* Tpat_tuple */3 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '(' */40,
+                      _1: {
+                        TAG: /* Alpha */15,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
+                          TAG: /* Char_literal */12,
+                          _0: /* ')' */41,
                           _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '(' */40,
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ')' */41,
-                                _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "@[(%a)@]"
-                      }), (function (param, param$1) {
-                      return pretty_vals(",", param, param$1);
-                    }), c._0);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[(%a)@]"
+                }), (function (param, param$1) {
+                return pretty_vals(",", param, param$1);
+              }), c._0);
     case /* Tpat_construct */4 :
         const match$1 = c._2;
         const cstr = c._1;
         if (!match$1) {
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: /* End_of_format */0
-                          },
-                          _1: "%s"
-                        }), cstr.cstr_name);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: /* End_of_format */0
+                    },
+                    _1: "%s"
+                  }), cstr.cstr_name);
         }
         if (!match$1.tl) {
           return Curry._3(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
                           TAG: /* Format */0,
                           _0: {
-                            TAG: /* Formatting_gen */18,
+                            TAG: /* String_literal */11,
+                            _0: "<2>",
+                            _1: /* End_of_format */0
+                          },
+                          _1: "<2>"
+                        }
+                      },
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
+                          _0: {
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
+                          _1: {
+                            TAG: /* Alpha */15,
                             _0: {
-                              TAG: /* Open_box */1,
-                              _0: {
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "<2>",
-                                  _1: /* End_of_format */0
-                                },
-                                _1: "<2>"
-                              }
-                            },
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
-                                _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: /* Close_box */0,
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* Formatting_lit */17,
+                              _0: /* Close_box */0,
+                              _1: /* End_of_format */0
                             }
-                          },
-                          _1: "@[<2>%s@ %a@]"
-                        }), cstr.cstr_name, pretty_arg, match$1.hd);
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[<2>%s@ %a@]"
+                  }), cstr.cstr_name, pretty_arg, match$1.hd);
         }
         const vs = c._2;
         const name = c._1.cstr_name;
@@ -55452,338 +55452,338 @@ function pretty_val(ppf, v) {
           const match$2 = vs.tl;
           if (match$2 && !match$2.tl) {
             return Curry._4(Stdlib__Format.fprintf(ppf)({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Formatting_gen */18,
+                        _0: {
+                          TAG: /* Open_box */1,
+                          _0: {
                             TAG: /* Format */0,
-                            _0: {
-                              TAG: /* Formatting_gen */18,
+                            _0: /* End_of_format */0,
+                            _1: ""
+                          }
+                        },
+                        _1: {
+                          TAG: /* Alpha */15,
+                          _0: {
+                            TAG: /* String_literal */11,
+                            _0: "::",
+                            _1: {
+                              TAG: /* Formatting_lit */17,
                               _0: {
-                                TAG: /* Open_box */1,
-                                _0: {
-                                  TAG: /* Format */0,
-                                  _0: /* End_of_format */0,
-                                  _1: ""
-                                }
+                                TAG: /* Break */0,
+                                _0: "@,",
+                                _1: 0,
+                                _2: 0
                               },
                               _1: {
                                 TAG: /* Alpha */15,
                                 _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "::",
-                                  _1: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@,",
-                                      _1: 0,
-                                      _2: 0
-                                    },
-                                    _1: {
-                                      TAG: /* Alpha */15,
-                                      _0: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
+                                  TAG: /* Formatting_lit */17,
+                                  _0: /* Close_box */0,
+                                  _1: /* End_of_format */0
                                 }
                               }
-                            },
-                            _1: "@[%a::@,%a@]"
-                          }), pretty_car, vs.hd, pretty_cdr, match$2.hd);
+                            }
+                          }
+                        }
+                      },
+                      _1: "@[%a::@,%a@]"
+                    }), pretty_car, vs.hd, pretty_cdr, match$2.hd);
           }
           
         }
         return Curry._3(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
+                          TAG: /* String_literal */11,
+                          _0: "<2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
+                        },
+                        _1: {
                           TAG: /* Formatting_gen */18,
                           _0: {
                             TAG: /* Open_box */1,
                             _0: {
                               TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<2>"
+                              _0: /* End_of_format */0,
+                              _1: ""
                             }
                           },
                           _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
+                            TAG: /* Char_literal */12,
+                            _0: /* '(' */40,
                             _1: {
-                              TAG: /* Formatting_lit */17,
+                              TAG: /* Alpha */15,
                               _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* Formatting_gen */18,
-                                _0: {
-                                  TAG: /* Open_box */1,
-                                  _0: {
-                                    TAG: /* Format */0,
-                                    _0: /* End_of_format */0,
-                                    _1: ""
-                                  }
-                                },
+                                TAG: /* Char_literal */12,
+                                _0: /* ')' */41,
                                 _1: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* '(' */40,
+                                  TAG: /* Formatting_lit */17,
+                                  _0: /* Close_box */0,
                                   _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* ')' */41,
-                                      _1: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
-                                        _1: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: /* Close_box */0,
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
+                                    TAG: /* Formatting_lit */17,
+                                    _0: /* Close_box */0,
+                                    _1: /* End_of_format */0
                                   }
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[<2>%s@ @[(%a)@]@]"
-                      }), name, (function (param, param$1) {
-                      return pretty_vals(",", param, param$1);
-                    }), vs);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<2>%s@ @[(%a)@]@]"
+                }), name, (function (param, param$1) {
+                return pretty_vals(",", param, param$1);
+              }), vs);
         break;
     case /* Tpat_variant */5 :
         const w = c._1;
         const l = c._0;
         if (w !== undefined) {
           return Curry._3(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
                           TAG: /* Format */0,
                           _0: {
-                            TAG: /* Formatting_gen */18,
+                            TAG: /* String_literal */11,
+                            _0: "<2>",
+                            _1: /* End_of_format */0
+                          },
+                          _1: "<2>"
+                        }
+                      },
+                      _1: {
+                        TAG: /* Char_literal */12,
+                        _0: /* '`' */96,
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
+                          _1: {
+                            TAG: /* Formatting_lit */17,
                             _0: {
-                              TAG: /* Open_box */1,
-                              _0: {
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "<2>",
-                                  _1: /* End_of_format */0
-                                },
-                                _1: "<2>"
-                              }
+                              TAG: /* Break */0,
+                              _0: "@ ",
+                              _1: 1,
+                              _2: 0
                             },
                             _1: {
-                              TAG: /* Char_literal */12,
-                              _0: /* '`' */96,
-                              _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@ ",
-                                    _1: 1,
-                                    _2: 0
-                                  },
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: /* Close_box */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                              TAG: /* Alpha */15,
+                              _0: {
+                                TAG: /* Formatting_lit */17,
+                                _0: /* Close_box */0,
+                                _1: /* End_of_format */0
                               }
                             }
-                          },
-                          _1: "@[<2>`%s@ %a@]"
-                        }), l, pretty_arg, w);
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[<2>`%s@ %a@]"
+                  }), l, pretty_arg, w);
         } else {
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '`' */96,
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          },
-                          _1: "`%s"
-                        }), l);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '`' */96,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
+                      }
+                    },
+                    _1: "`%s"
+                  }), l);
         }
     case /* Tpat_record */6 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '{' */123,
+                      _1: {
+                        TAG: /* Alpha */15,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
+                          TAG: /* Char_literal */12,
+                          _0: /* '}' */125,
                           _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '{' */123,
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Char_literal */12,
-                                _0: /* '}' */125,
-                                _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          }
-                        },
-                        _1: "@[{%a}@]"
-                      }), pretty_lvals, Stdlib__List.filter((function (param) {
-                          let tmp = param[2].pat_desc;
-                          if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
-                            return false;
-                          } else {
-                            return true;
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
-                        }), c._0));
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[{%a}@]"
+                }), pretty_lvals, Stdlib__List.filter((function (param) {
+                    let tmp = param[2].pat_desc;
+                    if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
+                      return false;
+                    } else {
+                      return true;
+                    }
+                  }), c._0));
     case /* Tpat_array */7 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "[| ",
+                      _1: {
+                        TAG: /* Alpha */15,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
+                          TAG: /* String_literal */11,
+                          _0: " |]",
                           _1: {
-                            TAG: /* String_literal */11,
-                            _0: "[| ",
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: " |]",
-                                _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "@[[| %a |]@]"
-                      }), (function (param, param$1) {
-                      return pretty_vals(" ;", param, param$1);
-                    }), c._0);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[[| %a |]@]"
+                }), (function (param, param$1) {
+                return pretty_vals(" ;", param, param$1);
+              }), c._0);
     case /* Tpat_or */8 :
         return Curry._4(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '(' */40,
+                      _1: {
+                        TAG: /* Alpha */15,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
+                          TAG: /* Char_literal */12,
+                          _0: /* '|' */124,
                           _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '(' */40,
+                            TAG: /* Formatting_lit */17,
+                            _0: {
+                              TAG: /* Break */0,
+                              _0: "@,",
+                              _1: 0,
+                              _2: 0
+                            },
                             _1: {
                               TAG: /* Alpha */15,
                               _0: {
                                 TAG: /* Char_literal */12,
-                                _0: /* '|' */124,
+                                _0: /* ')' */41,
                                 _1: {
                                   TAG: /* Formatting_lit */17,
-                                  _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@,",
-                                    _1: 0,
-                                    _2: 0
-                                  },
-                                  _1: {
-                                    TAG: /* Alpha */15,
-                                    _0: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* ')' */41,
-                                      _1: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
+                                  _0: /* Close_box */0,
+                                  _1: /* End_of_format */0
                                 }
                               }
                             }
                           }
-                        },
-                        _1: "@[(%a|@,%a)@]"
-                      }), pretty_or, c._0, pretty_or, c._1);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[(%a|@,%a)@]"
+                }), pretty_or, c._0, pretty_or, c._1);
     case /* Tpat_lazy */9 :
         return Curry._2(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<2>"
-                            }
-                          },
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "lazy",
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          }
+                          TAG: /* String_literal */11,
+                          _0: "<2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "lazy",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
                         },
-                        _1: "@[<2>lazy@ %a@]"
-                      }), pretty_arg, c._0);
+                        _1: {
+                          TAG: /* Alpha */15,
+                          _0: {
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<2>lazy@ %a@]"
+                }), pretty_arg, c._0);
     
   }
 }
@@ -55803,21 +55803,21 @@ function pretty_car(ppf, v) {
   const match$2 = match$1.tl;
   if (match$2 && !(match$2.tl || !is_cons(match._1))) {
     return Curry._2(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Char_literal */12,
-                      _0: /* '(' */40,
-                      _1: {
-                        TAG: /* Alpha */15,
-                        _0: {
-                          TAG: /* Char_literal */12,
-                          _0: /* ')' */41,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "(%a)"
-                  }), pretty_val, v);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char_literal */12,
+                _0: /* '(' */40,
+                _1: {
+                  TAG: /* Alpha */15,
+                  _0: {
+                    TAG: /* Char_literal */12,
+                    _0: /* ')' */41,
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "(%a)"
+            }), pretty_val, v);
   } else {
     return pretty_val(ppf, v);
   }
@@ -55838,29 +55838,29 @@ function pretty_cdr(ppf, v) {
   const match$2 = match$1.tl;
   if (match$2 && !(match$2.tl || !is_cons(match._1))) {
     return Curry._4(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Alpha */15,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "::",
+                  _1: {
+                    TAG: /* Formatting_lit */17,
                     _0: {
-                      TAG: /* Alpha */15,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "::",
-                        _1: {
-                          TAG: /* Formatting_lit */17,
-                          _0: {
-                            TAG: /* Break */0,
-                            _0: "@,",
-                            _1: 0,
-                            _2: 0
-                          },
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: /* End_of_format */0
-                          }
-                        }
-                      }
+                      TAG: /* Break */0,
+                      _0: "@,",
+                      _1: 0,
+                      _2: 0
                     },
-                    _1: "%a::@,%a"
-                  }), pretty_car, match$1.hd, pretty_cdr, match$2.hd);
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: /* End_of_format */0
+                    }
+                  }
+                }
+              },
+              _1: "%a::@,%a"
+            }), pretty_car, match$1.hd, pretty_cdr, match$2.hd);
   } else {
     return pretty_val(ppf, v);
   }
@@ -55909,29 +55909,29 @@ function pretty_or(ppf, v) {
     return pretty_val(ppf, v);
   } else {
     return Curry._4(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Alpha */15,
+                _0: {
+                  TAG: /* Char_literal */12,
+                  _0: /* '|' */124,
+                  _1: {
+                    TAG: /* Formatting_lit */17,
                     _0: {
-                      TAG: /* Alpha */15,
-                      _0: {
-                        TAG: /* Char_literal */12,
-                        _0: /* '|' */124,
-                        _1: {
-                          TAG: /* Formatting_lit */17,
-                          _0: {
-                            TAG: /* Break */0,
-                            _0: "@,",
-                            _1: 0,
-                            _2: 0
-                          },
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: /* End_of_format */0
-                          }
-                        }
-                      }
+                      TAG: /* Break */0,
+                      _0: "@,",
+                      _1: 0,
+                      _2: 0
                     },
-                    _1: "%a|@,%a"
-                  }), pretty_or, match._0, pretty_or, match._1);
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: /* End_of_format */0
+                    }
+                  }
+                }
+              },
+              _1: "%a|@,%a"
+            }), pretty_or, match._0, pretty_or, match._1);
   }
 }
 
@@ -55942,31 +55942,31 @@ function pretty_vals(sep, ppf, param) {
   const v = param.hd;
   if (param.tl) {
     return Curry._5(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Alpha */15,
+                _0: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* Formatting_lit */17,
                     _0: {
-                      TAG: /* Alpha */15,
-                      _0: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
-                          TAG: /* Formatting_lit */17,
-                          _0: {
-                            TAG: /* Break */0,
-                            _0: "@ ",
-                            _1: 1,
-                            _2: 0
-                          },
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: /* End_of_format */0
-                          }
-                        }
-                      }
+                      TAG: /* Break */0,
+                      _0: "@ ",
+                      _1: 1,
+                      _2: 0
                     },
-                    _1: "%a%s@ %a"
-                  }), pretty_val, v, sep, (function (param, param$1) {
-                  return pretty_vals(sep, param, param$1);
-                }), param.tl);
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: /* End_of_format */0
+                    }
+                  }
+                }
+              },
+              _1: "%a%s@ %a"
+            }), pretty_val, v, sep, (function (param, param$1) {
+            return pretty_vals(sep, param, param$1);
+          }), param.tl);
   } else {
     return pretty_val(ppf, v);
   }
@@ -55979,54 +55979,54 @@ function pretty_lvals(ppf, param) {
   const match = param.hd;
   if (param.tl) {
     return Curry._5(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String */2,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* Char_literal */12,
+                  _0: /* '=' */61,
+                  _1: {
+                    TAG: /* Alpha */15,
                     _0: {
-                      TAG: /* String */2,
-                      _0: /* No_padding */0,
+                      TAG: /* Char_literal */12,
+                      _0: /* ';' */59,
                       _1: {
-                        TAG: /* Char_literal */12,
-                        _0: /* '=' */61,
+                        TAG: /* Formatting_lit */17,
+                        _0: {
+                          TAG: /* Break */0,
+                          _0: "@ ",
+                          _1: 1,
+                          _2: 0
+                        },
                         _1: {
                           TAG: /* Alpha */15,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ';' */59,
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Break */0,
-                                _0: "@ ",
-                                _1: 1,
-                                _2: 0
-                              },
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: /* End_of_format */0
-                              }
-                            }
-                          }
+                          _0: /* End_of_format */0
                         }
                       }
-                    },
-                    _1: "%s=%a;@ %a"
-                  }), match[1].lbl_name, pretty_val, match[2], pretty_lvals, param.tl);
+                    }
+                  }
+                }
+              },
+              _1: "%s=%a;@ %a"
+            }), match[1].lbl_name, pretty_val, match[2], pretty_lvals, param.tl);
   } else {
     return Curry._3(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String */2,
-                      _0: /* No_padding */0,
-                      _1: {
-                        TAG: /* Char_literal */12,
-                        _0: /* '=' */61,
-                        _1: {
-                          TAG: /* Alpha */15,
-                          _0: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "%s=%a"
-                  }), match[1].lbl_name, pretty_val, match[2]);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String */2,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* Char_literal */12,
+                  _0: /* '=' */61,
+                  _1: {
+                    TAG: /* Alpha */15,
+                    _0: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "%s=%a"
+            }), match[1].lbl_name, pretty_val, match[2]);
   }
 }
 
@@ -56173,8 +56173,8 @@ function record_arg(p) {
 
 function get_field(pos, arg) {
   return Stdlib__List.find((function (param) {
-                  return pos === param[1].lbl_pos;
-                }), arg)[2];
+            return pos === param[1].lbl_pos;
+          }), arg)[2];
 }
 
 function simple_match_args(p1, _p2) {
@@ -56194,9 +56194,9 @@ function simple_match_args(p1, _p2) {
             const arg = args._1;
             if (arg !== undefined) {
               return {
-                      hd: arg,
-                      tl: /* [] */0
-                    };
+                hd: arg,
+                tl: /* [] */0
+              };
             } else {
               return /* [] */0;
             }
@@ -56204,17 +56204,17 @@ function simple_match_args(p1, _p2) {
             let omegas = record_arg(p1);
             let arg$1 = args._0;
             return Stdlib__List.map((function (param) {
-                          try {
-                            return get_field(param[1].lbl_pos, arg$1);
-                          }
-                          catch (raw_exn){
-                            const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-                            if (exn.MEL_EXN_ID === Stdlib.Not_found) {
-                              return omega;
-                            }
-                            throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
-                          }
-                        }), omegas);
+                    try {
+                      return get_field(param[1].lbl_pos, arg$1);
+                    }
+                    catch (raw_exn){
+                      const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
+                      if (exn.MEL_EXN_ID === Stdlib.Not_found) {
+                        return omega;
+                      }
+                      throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
+                    }
+                  }), omegas);
         case /* Tpat_tuple */3 :
         case /* Tpat_array */7 :
             return args._0;
@@ -56223,9 +56223,9 @@ function simple_match_args(p1, _p2) {
             return /* [] */0;
         case /* Tpat_lazy */9 :
             return {
-                    hd: args._0,
-                    tl: /* [] */0
-                  };
+              hd: args._0,
+              tl: /* [] */0
+            };
         
       }
     }
@@ -56236,34 +56236,34 @@ function simple_match_args(p1, _p2) {
     switch (args$1.TAG) {
       case /* Tpat_tuple */3 :
           return Stdlib__List.map((function (param) {
-                        return omega;
-                      }), args$1._0);
+                  return omega;
+                }), args$1._0);
       case /* Tpat_construct */4 :
           return Stdlib__List.map((function (param) {
-                        return omega;
-                      }), args$1._2);
+                  return omega;
+                }), args$1._2);
       case /* Tpat_variant */5 :
           if (args$1._1 !== undefined) {
             return {
-                    hd: omega,
-                    tl: /* [] */0
-                  };
+              hd: omega,
+              tl: /* [] */0
+            };
           } else {
             return /* [] */0;
           }
       case /* Tpat_record */6 :
           return Stdlib__List.map((function (param) {
-                        return omega;
-                      }), args$1._0);
+                  return omega;
+                }), args$1._0);
       case /* Tpat_array */7 :
           return Stdlib__List.map((function (param) {
-                        return omega;
-                      }), args$1._0);
+                  return omega;
+                }), args$1._0);
       case /* Tpat_lazy */9 :
           return {
-                  hd: omega,
-                  tl: /* [] */0
-                };
+            hd: omega,
+            tl: /* [] */0
+          };
       default:
         return /* [] */0;
     }
@@ -56287,55 +56287,55 @@ function normalize_pat(_q) {
           return q;
       case /* Tpat_tuple */3 :
           return make_pat({
-                      TAG: /* Tpat_tuple */3,
-                      _0: Stdlib__List.map((function (param) {
-                              return omega;
-                            }), args._0)
-                    }, q.pat_type, q.pat_env);
+                TAG: /* Tpat_tuple */3,
+                _0: Stdlib__List.map((function (param) {
+                        return omega;
+                      }), args._0)
+              }, q.pat_type, q.pat_env);
       case /* Tpat_construct */4 :
           return make_pat({
-                      TAG: /* Tpat_construct */4,
-                      _0: args._0,
-                      _1: args._1,
-                      _2: Stdlib__List.map((function (param) {
-                              return omega;
-                            }), args._2)
-                    }, q.pat_type, q.pat_env);
+                TAG: /* Tpat_construct */4,
+                _0: args._0,
+                _1: args._1,
+                _2: Stdlib__List.map((function (param) {
+                        return omega;
+                      }), args._2)
+              }, q.pat_type, q.pat_env);
       case /* Tpat_variant */5 :
           return make_pat({
-                      TAG: /* Tpat_variant */5,
-                      _0: args._0,
-                      _1: may_map((function (param) {
-                              return omega;
-                            }), args._1),
-                      _2: args._2
-                    }, q.pat_type, q.pat_env);
+                TAG: /* Tpat_variant */5,
+                _0: args._0,
+                _1: may_map((function (param) {
+                        return omega;
+                      }), args._1),
+                _2: args._2
+              }, q.pat_type, q.pat_env);
       case /* Tpat_record */6 :
           return make_pat({
-                      TAG: /* Tpat_record */6,
-                      _0: Stdlib__List.map((function (param) {
-                              return [
-                                      param[0],
-                                      param[1],
-                                      omega
-                                    ];
-                            }), args._0),
-                      _1: args._1
-                    }, q.pat_type, q.pat_env);
+                TAG: /* Tpat_record */6,
+                _0: Stdlib__List.map((function (param) {
+                        return [
+                          param[0],
+                          param[1],
+                          omega
+                        ];
+                      }), args._0),
+                _1: args._1
+              }, q.pat_type, q.pat_env);
       case /* Tpat_array */7 :
           return make_pat({
-                      TAG: /* Tpat_array */7,
-                      _0: Stdlib__List.map((function (param) {
-                              return omega;
-                            }), args._0)
-                    }, q.pat_type, q.pat_env);
+                TAG: /* Tpat_array */7,
+                _0: Stdlib__List.map((function (param) {
+                        return omega;
+                      }), args._0)
+              }, q.pat_type, q.pat_env);
       case /* Tpat_or */8 :
           return fatal_error("Parmatch.normalize_pat");
       case /* Tpat_lazy */9 :
           return make_pat({
-                      TAG: /* Tpat_lazy */9,
-                      _0: omega
-                    }, q.pat_type, q.pat_env);
+                TAG: /* Tpat_lazy */9,
+                _0: omega
+              }, q.pat_type, q.pat_env);
       
     }
   };
@@ -56387,13 +56387,13 @@ function discr_pat(q, pss) {
                       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
                       if (exn.MEL_EXN_ID === Stdlib.Not_found) {
                         return {
-                                hd: [
-                                  param[0],
-                                  lbl,
-                                  omega
-                                ],
-                                tl: r
-                              };
+                          hd: [
+                            param[0],
+                            lbl,
+                            omega
+                          ],
+                          tl: r
+                        };
                       }
                       throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
                     }
@@ -56436,57 +56436,57 @@ function discr_pat(q, pss) {
 function read_args(xs, r) {
   if (!xs) {
     return [
-            /* [] */0,
-            r
-          ];
+      /* [] */0,
+      r
+    ];
   }
   if (!r) {
     return fatal_error("Parmatch.read_args");
   }
   const match = read_args(xs.tl, r.tl);
   return [
-          {
-            hd: r.hd,
-            tl: match[0]
-          },
-          match[1]
-        ];
+    {
+      hd: r.hd,
+      tl: match[0]
+    },
+    match[1]
+  ];
 }
 
 function do_set_args(erase_mutable, q, r) {
   const omegas = q.pat_desc;
   if (/* tag */typeof omegas === "number" || typeof omegas === "string") {
     return {
-            hd: q,
-            tl: r
-          };
+      hd: q,
+      tl: r
+    };
   }
   switch (omegas.TAG) {
     case /* Tpat_constant */2 :
         return {
-                hd: q,
-                tl: r
-              };
+          hd: q,
+          tl: r
+        };
     case /* Tpat_tuple */3 :
         const match = read_args(omegas._0, r);
         return {
-                hd: make_pat({
-                      TAG: /* Tpat_tuple */3,
-                      _0: match[0]
-                    }, q.pat_type, q.pat_env),
-                tl: match[1]
-              };
+          hd: make_pat({
+                TAG: /* Tpat_tuple */3,
+                _0: match[0]
+              }, q.pat_type, q.pat_env),
+          tl: match[1]
+        };
     case /* Tpat_construct */4 :
         const match$1 = read_args(omegas._2, r);
         return {
-                hd: make_pat({
-                      TAG: /* Tpat_construct */4,
-                      _0: omegas._0,
-                      _1: omegas._1,
-                      _2: match$1[0]
-                    }, q.pat_type, q.pat_env),
-                tl: match$1[1]
-              };
+          hd: make_pat({
+                TAG: /* Tpat_construct */4,
+                _0: omegas._0,
+                _1: omegas._1,
+                _2: match$1[0]
+              }, q.pat_type, q.pat_env),
+          tl: match$1[1]
+        };
     case /* Tpat_variant */5 :
         let match$2;
         if (omegas._1 !== undefined) {
@@ -56497,13 +56497,13 @@ function do_set_args(erase_mutable, q, r) {
             ];
           } else {
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "jscomp/test/ocaml_typedtree_test.ml",
-                        39485,
-                        13
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "jscomp/test/ocaml_typedtree_test.ml",
+                    39485,
+                    13
+                  ]
+                });
           }
         } else {
           match$2 = [
@@ -56512,66 +56512,66 @@ function do_set_args(erase_mutable, q, r) {
           ];
         }
         return {
-                hd: make_pat({
-                      TAG: /* Tpat_variant */5,
-                      _0: omegas._0,
-                      _1: match$2[0],
-                      _2: omegas._2
-                    }, q.pat_type, q.pat_env),
-                tl: match$2[1]
-              };
+          hd: make_pat({
+                TAG: /* Tpat_variant */5,
+                _0: omegas._0,
+                _1: match$2[0],
+                _2: omegas._2
+              }, q.pat_type, q.pat_env),
+          tl: match$2[1]
+        };
     case /* Tpat_record */6 :
         const omegas$1 = omegas._0;
         const match$3 = read_args(omegas$1, r);
         return {
-                hd: make_pat({
-                      TAG: /* Tpat_record */6,
-                      _0: Stdlib__List.map2((function (param, arg) {
-                              const lbl = param[1];
-                              const lid = param[0];
-                              let tmp = false;
-                              if (erase_mutable) {
-                                const match = lbl.lbl_mut;
-                                let tmp$1;
-                                tmp$1 = match === /* Immutable */0 ? false : true;
-                                tmp = tmp$1;
-                              }
-                              if (tmp) {
-                                return [
-                                        lid,
-                                        lbl,
-                                        omega
-                                      ];
-                              } else {
-                                return [
-                                        lid,
-                                        lbl,
-                                        arg
-                                      ];
-                              }
-                            }), omegas$1, match$3[0]),
-                      _1: omegas._1
-                    }, q.pat_type, q.pat_env),
-                tl: match$3[1]
-              };
+          hd: make_pat({
+                TAG: /* Tpat_record */6,
+                _0: Stdlib__List.map2((function (param, arg) {
+                        const lbl = param[1];
+                        const lid = param[0];
+                        let tmp = false;
+                        if (erase_mutable) {
+                          const match = lbl.lbl_mut;
+                          let tmp$1;
+                          tmp$1 = match === /* Immutable */0 ? false : true;
+                          tmp = tmp$1;
+                        }
+                        if (tmp) {
+                          return [
+                            lid,
+                            lbl,
+                            omega
+                          ];
+                        } else {
+                          return [
+                            lid,
+                            lbl,
+                            arg
+                          ];
+                        }
+                      }), omegas$1, match$3[0]),
+                _1: omegas._1
+              }, q.pat_type, q.pat_env),
+          tl: match$3[1]
+        };
     case /* Tpat_array */7 :
         const match$4 = read_args(omegas._0, r);
         return {
-                hd: make_pat({
-                      TAG: /* Tpat_array */7,
-                      _0: match$4[0]
-                    }, q.pat_type, q.pat_env),
-                tl: match$4[1]
-              };
+          hd: make_pat({
+                TAG: /* Tpat_array */7,
+                _0: match$4[0]
+              }, q.pat_type, q.pat_env),
+          tl: match$4[1]
+        };
     case /* Tpat_lazy */9 :
         if (r) {
           return {
-                  hd: make_pat({
-                        TAG: /* Tpat_lazy */9,
-                        _0: r.hd
-                      }, q.pat_type, q.pat_env),
-                  tl: r.tl
-                };
+            hd: make_pat({
+                  TAG: /* Tpat_lazy */9,
+                  _0: r.hd
+                }, q.pat_type, q.pat_env),
+            tl: r.tl
+          };
         } else {
           return fatal_error("Parmatch.do_set_args (lazy)");
         }
@@ -56627,9 +56627,9 @@ function filter_one(q, pss) {
       const pss = param.tl;
       if (simple_match(q, p)) {
         return {
-                hd: Stdlib.$at(simple_match_args(q, p), match.tl),
-                tl: filter_rec(pss)
-              };
+          hd: Stdlib.$at(simple_match_args(q, p), match.tl),
+          tl: filter_rec(pss)
+        };
       }
       _param = pss;
       continue ;
@@ -56650,16 +56650,16 @@ function filter_extra(pss) {
         const match$1 = match.hd.pat_desc;
         if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
           return {
-                  hd: match.tl,
-                  tl: filter_rec(param.tl)
-                };
+            hd: match.tl,
+            tl: filter_rec(param.tl)
+          };
         }
         switch (match$1.TAG) {
           case /* Tpat_var */0 :
               return {
-                      hd: match.tl,
-                      tl: filter_rec(param.tl)
-                    };
+                hd: match.tl,
+                tl: filter_rec(param.tl)
+              };
           case /* Tpat_alias */1 :
               _param = {
                 hd: {
@@ -56706,33 +56706,33 @@ function filter_all(pat0, pss) {
       const q0 = c[0];
       if (simple_match(q0, q)) {
         return {
-                hd: [
-                  q0,
-                  {
-                    hd: Stdlib.$at(simple_match_args(q0, q), qs),
-                    tl: c[1]
-                  }
-                ],
-                tl: env$1
-              };
+          hd: [
+            q0,
+            {
+              hd: Stdlib.$at(simple_match_args(q0, q), qs),
+              tl: c[1]
+            }
+          ],
+          tl: env$1
+        };
       } else {
         return {
-                hd: c,
-                tl: insert(q, qs, env$1)
-              };
+          hd: c,
+          tl: insert(q, qs, env$1)
+        };
       }
     }
     const q0$1 = normalize_pat(q);
     return {
-            hd: [
-              q0$1,
-              {
-                hd: Stdlib.$at(simple_match_args(q0$1, q), qs),
-                tl: /* [] */0
-              }
-            ],
-            tl: /* [] */0
-          };
+      hd: [
+        q0$1,
+        {
+          hd: Stdlib.$at(simple_match_args(q0$1, q), qs),
+          tl: /* [] */0
+        }
+      ],
+      tl: /* [] */0
+    };
   };
   const filter_rec = function (_env, _param) {
     while(true) {
@@ -56862,12 +56862,12 @@ function filter_all(pat0, pss) {
       _env = Stdlib__List.map((function (param) {
               const q = param[0];
               return [
-                      q,
-                      {
-                        hd: Stdlib.$at(simple_match_args(q, omega), ps$1),
-                        tl: param[1]
-                      }
-                    ];
+                q,
+                {
+                  hd: Stdlib.$at(simple_match_args(q, omega), ps$1),
+                  tl: param[1]
+                }
+              ];
             }), env);
       continue ;
     }
@@ -56880,14 +56880,14 @@ function set_last(a, param) {
   if (param) {
     if (param.tl) {
       return {
-              hd: param.hd,
-              tl: set_last(a, param.tl)
-            };
+        hd: param.hd,
+        tl: set_last(a, param.tl)
+      };
     } else {
       return {
-              hd: a,
-              tl: /* [] */0
-            };
+        hd: a,
+        tl: /* [] */0
+      };
     }
   } else {
     return /* [] */0;
@@ -56905,16 +56905,16 @@ function mark_partial(_param) {
       const match = ps.hd.pat_desc;
       if (/* tag */typeof match === "number" || typeof match === "string") {
         return {
-                hd: ps,
-                tl: mark_partial(param.tl)
-              };
+          hd: ps,
+          tl: mark_partial(param.tl)
+        };
       }
       switch (match.TAG) {
         case /* Tpat_var */0 :
             return {
-                    hd: ps,
-                    tl: mark_partial(param.tl)
-                  };
+              hd: ps,
+              tl: mark_partial(param.tl)
+            };
         case /* Tpat_alias */1 :
             _param = {
               hd: {
@@ -56945,9 +56945,9 @@ function mark_partial(_param) {
       }
     }
     return {
-            hd: set_last(zero, ps),
-            tl: mark_partial(param.tl)
-          };
+      hd: set_last(zero, ps),
+      tl: mark_partial(param.tl)
+    };
   };
 }
 
@@ -56964,19 +56964,19 @@ function close_variant(env, row) {
         }), row$1.row_name, row$1.row_fields);
   if (!row$1.row_closed || nm !== row$1.row_name) {
     return unify$2(env, row$1.row_more, newty2(100000000, {
-                    TAG: /* Tvariant */8,
-                    _0: {
-                      row_fields: /* [] */0,
-                      row_more: newty2(100000000, {
-                            TAG: /* Tvar */0,
-                            _0: undefined
-                          }),
-                      row_bound: row$1.row_bound,
-                      row_closed: true,
-                      row_fixed: row$1.row_fixed,
-                      row_name: nm
-                    }
-                  }));
+              TAG: /* Tvariant */8,
+              _0: {
+                row_fields: /* [] */0,
+                row_more: newty2(100000000, {
+                      TAG: /* Tvar */0,
+                      _0: undefined
+                    }),
+                row_bound: row$1.row_bound,
+                row_closed: true,
+                row_fixed: row$1.row_fixed,
+                row_name: nm
+              }
+            }));
   }
   
 }
@@ -56986,50 +56986,50 @@ function row_of_pat(pat) {
   const row = match.desc;
   if (/* tag */typeof row === "number" || typeof row === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                39637,
-                9
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            39637,
+            9
+          ]
+        });
   }
   if (row.TAG === /* Tvariant */8) {
     return row_repr_aux(/* [] */0, row._0);
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              39637,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          39637,
+          9
+        ]
+      });
 }
 
 function generalized_constructor(x) {
   const match = x[0].pat_desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                39648,
-                9
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            39648,
+            9
+          ]
+        });
   }
   if (match.TAG === /* Tpat_construct */4) {
     return match._1.cstr_generalized;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              39648,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          39648,
+          9
+        ]
+      });
 }
 
 function clean_env(env) {
@@ -57043,9 +57043,9 @@ function clean_env(env) {
       const x = param.hd;
       if (!generalized_constructor(x)) {
         return {
-                hd: x,
-                tl: loop(xs)
-              };
+          hd: x,
+          tl: loop(xs)
+        };
       }
       _param = xs;
       continue ;
@@ -57085,45 +57085,45 @@ function full_match(ignore_generalized, closing, env) {
                 const match = param[0].pat_desc;
                 if (/* tag */typeof match === "number" || typeof match === "string") {
                   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                            MEL_EXN_ID: "Assert_failure",
-                            _1: [
-                              "jscomp/test/ocaml_typedtree_test.ml",
-                              39675,
-                              17
-                            ]
-                          });
+                        MEL_EXN_ID: "Assert_failure",
+                        _1: [
+                          "jscomp/test/ocaml_typedtree_test.ml",
+                          39675,
+                          17
+                        ]
+                      });
                 }
                 if (match.TAG === /* Tpat_variant */5) {
                   return match._0;
                 }
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            39675,
-                            17
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        39675,
+                        17
+                      ]
+                    });
               }), env);
         const row = row_of_pat(p);
         if (closing && !row_fixed(row)) {
           return Stdlib__List.for_all((function (param) {
-                        const tag = param[0];
-                        const match = row_field_repr_aux(/* [] */0, param[1]);
-                        if (/* tag */typeof match === "number" || typeof match === "string" || !(match.TAG === /* Rpresent */0 || match._2)) {
-                          return true;
-                        } else {
-                          return Stdlib__List.mem(tag, fields);
-                        }
-                      }), row.row_fields);
+                  const tag = param[0];
+                  const match = row_field_repr_aux(/* [] */0, param[1]);
+                  if (/* tag */typeof match === "number" || typeof match === "string" || !(match.TAG === /* Rpresent */0 || match._2)) {
+                    return true;
+                  } else {
+                    return Stdlib__List.mem(tag, fields);
+                  }
+                }), row.row_fields);
         } else if (row.row_closed) {
           return Stdlib__List.for_all((function (param) {
-                        if (Caml_obj.caml_equal(row_field_repr_aux(/* [] */0, param[1]), /* Rabsent */0)) {
-                          return true;
-                        } else {
-                          return Stdlib__List.mem(param[0], fields);
-                        }
-                      }), row.row_fields);
+                  if (Caml_obj.caml_equal(row_field_repr_aux(/* [] */0, param[1]), /* Rabsent */0)) {
+                    return true;
+                  } else {
+                    return Stdlib__List.mem(param[0], fields);
+                  }
+                }), row.row_fields);
         } else {
           return false;
         }
@@ -57191,13 +57191,13 @@ function complete_tags(nconsts, nconstrs, tags) {
                 return Caml_array.set(seen_constr, i._0, true);
             case /* Cstr_extension */2 :
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            39738,
-                            14
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        39738,
+                        14
+                      ]
+                    });
             
           }
         }), tags);
@@ -57231,24 +57231,24 @@ function complete_tags(nconsts, nconstrs, tags) {
 
 function pat_of_constr(ex_pat, cstr) {
   return {
-          pat_desc: {
-            TAG: /* Tpat_construct */4,
-            _0: {
-              txt: {
-                TAG: /* Lident */0,
-                _0: "?pat_of_constr?"
-              },
-              loc: none
-            },
-            _1: cstr,
-            _2: omegas(cstr.cstr_arity)
-          },
-          pat_loc: ex_pat.pat_loc,
-          pat_extra: ex_pat.pat_extra,
-          pat_type: ex_pat.pat_type,
-          pat_env: ex_pat.pat_env,
-          pat_attributes: ex_pat.pat_attributes
-        };
+    pat_desc: {
+      TAG: /* Tpat_construct */4,
+      _0: {
+        txt: {
+          TAG: /* Lident */0,
+          _0: "?pat_of_constr?"
+        },
+        loc: none
+      },
+      _1: cstr,
+      _2: omegas(cstr.cstr_arity)
+    },
+    pat_loc: ex_pat.pat_loc,
+    pat_extra: ex_pat.pat_extra,
+    pat_type: ex_pat.pat_type,
+    pat_env: ex_pat.pat_env,
+    pat_attributes: ex_pat.pat_attributes
+  };
 }
 
 function pat_of_constrs(ex_pat, param) {
@@ -57256,25 +57256,25 @@ function pat_of_constrs(ex_pat, param) {
     const cstr = param.hd;
     if (param.tl) {
       return {
-              pat_desc: {
-                TAG: /* Tpat_or */8,
-                _0: pat_of_constr(ex_pat, cstr),
-                _1: pat_of_constrs(ex_pat, param.tl),
-                _2: undefined
-              },
-              pat_loc: ex_pat.pat_loc,
-              pat_extra: ex_pat.pat_extra,
-              pat_type: ex_pat.pat_type,
-              pat_env: ex_pat.pat_env,
-              pat_attributes: ex_pat.pat_attributes
-            };
+        pat_desc: {
+          TAG: /* Tpat_or */8,
+          _0: pat_of_constr(ex_pat, cstr),
+          _1: pat_of_constrs(ex_pat, param.tl),
+          _2: undefined
+        },
+        pat_loc: ex_pat.pat_loc,
+        pat_extra: ex_pat.pat_extra,
+        pat_type: ex_pat.pat_type,
+        pat_env: ex_pat.pat_env,
+        pat_attributes: ex_pat.pat_attributes
+      };
     } else {
       return pat_of_constr(ex_pat, cstr);
     }
   }
   throw new Caml_js_exceptions.MelangeError(Empty, {
-            MEL_EXN_ID: Empty
-          });
+        MEL_EXN_ID: Empty
+      });
 }
 
 function get_variant_constructors(env, _ty) {
@@ -57311,9 +57311,9 @@ function map_filter(f, _param) {
     const y = Curry._1(f, param.hd);
     if (y !== undefined) {
       return {
-              hd: Caml_option.valFromOption(y),
-              tl: map_filter(f, xs)
-            };
+        hd: Caml_option.valFromOption(y),
+        tl: map_filter(f, xs)
+      };
     }
     _param = xs;
     continue ;
@@ -57332,13 +57332,13 @@ function complete_constrs(p, all_tags) {
   const not_tags = complete_tags(c.cstr_consts, c.cstr_nonconsts, all_tags);
   const constrs = get_variant_constructors(p.pat_env, c.cstr_res);
   return map_filter((function (cnstr) {
-                if (Stdlib__List.exists((function (tag) {
-                          return equal_tag(tag, cnstr.cstr_tag);
-                        }), not_tags)) {
-                  return cnstr;
-                }
-                
-              }), constrs);
+          if (Stdlib__List.exists((function (tag) {
+                    return equal_tag(tag, cnstr.cstr_tag);
+                  }), not_tags)) {
+            return cnstr;
+          }
+          
+        }), constrs);
 }
 
 function build_other_constant(proj, make, first, next, p, env) {
@@ -57370,32 +57370,32 @@ function build_other(ext, env) {
         switch (args._0.TAG) {
           case /* Const_int */0 :
               return build_other_constant((function (param) {
-                            if (!/* tag */(typeof param === "number" || typeof param === "string") && param.TAG === /* Tpat_constant */2) {
-                              const i = param._0;
-                              if (i.TAG === /* Const_int */0) {
-                                return i._0;
-                              }
-                              
-                            }
-                            throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                      MEL_EXN_ID: "Assert_failure",
-                                      _1: [
-                                        "jscomp/test/ocaml_typedtree_test.ml",
-                                        39892,
-                                        55
-                                      ]
-                                    });
-                          }), (function (i) {
-                            return {
-                                    TAG: /* Tpat_constant */2,
-                                    _0: {
-                                      TAG: /* Const_int */0,
-                                      _0: i
-                                    }
-                                  };
-                          }), 0, (function (prim) {
-                            return prim + 1 | 0;
-                          }), p, env);
+                      if (!/* tag */(typeof param === "number" || typeof param === "string") && param.TAG === /* Tpat_constant */2) {
+                        const i = param._0;
+                        if (i.TAG === /* Const_int */0) {
+                          return i._0;
+                        }
+                        
+                      }
+                      throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "jscomp/test/ocaml_typedtree_test.ml",
+                              39892,
+                              55
+                            ]
+                          });
+                    }), (function (i) {
+                      return {
+                        TAG: /* Tpat_constant */2,
+                        _0: {
+                          TAG: /* Const_int */0,
+                          _0: i
+                        }
+                      };
+                    }), 0, (function (prim) {
+                      return prim + 1 | 0;
+                    }), p, env);
           case /* Const_char */1 :
               const all_chars = Stdlib__List.map((function (param) {
                       const match = param[0].pat_desc;
@@ -57407,13 +57407,13 @@ function build_other(ext, env) {
                         
                       }
                       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                MEL_EXN_ID: "Assert_failure",
-                                _1: [
-                                  "jscomp/test/ocaml_typedtree_test.ml",
-                                  39867,
-                                  15
-                                ]
-                              });
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "jscomp/test/ocaml_typedtree_test.ml",
+                              39867,
+                              15
+                            ]
+                          });
                     }), env);
               let _param = {
                 hd: [
@@ -57459,18 +57459,18 @@ function build_other(ext, env) {
                     const i = _i;
                     if (i > imax) {
                       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                MEL_EXN_ID: Stdlib.Not_found
-                              });
+                            MEL_EXN_ID: Stdlib.Not_found
+                          });
                     }
                     const ci = Stdlib__Char.chr(i);
                     if (!Stdlib__List.mem(ci, all_chars)) {
                       return make_pat({
-                                  TAG: /* Tpat_constant */2,
-                                  _0: {
-                                    TAG: /* Const_char */1,
-                                    _0: ci
-                                  }
-                                }, p.pat_type, p.pat_env);
+                            TAG: /* Tpat_constant */2,
+                            _0: {
+                              TAG: /* Const_char */1,
+                              _0: ci
+                            }
+                          }, p.pat_type, p.pat_env);
                     }
                     _i = i + 1 | 0;
                     continue ;
@@ -57487,122 +57487,122 @@ function build_other(ext, env) {
               };
           case /* Const_string */2 :
               return build_other_constant((function (param) {
-                            if (!/* tag */(typeof param === "number" || typeof param === "string") && param.TAG === /* Tpat_constant */2) {
-                              const match = param._0;
-                              if (match.TAG === /* Const_string */2) {
-                                return match._0.length;
-                              }
-                              
-                            }
-                            throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                      MEL_EXN_ID: "Assert_failure",
-                                      _1: [
-                                        "jscomp/test/ocaml_typedtree_test.ml",
-                                        39913,
-                                        21
-                                      ]
-                                    });
-                          }), (function (i) {
-                            return {
-                                    TAG: /* Tpat_constant */2,
-                                    _0: {
-                                      TAG: /* Const_string */2,
-                                      _0: Caml_bytes.bytes_to_string(Stdlib__Bytes.make(i, /* '*' */42)),
-                                      _1: undefined
-                                    }
-                                  };
-                          }), 0, (function (prim) {
-                            return prim + 1 | 0;
-                          }), p, env);
+                      if (!/* tag */(typeof param === "number" || typeof param === "string") && param.TAG === /* Tpat_constant */2) {
+                        const match = param._0;
+                        if (match.TAG === /* Const_string */2) {
+                          return match._0.length;
+                        }
+                        
+                      }
+                      throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "jscomp/test/ocaml_typedtree_test.ml",
+                              39913,
+                              21
+                            ]
+                          });
+                    }), (function (i) {
+                      return {
+                        TAG: /* Tpat_constant */2,
+                        _0: {
+                          TAG: /* Const_string */2,
+                          _0: Caml_bytes.bytes_to_string(Stdlib__Bytes.make(i, /* '*' */42)),
+                          _1: undefined
+                        }
+                      };
+                    }), 0, (function (prim) {
+                      return prim + 1 | 0;
+                    }), p, env);
           case /* Const_float */3 :
               return build_other_constant((function (param) {
-                            if (!/* tag */(typeof param === "number" || typeof param === "string") && param.TAG === /* Tpat_constant */2) {
-                              const f = param._0;
-                              if (f.TAG === /* Const_float */3) {
-                                return Caml_format.caml_float_of_string(f._0);
-                              }
-                              
-                            }
-                            throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                      MEL_EXN_ID: "Assert_failure",
-                                      _1: [
-                                        "jscomp/test/ocaml_typedtree_test.ml",
-                                        39919,
-                                        21
-                                      ]
-                                    });
-                          }), (function (f) {
-                            return {
-                                    TAG: /* Tpat_constant */2,
-                                    _0: {
-                                      TAG: /* Const_float */3,
-                                      _0: Stdlib.string_of_float(f)
-                                    }
-                                  };
-                          }), 0.0, (function (f) {
-                            return f + 1.0;
-                          }), p, env);
+                      if (!/* tag */(typeof param === "number" || typeof param === "string") && param.TAG === /* Tpat_constant */2) {
+                        const f = param._0;
+                        if (f.TAG === /* Const_float */3) {
+                          return Caml_format.caml_float_of_string(f._0);
+                        }
+                        
+                      }
+                      throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "jscomp/test/ocaml_typedtree_test.ml",
+                              39919,
+                              21
+                            ]
+                          });
+                    }), (function (f) {
+                      return {
+                        TAG: /* Tpat_constant */2,
+                        _0: {
+                          TAG: /* Const_float */3,
+                          _0: Stdlib.string_of_float(f)
+                        }
+                      };
+                    }), 0.0, (function (f) {
+                      return f + 1.0;
+                    }), p, env);
           case /* Const_int32 */4 :
               return build_other_constant((function (param) {
-                            if (!/* tag */(typeof param === "number" || typeof param === "string") && param.TAG === /* Tpat_constant */2) {
-                              const i = param._0;
-                              if (i.TAG === /* Const_int32 */4) {
-                                return i._0;
-                              }
-                              
-                            }
-                            throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                      MEL_EXN_ID: "Assert_failure",
-                                      _1: [
-                                        "jscomp/test/ocaml_typedtree_test.ml",
-                                        39897,
-                                        57
-                                      ]
-                                    });
-                          }), (function (i) {
-                            return {
-                                    TAG: /* Tpat_constant */2,
-                                    _0: {
-                                      TAG: /* Const_int32 */4,
-                                      _0: i
-                                    }
-                                  };
-                          }), 0, Stdlib__Int32.succ, p, env);
+                      if (!/* tag */(typeof param === "number" || typeof param === "string") && param.TAG === /* Tpat_constant */2) {
+                        const i = param._0;
+                        if (i.TAG === /* Const_int32 */4) {
+                          return i._0;
+                        }
+                        
+                      }
+                      throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "jscomp/test/ocaml_typedtree_test.ml",
+                              39897,
+                              57
+                            ]
+                          });
+                    }), (function (i) {
+                      return {
+                        TAG: /* Tpat_constant */2,
+                        _0: {
+                          TAG: /* Const_int32 */4,
+                          _0: i
+                        }
+                      };
+                    }), 0, Stdlib__Int32.succ, p, env);
           case /* Const_int64 */5 :
               return build_other_constant((function (param) {
-                            if (!/* tag */(typeof param === "number" || typeof param === "string") && param.TAG === /* Tpat_constant */2) {
-                              const i = param._0;
-                              if (i.TAG === /* Const_int64 */5) {
-                                return i._0;
-                              }
-                              
-                            }
-                            throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                      MEL_EXN_ID: "Assert_failure",
-                                      _1: [
-                                        "jscomp/test/ocaml_typedtree_test.ml",
-                                        39902,
-                                        57
-                                      ]
-                                    });
-                          }), (function (i) {
-                            return {
-                                    TAG: /* Tpat_constant */2,
-                                    _0: {
-                                      TAG: /* Const_int64 */5,
-                                      _0: i
-                                    }
-                                  };
-                          }), Caml_int64.zero, Stdlib__Int64.succ, p, env);
+                      if (!/* tag */(typeof param === "number" || typeof param === "string") && param.TAG === /* Tpat_constant */2) {
+                        const i = param._0;
+                        if (i.TAG === /* Const_int64 */5) {
+                          return i._0;
+                        }
+                        
+                      }
+                      throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "jscomp/test/ocaml_typedtree_test.ml",
+                              39902,
+                              57
+                            ]
+                          });
+                    }), (function (i) {
+                      return {
+                        TAG: /* Tpat_constant */2,
+                        _0: {
+                          TAG: /* Const_int64 */5,
+                          _0: i
+                        }
+                      };
+                    }), Caml_int64.zero, Stdlib__Int64.succ, p, env);
           case /* Const_nativeint */6 :
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          39909,
-                          33
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/ocaml_typedtree_test.ml",
+                      39909,
+                      33
+                    ]
+                  });
           
         }
     case /* Tpat_construct */4 :
@@ -57642,11 +57642,11 @@ function build_other(ext, env) {
                 cstr_attributes: c_cstr_attributes
               };
               return make_pat({
-                          TAG: /* Tpat_construct */4,
-                          _0: args._0,
-                          _1: c$1,
-                          _2: /* [] */0
-                        }, none$2, empty);
+                    TAG: /* Tpat_construct */4,
+                    _0: args._0,
+                    _1: c$1,
+                    _2: /* [] */0
+                  }, none$2, empty);
           
         }
         if (exit === 1) {
@@ -57680,35 +57680,35 @@ function build_other(ext, env) {
                 const match = param[0].pat_desc;
                 if (/* tag */typeof match === "number" || typeof match === "string") {
                   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                            MEL_EXN_ID: "Assert_failure",
-                            _1: [
-                              "jscomp/test/ocaml_typedtree_test.ml",
-                              39836,
-                              23
-                            ]
-                          });
+                        MEL_EXN_ID: "Assert_failure",
+                        _1: [
+                          "jscomp/test/ocaml_typedtree_test.ml",
+                          39836,
+                          23
+                        ]
+                      });
                 }
                 if (match.TAG === /* Tpat_variant */5) {
                   return match._0;
                 }
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            39836,
-                            23
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        39836,
+                        23
+                      ]
+                    });
               }), env);
         const row = row_of_pat(p);
         const make_other_pat = function (tag, $$const) {
           const arg = $$const ? undefined : omega;
           return make_pat({
-                      TAG: /* Tpat_variant */5,
-                      _0: tag,
-                      _1: arg,
-                      _2: r
-                    }, p.pat_type, p.pat_env);
+                TAG: /* Tpat_variant */5,
+                _0: tag,
+                _1: arg,
+                _2: r
+              }, p.pat_type, p.pat_env);
         };
         const match$1 = Stdlib__List.fold_left((function (others, param) {
                 const tag = param[0];
@@ -57720,25 +57720,25 @@ function build_other(ext, env) {
                   return others;
                 } else if (arg.TAG === /* Rpresent */0) {
                   return {
-                          hd: make_other_pat(tag, arg._0 === undefined),
-                          tl: others
-                        };
+                    hd: make_other_pat(tag, arg._0 === undefined),
+                    tl: others
+                  };
                 } else {
                   return {
-                          hd: make_other_pat(tag, arg._0),
-                          tl: others
-                        };
+                    hd: make_other_pat(tag, arg._0),
+                    tl: others
+                  };
                 }
               }), /* [] */0, row.row_fields);
         if (match$1) {
           return Stdlib__List.fold_left((function (p_res, pat) {
-                        return make_pat({
-                                    TAG: /* Tpat_or */8,
-                                    _0: pat,
-                                    _1: p_res,
-                                    _2: undefined
-                                  }, p.pat_type, p.pat_env);
-                      }), match$1.hd, match$1.tl);
+                  return make_pat({
+                        TAG: /* Tpat_or */8,
+                        _0: pat,
+                        _1: p_res,
+                        _2: undefined
+                      }, p.pat_type, p.pat_env);
+                }), match$1.hd, match$1.tl);
         } else {
           return make_other_pat("AnyExtraTag", true);
         }
@@ -57747,34 +57747,34 @@ function build_other(ext, env) {
                 const args = param[0].pat_desc;
                 if (/* tag */typeof args === "number" || typeof args === "string") {
                   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                            MEL_EXN_ID: "Assert_failure",
-                            _1: [
-                              "jscomp/test/ocaml_typedtree_test.ml",
-                              39928,
-                              15
-                            ]
-                          });
+                        MEL_EXN_ID: "Assert_failure",
+                        _1: [
+                          "jscomp/test/ocaml_typedtree_test.ml",
+                          39928,
+                          15
+                        ]
+                      });
                 }
                 if (args.TAG === /* Tpat_array */7) {
                   return Stdlib__List.length(args._0);
                 }
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            39928,
-                            15
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        39928,
+                        15
+                      ]
+                    });
               }), env);
         let _l = 0;
         while(true) {
           const l = _l;
           if (!Stdlib__List.mem(l, all_lengths)) {
             return make_pat({
-                        TAG: /* Tpat_array */7,
-                        _0: omegas(l)
-                      }, p.pat_type, p.pat_env);
+                  TAG: /* Tpat_array */7,
+                  _0: omegas(l)
+                }, p.pat_type, p.pat_env);
           }
           _l = l + 1 | 0;
           continue ;
@@ -57800,19 +57800,19 @@ function build_other_gadt(ext, env) {
             }), env);
       const cnstrs = complete_constrs(p, all_tags);
       return Stdlib__List.map((function (param) {
-                    return pat_of_constr(p, param);
-                  }), cnstrs);
+              return pat_of_constr(p, param);
+            }), cnstrs);
     }
     
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              39952,
-              11
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          39952,
+          11
+        ]
+      });
 }
 
 function has_instance(_p) {
@@ -57837,8 +57837,8 @@ function has_instance(_p) {
           continue ;
       case /* Tpat_record */6 :
           return has_instances(Stdlib__List.map((function (param) {
-                            return param[2];
-                          }), p$1._0));
+                      return param[2];
+                    }), p$1._0));
       case /* Tpat_tuple */3 :
       case /* Tpat_array */7 :
           return has_instances(p$1._0);
@@ -57927,13 +57927,13 @@ function satisfiable(_pss, _qs) {
       if (constrs) {
         if (full_match(false, false, constrs)) {
           return Stdlib__List.exists((function (param) {
-                        const p = param[0];
-                        if (is_absent_pat(p)) {
-                          return false;
-                        } else {
-                          return satisfiable(param[1], Stdlib.$at(simple_match_args(p, omega), qs$2));
-                        }
-                      }), constrs);
+                  const p = param[0];
+                  if (is_absent_pat(p)) {
+                    return false;
+                  } else {
+                    return satisfiable(param[1], Stdlib.$at(simple_match_args(p, omega), qs$2));
+                  }
+                }), constrs);
         }
         _qs = qs$2;
         _pss = filter_extra(pss);
@@ -57956,23 +57956,23 @@ function orify_many(param) {
     if (param.tl) {
       let y = Curry._1(orify_many, param.tl);
       return make_pat({
-                  TAG: /* Tpat_or */8,
-                  _0: x,
-                  _1: y,
-                  _2: undefined
-                }, x.pat_type, x.pat_env);
+            TAG: /* Tpat_or */8,
+            _0: x,
+            _1: y,
+            _2: undefined
+          }, x.pat_type, x.pat_env);
     } else {
       return x;
     }
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              40024,
-              12
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          40024,
+          12
+        ]
+      });
 }
 
 function try_many_gadt(f, param) {
@@ -57991,18 +57991,18 @@ function try_many_gadt(f, param) {
     return r1;
   } else {
     return {
-            TAG: /* Rsome */0,
-            _0: Stdlib.$at(r1._0, r2._0)
-          };
+      TAG: /* Rsome */0,
+      _0: Stdlib.$at(r1._0, r2._0)
+    };
   }
 }
 
 function exhaust(ext, pss, n) {
   if (!pss) {
     return {
-            TAG: /* Rsome */0,
-            _0: omegas(n)
-          };
+      TAG: /* Rsome */0,
+      _0: omegas(n)
+    };
   }
   if (!pss.hd) {
     return /* Rnone */0;
@@ -58020,9 +58020,9 @@ function exhaust(ext, pss, n) {
         return r;
       } else {
         return {
-                TAG: /* Rsome */0,
-                _0: do_set_args(false, p, r._0)
-              };
+          TAG: /* Rsome */0,
+          _0: do_set_args(false, p, r._0)
+        };
       }
     };
     if (full_match(true, false, constrs) && !should_extend(ext, constrs)) {
@@ -58050,12 +58050,12 @@ function exhaust(ext, pss, n) {
     }
     try {
       return {
-              TAG: /* Rsome */0,
-              _0: {
-                hd: build_other(ext, constrs),
-                tl: r$1._0
-              }
-            };
+        TAG: /* Rsome */0,
+        _0: {
+          hd: build_other(ext, constrs),
+          tl: r$1._0
+        }
+      };
     }
     catch (raw_exn){
       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -58070,12 +58070,12 @@ function exhaust(ext, pss, n) {
       return r$2;
     } else {
       return {
-              TAG: /* Rsome */0,
-              _0: {
-                hd: q0,
-                tl: r$2._0
-              }
-            };
+        TAG: /* Rsome */0,
+        _0: {
+          hd: q0,
+          tl: r$2._0
+        }
+      };
     }
   }
 }
@@ -58084,9 +58084,9 @@ function combinations(f, lst, lst$p) {
   const iter2 = function (x, param) {
     if (param) {
       return {
-              hd: Curry._2(f, x, param.hd),
-              tl: iter2(x, param.tl)
-            };
+        hd: Curry._2(f, x, param.hd),
+        tl: iter2(x, param.tl)
+      };
     } else {
       return /* [] */0;
     }
@@ -58104,12 +58104,12 @@ function combinations(f, lst, lst$p) {
 function exhaust_gadt(ext, pss, n) {
   if (!pss) {
     return {
-            TAG: /* Rsome */0,
-            _0: {
-              hd: omegas(n),
-              tl: /* [] */0
-            }
-          };
+      TAG: /* Rsome */0,
+      _0: {
+        hd: omegas(n),
+        tl: /* [] */0
+      }
+    };
   }
   if (!pss.hd) {
     return /* Rnone */0;
@@ -58127,11 +58127,11 @@ function exhaust_gadt(ext, pss, n) {
         return r;
       } else {
         return {
-                TAG: /* Rsome */0,
-                _0: Stdlib__List.map((function (row) {
-                        return do_set_args(false, p, row);
-                      }), r._0)
-              };
+          TAG: /* Rsome */0,
+          _0: Stdlib__List.map((function (row) {
+                  return do_set_args(false, p, row);
+                }), r._0)
+        };
       }
     };
     const before = try_many_gadt(try_non_omega, constrs);
@@ -58146,20 +58146,20 @@ function exhaust_gadt(ext, pss, n) {
       const missing_trailing = build_other_gadt(ext, constrs);
       const dug = combinations((function (head, tail) {
               return {
-                      hd: head,
-                      tl: tail
-                    };
+                hd: head,
+                tl: tail
+              };
             }), missing_trailing, r._0);
       if (/* tag */typeof before === "number" || typeof before === "string") {
         return {
-                TAG: /* Rsome */0,
-                _0: dug
-              };
+          TAG: /* Rsome */0,
+          _0: dug
+        };
       } else {
         return {
-                TAG: /* Rsome */0,
-                _0: Stdlib.$at(before._0, dug)
-              };
+          TAG: /* Rsome */0,
+          _0: Stdlib.$at(before._0, dug)
+        };
       }
     }
     catch (raw_exn){
@@ -58175,14 +58175,14 @@ function exhaust_gadt(ext, pss, n) {
       return r$1;
     } else {
       return {
-              TAG: /* Rsome */0,
-              _0: Stdlib__List.map((function (row) {
-                      return {
-                              hd: q0,
-                              tl: row
-                            };
-                    }), r$1._0)
-            };
+        TAG: /* Rsome */0,
+        _0: Stdlib__List.map((function (row) {
+                return {
+                  hd: q0,
+                  tl: row
+                };
+              }), r$1._0)
+      };
     }
   }
 }
@@ -58195,25 +58195,14 @@ function exhaust_gadt$1(ext, pss, n) {
   const lst = ret._0;
   if (Caml_obj.caml_equal(lst, /* [] */0)) {
     return {
-            TAG: /* Rsome */0,
-            _0: omegas(n)
-          };
+      TAG: /* Rsome */0,
+      _0: omegas(n)
+    };
   }
   const singletons = Stdlib__List.map((function (param) {
           if (param) {
             if (param.tl) {
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          40200,
-                          19
-                        ]
-                      });
-            }
-            return param.hd;
-          }
-          throw new Caml_js_exceptions.MelangeError("Assert_failure", {
                     MEL_EXN_ID: "Assert_failure",
                     _1: [
                       "jscomp/test/ocaml_typedtree_test.ml",
@@ -58221,14 +58210,25 @@ function exhaust_gadt$1(ext, pss, n) {
                       19
                     ]
                   });
+            }
+            return param.hd;
+          }
+          throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  40200,
+                  19
+                ]
+              });
         }), lst);
   return {
-          TAG: /* Rsome */0,
-          _0: {
-            hd: Curry._1(orify_many, singletons),
-            tl: /* [] */0
-          }
-        };
+    TAG: /* Rsome */0,
+    _0: {
+      hd: Curry._1(orify_many, singletons),
+      tl: /* [] */0
+    }
+  };
 }
 
 function pressure_variants(_tdefs, _pss) {
@@ -58287,10 +58287,10 @@ function pressure_variants(_tdefs, _pss) {
 
 function make_row(ps) {
   return {
-          no_ors: /* [] */0,
-          ors: /* [] */0,
-          active: ps
-        };
+    no_ors: /* [] */0,
+    ors: /* [] */0,
+    active: ps
+  };
 }
 
 function unalias$1(_p) {
@@ -58310,25 +58310,25 @@ function unalias$1(_p) {
 
 function is_var_column(rs) {
   return Stdlib__List.for_all((function (r) {
-                const match = r.active;
-                if (match) {
-                  let p = match.hd;
-                  const match$1 = unalias$1(p).pat_desc;
-                  if (/* tag */typeof match$1 === "number" || typeof match$1 === "string" || match$1.TAG === /* Tpat_var */0) {
-                    return true;
-                  } else {
-                    return false;
-                  }
-                }
-                throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            40309,
-                            14
-                          ]
-                        });
-              }), rs);
+          const match = r.active;
+          if (match) {
+            let p = match.hd;
+            const match$1 = unalias$1(p).pat_desc;
+            if (/* tag */typeof match$1 === "number" || typeof match$1 === "string" || match$1.TAG === /* Tpat_var */0) {
+              return true;
+            } else {
+              return false;
+            }
+          }
+          throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  40309,
+                  14
+                ]
+              });
+        }), rs);
 }
 
 function or_args(_p) {
@@ -58337,13 +58337,13 @@ function or_args(_p) {
     const match = p.pat_desc;
     if (/* tag */typeof match === "number" || typeof match === "string") {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  40316,
-                  23
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              40316,
+              23
+            ]
+          });
     }
     switch (match.TAG) {
       case /* Tpat_alias */1 :
@@ -58351,18 +58351,18 @@ function or_args(_p) {
           continue ;
       case /* Tpat_or */8 :
           return [
-                  match._0,
-                  match._1
-                ];
+            match._0,
+            match._1
+          ];
       default:
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/ocaml_typedtree_test.ml",
-                    40316,
-                    23
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/ocaml_typedtree_test.ml",
+                40316,
+                23
+              ]
+            });
     }
   };
 }
@@ -58371,69 +58371,69 @@ function remove$1(r) {
   const match = r.active;
   if (match) {
     return {
-            no_ors: r.no_ors,
-            ors: r.ors,
-            active: match.tl
-          };
+      no_ors: r.no_ors,
+      ors: r.ors,
+      active: match.tl
+    };
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              40321,
-              12
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          40321,
+          12
+        ]
+      });
 }
 
 function push_no_or(r) {
   const match = r.active;
   if (match) {
     return {
-            no_ors: {
-              hd: match.hd,
-              tl: r.no_ors
-            },
-            ors: r.ors,
-            active: match.tl
-          };
+      no_ors: {
+        hd: match.hd,
+        tl: r.no_ors
+      },
+      ors: r.ors,
+      active: match.tl
+    };
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              40328,
-              8
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          40328,
+          8
+        ]
+      });
 }
 
 function push_or(r) {
   const match = r.active;
   if (match) {
     return {
-            no_ors: r.no_ors,
-            ors: {
-              hd: match.hd,
-              tl: r.ors
-            },
-            active: match.tl
-          };
+      no_ors: r.no_ors,
+      ors: {
+        hd: match.hd,
+        tl: r.ors
+      },
+      active: match.tl
+    };
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              40332,
-              8
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          40332,
+          8
+        ]
+      });
 }
 
 function discr_pat$1(q, rs) {
   return discr_pat(q, Stdlib__List.map((function (r) {
-                    return r.active;
-                  }), rs));
+              return r.active;
+            }), rs));
 }
 
 function filter_one$1(q, rs) {
@@ -58494,25 +58494,25 @@ function filter_one$1(q, rs) {
         }
         if (simple_match(q, p)) {
           return {
-                  hd: {
-                    no_ors: r.no_ors,
-                    ors: r.ors,
-                    active: Stdlib.$at(simple_match_args(q, p), match.tl)
-                  },
-                  tl: filter_rec(rem)
-                };
+            hd: {
+              no_ors: r.no_ors,
+              ors: r.ors,
+              active: Stdlib.$at(simple_match_args(q, p), match.tl)
+            },
+            tl: filter_rec(rem)
+          };
         }
         _rs = rem;
         continue ;
       }
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  40349,
-                  14
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              40349,
+              14
+            ]
+          });
     };
   };
   return filter_rec(rs);
@@ -58530,19 +58530,19 @@ function extract_elements(qs) {
     const rem = param.tl;
     const q = param.hd;
     return {
-            hd: {
-              no_ors: Stdlib.$at(Stdlib__List.rev_append(seen, rem), qs.no_ors),
-              ors: /* [] */0,
-              active: {
-                hd: q,
-                tl: /* [] */0
-              }
-            },
-            tl: do_rec({
-                  hd: q,
-                  tl: seen
-                }, rem)
-          };
+      hd: {
+        no_ors: Stdlib.$at(Stdlib__List.rev_append(seen, rem), qs.no_ors),
+        ors: /* [] */0,
+        active: {
+          hd: q,
+          tl: /* [] */0
+        }
+      },
+      tl: do_rec({
+            hd: q,
+            tl: seen
+          }, rem)
+    };
   };
   return do_rec(/* [] */0, qs.ors);
 }
@@ -58553,31 +58553,31 @@ function extract_columns(pss, qs) {
     if (rs) {
       const i = Stdlib__List.map((function (x) {
               return {
-                      hd: x,
-                      tl: /* [] */0
-                    };
+                hd: x,
+                tl: /* [] */0
+              };
             }), rs.hd);
       return Stdlib__List.fold_left((function (param, param$1) {
-                    return Stdlib__List.map2((function (r, x) {
-                                  return {
-                                          hd: x,
-                                          tl: r
-                                        };
-                                }), param, param$1);
-                  }), i, rs.tl);
+              return Stdlib__List.map2((function (r, x) {
+                      return {
+                        hd: x,
+                        tl: r
+                      };
+                    }), param, param$1);
+            }), i, rs.tl);
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                40392,
-                8
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            40392,
+            8
+          ]
+        });
   } else {
     return Stdlib__List.map((function (param) {
-                  return /* [] */0;
-                }), qs.ors);
+            return /* [] */0;
+          }), qs.ors);
   }
 }
 
@@ -58642,55 +58642,55 @@ function every_satisfiables(_pss, _qs) {
       const match$2 = qs.ors;
       if (match$2) {
         return Stdlib__List.fold_right2((function (pss, qs, r) {
-                      if (/* tag */(typeof r === "number" || typeof r === "string") && r !== /* Used */0) {
-                        return /* Unused */1;
-                      }
-                      const match = qs.active;
-                      if (match) {
-                        if (match.tl) {
-                          throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                    MEL_EXN_ID: "Assert_failure",
-                                    _1: [
-                                      "jscomp/test/ocaml_typedtree_test.ml",
-                                      40429,
-                                      23
-                                    ]
-                                  });
-                        }
-                        const match$1 = or_args(match.hd);
-                        const r_loc = every_both(pss, qs, match$1[0], match$1[1]);
-                        if (/* tag */typeof r === "number" || typeof r === "string") {
-                          if (r !== /* Used */0) {
-                            return /* Unused */1;
-                          }
-                          
-                        } else {
-                          if (!/* tag */(typeof r_loc === "number" || typeof r_loc === "string")) {
-                            return {
-                                    TAG: /* Upartial */0,
-                                    _0: Stdlib.$at(r._0, r_loc._0)
-                                  };
-                          }
-                          if (r_loc === /* Used */0) {
-                            return r;
-                          }
-                          
-                        }
-                        if (/* tag */(typeof r_loc === "number" || typeof r_loc === "string") && r_loc !== /* Used */0) {
-                          return /* Unused */1;
-                        } else {
-                          return r_loc;
-                        }
-                      }
-                      throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                MEL_EXN_ID: "Assert_failure",
-                                _1: [
-                                  "jscomp/test/ocaml_typedtree_test.ml",
-                                  40429,
-                                  23
-                                ]
-                              });
-                    }), extract_columns(pss, qs), extract_elements(qs), /* Used */0);
+                if (/* tag */(typeof r === "number" || typeof r === "string") && r !== /* Used */0) {
+                  return /* Unused */1;
+                }
+                const match = qs.active;
+                if (match) {
+                  if (match.tl) {
+                    throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                          MEL_EXN_ID: "Assert_failure",
+                          _1: [
+                            "jscomp/test/ocaml_typedtree_test.ml",
+                            40429,
+                            23
+                          ]
+                        });
+                  }
+                  const match$1 = or_args(match.hd);
+                  const r_loc = every_both(pss, qs, match$1[0], match$1[1]);
+                  if (/* tag */typeof r === "number" || typeof r === "string") {
+                    if (r !== /* Used */0) {
+                      return /* Unused */1;
+                    }
+                    
+                  } else {
+                    if (!/* tag */(typeof r_loc === "number" || typeof r_loc === "string")) {
+                      return {
+                        TAG: /* Upartial */0,
+                        _0: Stdlib.$at(r._0, r_loc._0)
+                      };
+                    }
+                    if (r_loc === /* Used */0) {
+                      return r;
+                    }
+                    
+                  }
+                  if (/* tag */(typeof r_loc === "number" || typeof r_loc === "string") && r_loc !== /* Used */0) {
+                    return /* Unused */1;
+                  } else {
+                    return r_loc;
+                  }
+                }
+                throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        40429,
+                        23
+                      ]
+                    });
+              }), extract_columns(pss, qs), extract_elements(qs), /* Used */0);
       } else if (satisfiable(Stdlib__List.map(make_vector, pss), qs.no_ors)) {
         return /* Used */0;
       } else {
@@ -58725,42 +58725,42 @@ function every_both(pss, qs, q1, q2) {
   };
   const r1 = every_satisfiables(pss, qs1);
   const r2 = every_satisfiables(compat(q1, q2) ? ({
-            hd: qs1,
-            tl: pss
-          }) : pss, qs2);
+          hd: qs1,
+          tl: pss
+        }) : pss, qs2);
   if (/* tag */typeof r1 === "number" || typeof r1 === "string") {
     if (r1 === /* Used */0) {
       if (/* tag */(typeof r2 === "number" || typeof r2 === "string") && r2 !== /* Used */0) {
         return {
-                TAG: /* Upartial */0,
-                _0: {
-                  hd: q2,
-                  tl: /* [] */0
-                }
-              };
+          TAG: /* Upartial */0,
+          _0: {
+            hd: q2,
+            tl: /* [] */0
+          }
+        };
       } else {
         return r2;
       }
     } else if (/* tag */typeof r2 === "number" || typeof r2 === "string") {
       if (r2 === /* Used */0) {
         return {
-                TAG: /* Upartial */0,
-                _0: {
-                  hd: q1,
-                  tl: /* [] */0
-                }
-              };
+          TAG: /* Upartial */0,
+          _0: {
+            hd: q1,
+            tl: /* [] */0
+          }
+        };
       } else {
         return /* Unused */1;
       }
     } else {
       return {
-              TAG: /* Upartial */0,
-              _0: {
-                hd: q1,
-                tl: r2._0
-              }
-            };
+        TAG: /* Upartial */0,
+        _0: {
+          hd: q1,
+          tl: r2._0
+        }
+      };
     }
   }
   const u1 = r1._0;
@@ -58769,18 +58769,18 @@ function every_both(pss, qs, q1, q2) {
       return r1;
     } else {
       return {
-              TAG: /* Upartial */0,
-              _0: Stdlib.$at(u1, {
-                    hd: q2,
-                    tl: /* [] */0
-                  })
-            };
+        TAG: /* Upartial */0,
+        _0: Stdlib.$at(u1, {
+              hd: q2,
+              tl: /* [] */0
+            })
+      };
     }
   } else {
     return {
-            TAG: /* Upartial */0,
-            _0: Stdlib.$at(u1, r2._0)
-          };
+      TAG: /* Upartial */0,
+      _0: Stdlib.$at(u1, r2._0)
+    };
   }
 }
 
@@ -58942,15 +58942,15 @@ function le_pat(_p, _q) {
       continue ;
     }
     return !satisfiable({
-                hd: {
-                  hd: p,
-                  tl: /* [] */0
-                },
-                tl: /* [] */0
-              }, {
-                hd: q,
-                tl: /* [] */0
-              });
+          hd: {
+            hd: p,
+            tl: /* [] */0
+          },
+          tl: /* [] */0
+        }, {
+          hd: q,
+          tl: /* [] */0
+        });
   };
 }
 
@@ -59003,12 +59003,12 @@ function get_mins(le, ps) {
 function pressure_variants$1(tdefs, patl) {
   const pss = Stdlib__List.map((function (p) {
           return {
-                  hd: p,
-                  tl: {
-                    hd: omega,
-                    tl: /* [] */0
-                  }
-                };
+            hd: p,
+            tl: {
+              hd: omega,
+              tl: /* [] */0
+            }
+          };
         }), patl);
   pressure_variants(Caml_option.some(tdefs), pss);
 }
@@ -59022,12 +59022,12 @@ function initial_matrix(_param) {
     const match = param.hd;
     if (match.c_guard === undefined) {
       return {
-              hd: {
-                hd: match.c_lhs,
-                tl: /* [] */0
-              },
-              tl: initial_matrix(param.tl)
-            };
+        hd: {
+          hd: match.c_lhs,
+          tl: /* [] */0
+        },
+        tl: initial_matrix(param.tl)
+      };
     }
     _param = param.tl;
     continue ;
@@ -59041,22 +59041,22 @@ function initial_all(no_guard, param) {
     const match = param.hd;
     const pat = match.c_lhs;
     return {
-            hd: [
-              {
-                hd: pat,
-                tl: /* [] */0
-              },
-              pat.pat_loc
-            ],
-            tl: initial_all(no_guard && match.c_guard === undefined, param.tl)
-          };
+      hd: [
+        {
+          hd: pat,
+          tl: /* [] */0
+        },
+        pat.pat_loc
+      ],
+      tl: initial_all(no_guard && match.c_guard === undefined, param.tl)
+    };
   }
   if (!no_guard) {
     return /* [] */0;
   }
   throw new Caml_js_exceptions.MelangeError(NoGuard, {
-            MEL_EXN_ID: NoGuard
-          });
+        MEL_EXN_ID: NoGuard
+      });
 }
 
 function do_filter_var(param) {
@@ -59067,12 +59067,12 @@ function do_filter_var(param) {
   const match$1 = match[0];
   if (match$1) {
     return {
-            hd: [
-              match$1.tl,
-              match[1]
-            ],
-            tl: do_filter_var(param.tl)
-          };
+      hd: [
+        match$1.tl,
+        match[1]
+      ],
+      tl: do_filter_var(param.tl)
+    };
   } else {
     return /* [] */0;
   }
@@ -59136,12 +59136,12 @@ function do_filter_one(q, pss) {
       const pss = param.tl;
       if (simple_match(q, p)) {
         return {
-                hd: [
-                  Stdlib.$at(simple_match_args(q, p), match$1.tl),
-                  match[1]
-                ],
-                tl: filter_rec(pss)
-              };
+          hd: [
+            Stdlib.$at(simple_match_args(q, p), match$1.tl),
+            match[1]
+          ],
+          tl: filter_rec(pss)
+        };
       }
       _param = pss;
       continue ;
@@ -59199,9 +59199,9 @@ function check_partial_all(v, casel) {
   try {
     const pss = initial_all(true, casel);
     return do_match(pss, {
-                hd: v,
-                tl: /* [] */0
-              });
+          hd: v,
+          tl: /* [] */0
+        });
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -59234,11 +59234,11 @@ function select(param) {
   const xs = param.hd;
   if (!param.tl) {
     return Stdlib__List.map((function (y) {
-                  return {
-                          hd: y,
-                          tl: /* [] */0
-                        };
-                }), xs);
+            return {
+              hd: y,
+              tl: /* [] */0
+            };
+          }), xs);
   }
   if (!xs) {
     return /* [] */0;
@@ -59246,14 +59246,14 @@ function select(param) {
   const ys = param.tl;
   const x = xs.hd;
   return Stdlib.$at(Stdlib__List.map((function (lst) {
-                    return {
-                            hd: x,
-                            tl: lst
-                          };
-                  }), select(ys)), select({
-                  hd: xs.tl,
-                  tl: ys
-                }));
+              return {
+                hd: x,
+                tl: lst
+              };
+            }), select(ys)), select({
+            hd: xs.tl,
+            tl: ys
+          }));
 }
 
 const name_counter$1 = {
@@ -59275,9 +59275,9 @@ function conv(typed) {
       const lst = pat.pat_desc;
       if (/* tag */typeof lst === "number" || typeof lst === "string") {
         return {
-                hd: mk$1(undefined, undefined, /* Ppat_any */0),
-                tl: /* [] */0
-              };
+          hd: mk$1(undefined, undefined, /* Ppat_any */0),
+          tl: /* [] */0
+        };
       }
       switch (lst.TAG) {
         case /* Tpat_alias */1 :
@@ -59286,11 +59286,11 @@ function conv(typed) {
         case /* Tpat_tuple */3 :
             const results = select(Stdlib__List.map(loop, lst._0));
             return Stdlib__List.map((function (lst) {
-                          return mk$1(undefined, undefined, {
-                                      TAG: /* Ppat_tuple */4,
-                                      _0: lst
-                                    });
-                        }), results);
+                    return mk$1(undefined, undefined, {
+                          TAG: /* Ppat_tuple */4,
+                          _0: lst
+                        });
+                  }), results);
         case /* Tpat_construct */4 :
             const lst$1 = lst._2;
             const cstr = lst._1;
@@ -59308,59 +59308,59 @@ function conv(typed) {
             const results$1 = select(Stdlib__List.map(loop, lst$1));
             if (lst$1) {
               return Stdlib__List.map((function (lst) {
-                            let arg;
-                            if (lst) {
-                              arg = lst.tl ? mk$1(undefined, undefined, {
-                                      TAG: /* Ppat_tuple */4,
-                                      _0: lst
-                                    }) : lst.hd;
-                            } else {
-                              throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                        MEL_EXN_ID: "Assert_failure",
-                                        _1: [
-                                          "jscomp/test/ocaml_typedtree_test.ml",
-                                          40764,
-                                          28
-                                        ]
-                                      });
-                            }
-                            return mk$1(undefined, undefined, {
-                                        TAG: /* Ppat_construct */5,
-                                        _0: lid,
-                                        _1: arg
-                                      });
-                          }), results$1);
-            } else {
-              return {
-                      hd: mk$1(undefined, undefined, {
+                      let arg;
+                      if (lst) {
+                        arg = lst.tl ? mk$1(undefined, undefined, {
+                                TAG: /* Ppat_tuple */4,
+                                _0: lst
+                              }) : lst.hd;
+                      } else {
+                        throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                              MEL_EXN_ID: "Assert_failure",
+                              _1: [
+                                "jscomp/test/ocaml_typedtree_test.ml",
+                                40764,
+                                28
+                              ]
+                            });
+                      }
+                      return mk$1(undefined, undefined, {
                             TAG: /* Ppat_construct */5,
                             _0: lid,
-                            _1: undefined
-                          }),
-                      tl: /* [] */0
-                    };
+                            _1: arg
+                          });
+                    }), results$1);
+            } else {
+              return {
+                hd: mk$1(undefined, undefined, {
+                      TAG: /* Ppat_construct */5,
+                      _0: lid,
+                      _1: undefined
+                    }),
+                tl: /* [] */0
+              };
             }
         case /* Tpat_variant */5 :
             const p_opt = lst._1;
             const label = lst._0;
             if (p_opt === undefined) {
               return {
-                      hd: mk$1(undefined, undefined, {
-                            TAG: /* Ppat_variant */6,
-                            _0: label,
-                            _1: undefined
-                          }),
-                      tl: /* [] */0
-                    };
+                hd: mk$1(undefined, undefined, {
+                      TAG: /* Ppat_variant */6,
+                      _0: label,
+                      _1: undefined
+                    }),
+                tl: /* [] */0
+              };
             }
             const results$2 = loop(p_opt);
             return Stdlib__List.map((function (p) {
-                          return mk$1(undefined, undefined, {
-                                      TAG: /* Ppat_variant */6,
-                                      _0: label,
-                                      _1: p
-                                    });
-                        }), results$2);
+                    return mk$1(undefined, undefined, {
+                          TAG: /* Ppat_variant */6,
+                          _0: label,
+                          _1: p
+                        });
+                  }), results$2);
         case /* Tpat_record */6 :
             const subpatterns = lst._0;
             const pats = select(Stdlib__List.map((function (param) {
@@ -59371,58 +59371,58 @@ function conv(typed) {
                     const id = fresh(lbl.lbl_name);
                     Stdlib__Hashtbl.add(labels, id, lbl);
                     return {
-                            TAG: /* Lident */0,
-                            _0: id
-                          };
+                      TAG: /* Lident */0,
+                      _0: id
+                    };
                   }), subpatterns);
             return Stdlib__List.map((function (lst) {
-                          const lst$1 = Stdlib__List.map2((function (lid, pat) {
-                                  return [
-                                          {
-                                            txt: lid,
-                                            loc: none
-                                          },
-                                          pat
-                                        ];
-                                }), label_idents, lst);
-                          return mk$1(undefined, undefined, {
-                                      TAG: /* Ppat_record */7,
-                                      _0: lst$1,
-                                      _1: /* Open */1
-                                    });
-                        }), pats);
+                    const lst$1 = Stdlib__List.map2((function (lid, pat) {
+                            return [
+                              {
+                                txt: lid,
+                                loc: none
+                              },
+                              pat
+                            ];
+                          }), label_idents, lst);
+                    return mk$1(undefined, undefined, {
+                          TAG: /* Ppat_record */7,
+                          _0: lst$1,
+                          _1: /* Open */1
+                        });
+                  }), pats);
         case /* Tpat_array */7 :
             const results$3 = select(Stdlib__List.map(loop, lst._0));
             return Stdlib__List.map((function (lst) {
-                          return mk$1(undefined, undefined, {
-                                      TAG: /* Ppat_array */8,
-                                      _0: lst
-                                    });
-                        }), results$3);
+                    return mk$1(undefined, undefined, {
+                          TAG: /* Ppat_array */8,
+                          _0: lst
+                        });
+                  }), results$3);
         case /* Tpat_or */8 :
             return Stdlib.$at(loop(lst._0), loop(lst._1));
         case /* Tpat_lazy */9 :
             const results$4 = loop(lst._0);
             return Stdlib__List.map((function (p) {
-                          return mk$1(undefined, undefined, {
-                                      TAG: /* Ppat_lazy */12,
-                                      _0: p
-                                    });
-                        }), results$4);
+                    return mk$1(undefined, undefined, {
+                          TAG: /* Ppat_lazy */12,
+                          _0: p
+                        });
+                  }), results$4);
         default:
           return {
-                  hd: mk$1(undefined, undefined, /* Ppat_any */0),
-                  tl: /* [] */0
-                };
+            hd: mk$1(undefined, undefined, /* Ppat_any */0),
+            tl: /* [] */0
+          };
       }
     };
   };
   const ps = loop(typed);
   return [
-          ps,
-          constrs,
-          labels
-        ];
+    ps,
+    constrs,
+    labels
+  ];
 }
 
 function do_check_partial(pred, exhaust, loc, casel, pss) {
@@ -59491,18 +59491,18 @@ function do_check_partial_normal(loc, casel, pss) {
 function add_path(path, paths) {
   if (!paths) {
     return {
-            hd: path,
-            tl: /* [] */0
-          };
+      hd: path,
+      tl: /* [] */0
+    };
   }
   const x = paths.hd;
   if (same(path, x)) {
     return paths;
   } else {
     return {
-            hd: x,
-            tl: add_path(path, paths.tl)
-          };
+      hd: x,
+      tl: add_path(path, paths.tl)
+    };
   }
 }
 
@@ -59539,8 +59539,8 @@ function collect_paths_from_pat(_r, _p) {
           continue ;
       case /* Tpat_record */6 :
           return Stdlib__List.fold_left((function (r, param) {
-                        return collect_paths_from_pat(r, param[2]);
-                      }), r, p$1._0);
+                  return collect_paths_from_pat(r, param[2]);
+                }), r, p$1._0);
       case /* Tpat_tuple */3 :
       case /* Tpat_array */7 :
           return Stdlib__List.fold_left(collect_paths_from_pat, r, p$1._0);
@@ -59573,9 +59573,9 @@ function do_check_fragile_param(exhaust, loc, casel, pss) {
           const match = Curry._3(exhaust, ext, pss, Stdlib__List.length(ps));
           if (/* tag */typeof match === "number" || typeof match === "string") {
             return prerr_warning(loc, {
-                        TAG: /* Fragile_match */1,
-                        _0: name(undefined, ext)
-                      });
+                  TAG: /* Fragile_match */1,
+                  _0: name(undefined, ext)
+                });
           }
           
         }), exts);
@@ -59658,22 +59658,22 @@ function error_of_extension(ext) {
         break;
     default:
       return Curry._1(errorf(match.loc, undefined, undefined, {
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Uninterpreted extension '",
-                        _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "'.",
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      },
-                      _1: "Uninterpreted extension '%s'."
-                    }), txt);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Uninterpreted extension '",
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "'.",
+                      _1: /* End_of_format */0
+                    }
+                  }
+                },
+                _1: "Uninterpreted extension '%s'."
+              }), txt);
   }
   if (exit === 1) {
     const p = ext[1];
@@ -59685,30 +59685,30 @@ function error_of_extension(ext) {
       const match = inner.hd.pstr_desc;
       if (match.TAG === /* Pstr_extension */14) {
         return {
-                hd: error_of_extension(match._0),
-                tl: sub_from(inner.tl)
-              };
+          hd: error_of_extension(match._0),
+          tl: sub_from(inner.tl)
+        };
       } else {
         return {
-                hd: Curry._1(errorf(loc, undefined, undefined, {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Invalid syntax for sub-error of extension '",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: "'.",
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "Invalid syntax for sub-error of extension '%s'."
-                        }), txt),
-                tl: sub_from(inner.tl)
-              };
+          hd: Curry._1(errorf(loc, undefined, undefined, {
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Invalid syntax for sub-error of extension '",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: "'.",
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "Invalid syntax for sub-error of extension '%s'."
+                  }), txt),
+          tl: sub_from(inner.tl)
+        };
       }
     };
     let exit$1 = 0;
@@ -59769,22 +59769,22 @@ function error_of_extension(ext) {
     }
     if (exit$1 === 2) {
       return Curry._1(errorf(loc, undefined, undefined, {
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Invalid syntax for extension '",
-                        _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* String_literal */11,
-                            _0: "'.",
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      },
-                      _1: "Invalid syntax for extension '%s'."
-                    }), txt);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Invalid syntax for extension '",
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "'.",
+                      _1: /* End_of_format */0
+                    }
+                  }
+                },
+                _1: "Invalid syntax for extension '%s'."
+              }), txt);
     }
     
   }
@@ -59804,20 +59804,20 @@ function check_deprecated(loc, attrs, s) {
           if (txt !== undefined) {
             if (bs_vscode) {
               return prerr_warning(loc, {
-                          TAG: /* Deprecated */0,
-                          _0: s + (" " + txt)
-                        });
+                    TAG: /* Deprecated */0,
+                    _0: s + (" " + txt)
+                  });
             } else {
               return prerr_warning(loc, {
-                          TAG: /* Deprecated */0,
-                          _0: s + ("\n" + txt)
-                        });
+                    TAG: /* Deprecated */0,
+                    _0: s + ("\n" + txt)
+                  });
             }
           } else {
             return prerr_warning(loc, {
-                        TAG: /* Deprecated */0,
-                        _0: s
-                      });
+                  TAG: /* Deprecated */0,
+                  _0: s
+                });
           }
         }), attrs);
 }
@@ -59891,13 +59891,13 @@ function warning_leave_scope(param) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              41342,
-              10
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          41342,
+          10
+        ]
+      });
 }
 
 function warning_attribute(attrs) {
@@ -59905,10 +59905,10 @@ function warning_attribute(attrs) {
     const s = string_of_payload(payload);
     if (s === undefined) {
       return prerr_warning(loc, {
-                  TAG: /* Attribute_payload */30,
-                  _0: txt,
-                  _1: "A single string literal is expected"
-                });
+            TAG: /* Attribute_payload */30,
+            _0: txt,
+            _1: "A single string literal is expected"
+          });
     }
     try {
       return parse_options(errflag, s);
@@ -59917,10 +59917,10 @@ function warning_attribute(attrs) {
       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
       if (exn.MEL_EXN_ID === Stdlib__Arg.Bad) {
         return prerr_warning(loc, {
-                    TAG: /* Attribute_payload */30,
-                    _0: txt,
-                    _1: "Ill-formed list of warnings"
-                  });
+              TAG: /* Attribute_payload */30,
+              _0: txt,
+              _1: "Ill-formed list of warnings"
+            });
       }
       throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
     }
@@ -59961,19 +59961,19 @@ function narrow_unbound_lid_error(env, loc, lid, make_error) {
       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
       if (exn.MEL_EXN_ID === Stdlib.Not_found) {
         return narrow_unbound_lid_error(env, loc, mlid, (function (lid) {
-                      return {
-                              TAG: /* Unbound_module */20,
-                              _0: lid
-                            };
-                    }));
+                return {
+                  TAG: /* Unbound_module */20,
+                  _0: lid
+                };
+              }));
       }
       if (exn.MEL_EXN_ID === Recmodule) {
         throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                  MEL_EXN_ID: $$Error$6,
-                  _1: loc,
-                  _2: env,
-                  _3: /* Illegal_reference_to_recursive_module */1
-                });
+              MEL_EXN_ID: $$Error$6,
+              _1: loc,
+              _2: env,
+              _3: /* Illegal_reference_to_recursive_module */1
+            });
       }
       throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
     }
@@ -59988,36 +59988,36 @@ function narrow_unbound_lid_error(env, loc, lid, make_error) {
         const match = scrape_alias(env, undefined, md.md_type);
         if (match.TAG === /* Mty_functor */2) {
           throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                    MEL_EXN_ID: $$Error$6,
-                    _1: loc,
-                    _2: env,
-                    _3: {
-                      TAG: /* Access_functor_as_structure */25,
-                      _0: mlid
-                    }
-                  });
+                MEL_EXN_ID: $$Error$6,
+                _1: loc,
+                _2: env,
+                _3: {
+                  TAG: /* Access_functor_as_structure */25,
+                  _0: mlid
+                }
+              });
         }
         break;
     case /* Lapply */2 :
         check_module(lid._0);
         check_module(lid._1);
         throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                  MEL_EXN_ID: $$Error$6,
-                  _1: loc,
-                  _2: env,
-                  _3: {
-                    TAG: /* Ill_typed_functor_application */24,
-                    _0: lid
-                  }
-                });
+              MEL_EXN_ID: $$Error$6,
+              _1: loc,
+              _2: env,
+              _3: {
+                TAG: /* Ill_typed_functor_application */24,
+                _0: lid
+              }
+            });
     
   }
   throw new Caml_js_exceptions.MelangeError($$Error$6, {
-            MEL_EXN_ID: $$Error$6,
-            _1: loc,
-            _2: env,
-            _3: Curry._1(make_error, lid)
-          });
+        MEL_EXN_ID: $$Error$6,
+        _1: loc,
+        _2: env,
+        _3: Curry._1(make_error, lid)
+      });
 }
 
 function find_component(lookup, make_error, env, loc, lid) {
@@ -60029,9 +60029,9 @@ function find_component(lookup, make_error, env, loc, lid) {
             case /* Lident */0 :
                 if (match._0 === "*predef*") {
                   return Curry._2(lookup, {
-                              TAG: /* Lident */0,
-                              _0: lid._1
-                            }, initial_safe_string);
+                        TAG: /* Lident */0,
+                        _0: lid._1
+                      }, initial_safe_string);
                 } else {
                   return Curry._2(lookup, lid, env);
                 }
@@ -60053,11 +60053,11 @@ function find_component(lookup, make_error, env, loc, lid) {
     }
     if (exn.MEL_EXN_ID === Recmodule) {
       throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                MEL_EXN_ID: $$Error$6,
-                _1: loc,
-                _2: env,
-                _3: /* Illegal_reference_to_recursive_module */1
-              });
+            MEL_EXN_ID: $$Error$6,
+            _1: loc,
+            _2: env,
+            _3: /* Illegal_reference_to_recursive_module */1
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -60066,9 +60066,9 @@ function find_component(lookup, make_error, env, loc, lid) {
 function find_type(env, loc, lid) {
   const r = find_component(lookup_type$1, (function (lid) {
           return {
-                  TAG: /* Unbound_type_constructor */1,
-                  _0: lid
-                };
+            TAG: /* Unbound_type_constructor */1,
+            _0: lid
+          };
         }), env, loc, lid);
   check_deprecated(loc, r[1].type_attributes, name(undefined, r[0]));
   return r;
@@ -60076,37 +60076,37 @@ function find_type(env, loc, lid) {
 
 function find_constructor(param, param$1, param$2) {
   return find_component(lookup_constructor, (function (lid) {
-                return {
-                        TAG: /* Unbound_constructor */18,
-                        _0: lid
-                      };
-              }), param, param$1, param$2);
+          return {
+            TAG: /* Unbound_constructor */18,
+            _0: lid
+          };
+        }), param, param$1, param$2);
 }
 
 function find_all_constructors(param, param$1, param$2) {
   return find_component(lookup_all_constructors$1, (function (lid) {
-                return {
-                        TAG: /* Unbound_constructor */18,
-                        _0: lid
-                      };
-              }), param, param$1, param$2);
+          return {
+            TAG: /* Unbound_constructor */18,
+            _0: lid
+          };
+        }), param, param$1, param$2);
 }
 
 function find_all_labels(param, param$1, param$2) {
   return find_component(lookup_all_labels$1, (function (lid) {
-                return {
-                        TAG: /* Unbound_label */19,
-                        _0: lid
-                      };
-              }), param, param$1, param$2);
+          return {
+            TAG: /* Unbound_label */19,
+            _0: lid
+          };
+        }), param, param$1, param$2);
 }
 
 function find_class$1(env, loc, lid) {
   const r = find_component(lookup_class$1, (function (lid) {
           return {
-                  TAG: /* Unbound_class */21,
-                  _0: lid
-                };
+            TAG: /* Unbound_class */21,
+            _0: lid
+          };
         }), env, loc, lid);
   check_deprecated(loc, r[1].cty_attributes, name(undefined, r[0]));
   return r;
@@ -60116,9 +60116,9 @@ function find_value$1(env, loc, lid) {
   check_value_name(last$1(lid), loc);
   const r = find_component(lookup_value$1, (function (lid) {
           return {
-                  TAG: /* Unbound_value */17,
-                  _0: lid
-                };
+            TAG: /* Unbound_value */17,
+            _0: lid
+          };
         }), env, loc, lid);
   check_deprecated(loc, r[1].val_attributes, name(undefined, r[0]));
   return r;
@@ -60127,16 +60127,16 @@ function find_value$1(env, loc, lid) {
 function lookup_module$1(loadOpt, env, loc, lid) {
   const load = loadOpt !== undefined ? loadOpt : false;
   return find_component((function (lid, env) {
-                  return [
-                          lookup_module(load, lid, env),
-                          undefined
-                        ];
-                }), (function (lid) {
-                  return {
-                          TAG: /* Unbound_module */20,
-                          _0: lid
-                        };
-                }), env, loc, lid)[0];
+            return [
+              lookup_module(load, lid, env),
+              undefined
+            ];
+          }), (function (lid) {
+            return {
+              TAG: /* Unbound_module */20,
+              _0: lid
+            };
+          }), env, loc, lid)[0];
 }
 
 function find_module$1(env, loc, lid) {
@@ -60144,17 +60144,17 @@ function find_module$1(env, loc, lid) {
   const decl = find_module(false, path, env);
   check_deprecated(loc, decl.md_attributes, name(undefined, path));
   return [
-          path,
-          decl
-        ];
+    path,
+    decl
+  ];
 }
 
 function find_modtype$1(env, loc, lid) {
   const r = find_component(lookup_modtype, (function (lid) {
           return {
-                  TAG: /* Unbound_modtype */22,
-                  _0: lid
-                };
+            TAG: /* Unbound_modtype */22,
+            _0: lid
+          };
         }), env, loc, lid);
   check_deprecated(loc, r[1].mtd_attributes, name(undefined, r[0]));
   return r;
@@ -60163,9 +60163,9 @@ function find_modtype$1(env, loc, lid) {
 function find_class_type(env, loc, lid) {
   const r = find_component(lookup_cltype$1, (function (lid) {
           return {
-                  TAG: /* Unbound_cltype */23,
-                  _0: lid
-                };
+            TAG: /* Unbound_cltype */23,
+            _0: lid
+          };
         }), env, loc, lid);
   check_deprecated(loc, r[1].clty_attributes, name(undefined, r[0]));
   return r;
@@ -60173,45 +60173,45 @@ function find_class_type(env, loc, lid) {
 
 function unbound_constructor_error(env, lid) {
   return narrow_unbound_lid_error(env, lid.loc, lid.txt, (function (lid) {
-                return {
-                        TAG: /* Unbound_constructor */18,
-                        _0: lid
-                      };
-              }));
+          return {
+            TAG: /* Unbound_constructor */18,
+            _0: lid
+          };
+        }));
 }
 
 function unbound_label_error(env, lid) {
   return narrow_unbound_lid_error(env, lid.loc, lid.txt, (function (lid) {
-                return {
-                        TAG: /* Unbound_label */19,
-                        _0: lid
-                      };
-              }));
+          return {
+            TAG: /* Unbound_label */19,
+            _0: lid
+          };
+        }));
 }
 
 const transl_modtype_longident = {
   contents: (function (param) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  41489,
-                  45
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              41489,
+              45
+            ]
+          });
     })
 };
 
 const transl_modtype = {
   contents: (function (param) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  41490,
-                  35
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              41490,
+              35
+            ]
+          });
     })
 };
 
@@ -60221,56 +60221,56 @@ function create_package_mty(fake, loc, env, param) {
           const s1 = param[0];
           if (Caml_obj.caml_equal(s1.txt, s2.txt)) {
             throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                      MEL_EXN_ID: $$Error$6,
-                      _1: loc,
-                      _2: env,
-                      _3: {
-                        TAG: /* Multiple_constraints_on_type */15,
-                        _0: s1.txt
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$6,
+                  _1: loc,
+                  _2: env,
+                  _3: {
+                    TAG: /* Multiple_constraints_on_type */15,
+                    _0: s1.txt
+                  }
+                });
           }
           return Caml_obj.caml_compare(s1.txt, s2.txt);
         }), param[1]);
   return [
-          l,
-          Stdlib__List.fold_left((function (mty, param) {
-                  const s = param[0];
-                  const d_ptype_name = {
-                    txt: last$1(s.txt),
-                    loc: s.loc
-                  };
-                  const d_ptype_manifest = fake ? undefined : param[1];
-                  const d = {
-                    ptype_name: d_ptype_name,
-                    ptype_params: /* [] */0,
-                    ptype_cstrs: /* [] */0,
-                    ptype_kind: /* Ptype_abstract */0,
-                    ptype_private: /* Public */1,
-                    ptype_manifest: d_ptype_manifest,
-                    ptype_attributes: /* [] */0,
-                    ptype_loc: loc
-                  };
-                  return mk$3(loc, undefined, {
-                              TAG: /* Pmty_with */3,
-                              _0: mty,
-                              _1: {
-                                hd: {
-                                  TAG: /* Pwith_type */0,
-                                  _0: {
-                                    txt: s.txt,
-                                    loc: loc
-                                  },
-                                  _1: d
-                                },
-                                tl: /* [] */0
-                              }
-                            });
-                }), mk$3(loc, undefined, {
-                    TAG: /* Pmty_ident */0,
-                    _0: param[0]
-                  }), l)
-        ];
+    l,
+    Stdlib__List.fold_left((function (mty, param) {
+            const s = param[0];
+            const d_ptype_name = {
+              txt: last$1(s.txt),
+              loc: s.loc
+            };
+            const d_ptype_manifest = fake ? undefined : param[1];
+            const d = {
+              ptype_name: d_ptype_name,
+              ptype_params: /* [] */0,
+              ptype_cstrs: /* [] */0,
+              ptype_kind: /* Ptype_abstract */0,
+              ptype_private: /* Public */1,
+              ptype_manifest: d_ptype_manifest,
+              ptype_attributes: /* [] */0,
+              ptype_loc: loc
+            };
+            return mk$3(loc, undefined, {
+                  TAG: /* Pmty_with */3,
+                  _0: mty,
+                  _1: {
+                    hd: {
+                      TAG: /* Pwith_type */0,
+                      _0: {
+                        txt: s.txt,
+                        loc: loc
+                      },
+                      _1: d
+                    },
+                    tl: /* [] */0
+                  }
+                });
+          }), mk$3(loc, undefined, {
+              TAG: /* Pmty_ident */0,
+              _0: param[0]
+            }), l)
+  ];
 }
 
 const type_variables = {
@@ -60296,9 +60296,9 @@ function reset_type_variables(param) {
 
 function narrow(param) {
   return [
-          increase_global_level(undefined),
-          type_variables.contents
-        ];
+    increase_global_level(undefined),
+    type_variables.contents
+  ];
 }
 
 function widen(param) {
@@ -60329,12 +60329,12 @@ function transl_type_param(env, styp) {
   if (/* tag */typeof name === "number" || typeof name === "string") {
     const ty = new_global_var(validate_name("_"), undefined);
     return {
-            ctyp_desc: /* Ttyp_any */0,
-            ctyp_type: ty,
-            ctyp_env: env,
-            ctyp_loc: loc,
-            ctyp_attributes: styp.ptyp_attributes
-          };
+      ctyp_desc: /* Ttyp_any */0,
+      ctyp_type: ty,
+      ctyp_env: env,
+      ctyp_loc: loc,
+      ctyp_attributes: styp.ptyp_attributes
+    };
   }
   if (name.TAG === /* Ptyp_var */0) {
     const name$1 = name._0;
@@ -60342,19 +60342,19 @@ function transl_type_param(env, styp) {
     try {
       if (name$1 !== "" && Caml_string.get(name$1, 0) === /* '_' */95) {
         throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                  MEL_EXN_ID: $$Error$6,
-                  _1: loc,
-                  _2: empty,
-                  _3: {
-                    TAG: /* Invalid_variable_name */13,
-                    _0: "'" + name$1
-                  }
-                });
+              MEL_EXN_ID: $$Error$6,
+              _1: loc,
+              _2: empty,
+              _3: {
+                TAG: /* Invalid_variable_name */13,
+                _0: "'" + name$1
+              }
+            });
       }
       find$2(name$1, type_variables.contents);
       throw new Caml_js_exceptions.MelangeError(Already_bound, {
-                MEL_EXN_ID: Already_bound
-              });
+            MEL_EXN_ID: Already_bound
+          });
     }
     catch (raw_exn){
       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -60367,24 +60367,24 @@ function transl_type_param(env, styp) {
       }
     }
     return {
-            ctyp_desc: {
-              TAG: /* Ttyp_var */0,
-              _0: name$1
-            },
-            ctyp_type: ty$1,
-            ctyp_env: env,
-            ctyp_loc: loc,
-            ctyp_attributes: styp.ptyp_attributes
-          };
+      ctyp_desc: {
+        TAG: /* Ttyp_var */0,
+        _0: name$1
+      },
+      ctyp_type: ty$1,
+      ctyp_env: env,
+      ctyp_loc: loc,
+      ctyp_attributes: styp.ptyp_attributes
+    };
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              41575,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          41575,
+          9
+        ]
+      });
 }
 
 function new_pre_univar(name, param) {
@@ -60403,12 +60403,12 @@ function swap_list(l) {
   const match = l.tl;
   if (match) {
     return {
-            hd: match.hd,
-            tl: {
-              hd: l.hd,
-              tl: swap_list(match.tl)
-            }
-          };
+      hd: match.hd,
+      tl: {
+        hd: l.hd,
+        tl: swap_list(match.tl)
+      }
+    };
   } else {
     return l;
   }
@@ -60418,12 +60418,12 @@ function transl_type(env, policy, styp) {
   const loc = styp.ptyp_loc;
   const ctyp = function (ctyp_desc, ctyp_type) {
     return {
-            ctyp_desc: ctyp_desc,
-            ctyp_type: ctyp_type,
-            ctyp_env: env,
-            ctyp_loc: loc,
-            ctyp_attributes: styp.ptyp_attributes
-          };
+      ctyp_desc: ctyp_desc,
+      ctyp_type: ctyp_type,
+      ctyp_env: env,
+      ctyp_loc: loc,
+      ctyp_attributes: styp.ptyp_attributes
+    };
   };
   const name = styp.ptyp_desc;
   if (/* tag */typeof name === "number" || typeof name === "string") {
@@ -60433,14 +60433,14 @@ function transl_type(env, policy, styp) {
     } else {
       if (policy === /* Fixed */0) {
         throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                  MEL_EXN_ID: $$Error$6,
-                  _1: styp.ptyp_loc,
-                  _2: env,
-                  _3: {
-                    TAG: /* Unbound_type_variable */0,
-                    _0: "_"
-                  }
-                });
+              MEL_EXN_ID: $$Error$6,
+              _1: styp.ptyp_loc,
+              _2: env,
+              _3: {
+                TAG: /* Unbound_type_variable */0,
+                _0: "_"
+              }
+            });
       }
       ty = newvar(validate_name(undefined), undefined);
     }
@@ -60451,14 +60451,14 @@ function transl_type(env, policy, styp) {
         const name$1 = name._0;
         if (name$1 !== "" && Caml_string.get(name$1, 0) === /* '_' */95) {
           throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                    MEL_EXN_ID: $$Error$6,
-                    _1: styp.ptyp_loc,
-                    _2: env,
-                    _3: {
-                      TAG: /* Invalid_variable_name */13,
-                      _0: "'" + name$1
-                    }
-                  });
+                MEL_EXN_ID: $$Error$6,
+                _1: styp.ptyp_loc,
+                _2: env,
+                _3: {
+                  TAG: /* Invalid_variable_name */13,
+                  _0: "'" + name$1
+                }
+              });
         }
         let ty$1;
         try {
@@ -60488,9 +60488,9 @@ function transl_type(env, policy, styp) {
           }
         }
         return ctyp({
-                    TAG: /* Ttyp_var */0,
-                    _0: name$1
-                  }, ty$1);
+              TAG: /* Ttyp_var */0,
+              _0: name$1
+            }, ty$1);
     case /* Ptyp_arrow */1 :
         const l = name._0;
         const cty1 = transl_type(env, policy, name._1);
@@ -60503,11 +60503,11 @@ function transl_type(env, policy, styp) {
               _3: /* Cok */0
             });
         return ctyp({
-                    TAG: /* Ttyp_arrow */1,
-                    _0: l,
-                    _1: cty1,
-                    _2: cty2
-                  }, ty$2);
+              TAG: /* Ttyp_arrow */1,
+              _0: l,
+              _1: cty1,
+              _2: cty2
+            }, ty$2);
     case /* Ptyp_tuple */2 :
         const stl = name._0;
         if (Stdlib__List.length(stl) < 2) {
@@ -60524,9 +60524,9 @@ function transl_type(env, policy, styp) {
         };
         const ty$3 = newty2(current_level.contents, desc);
         return ctyp({
-                    TAG: /* Ttyp_tuple */2,
-                    _0: ctys
-                  }, ty$3);
+              TAG: /* Ttyp_tuple */2,
+              _0: ctys
+            }, ty$3);
     case /* Ptyp_constr */3 :
         const stl$1 = name._1;
         const lid = name._0;
@@ -60545,16 +60545,16 @@ function transl_type(env, policy, styp) {
         }
         if (Stdlib__List.length(stl$2) !== decl.type_arity) {
           throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                    MEL_EXN_ID: $$Error$6,
-                    _1: styp.ptyp_loc,
-                    _2: env,
-                    _3: {
-                      TAG: /* Type_arity_mismatch */3,
-                      _0: lid.txt,
-                      _1: decl.type_arity,
-                      _2: Stdlib__List.length(stl$2)
-                    }
-                  });
+                MEL_EXN_ID: $$Error$6,
+                _1: styp.ptyp_loc,
+                _2: env,
+                _3: {
+                  TAG: /* Type_arity_mismatch */3,
+                  _0: lid.txt,
+                  _1: decl.type_arity,
+                  _2: Stdlib__List.length(stl$2)
+                }
+              });
         }
         const args = Stdlib__List.map((function (param) {
                 return transl_type(env, policy, param);
@@ -60570,14 +60570,14 @@ function transl_type(env, policy, styp) {
                   const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
                   if (trace.MEL_EXN_ID === Unify) {
                     throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                              MEL_EXN_ID: $$Error$6,
-                              _1: param[0].ptyp_loc,
-                              _2: env,
-                              _3: {
-                                TAG: /* Type_mismatch */6,
-                                _0: swap_list(trace._1)
-                              }
-                            });
+                          MEL_EXN_ID: $$Error$6,
+                          _1: param[0].ptyp_loc,
+                          _2: env,
+                          _3: {
+                            TAG: /* Type_mismatch */6,
+                            _0: swap_list(trace._1)
+                          }
+                        });
                   }
                   throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
                 }
@@ -60592,38 +60592,38 @@ function transl_type(env, policy, styp) {
           const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
           if (trace.MEL_EXN_ID === Unify) {
             throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                      MEL_EXN_ID: $$Error$6,
-                      _1: styp.ptyp_loc,
-                      _2: env,
-                      _3: {
-                        TAG: /* Type_mismatch */6,
-                        _0: trace._1
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$6,
+                  _1: styp.ptyp_loc,
+                  _2: env,
+                  _3: {
+                    TAG: /* Type_mismatch */6,
+                    _0: trace._1
+                  }
+                });
           }
           throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
         }
         return ctyp({
-                    TAG: /* Ttyp_constr */3,
-                    _0: path,
-                    _1: lid,
-                    _2: args
-                  }, constr);
+              TAG: /* Ttyp_constr */3,
+              _0: path,
+              _1: lid,
+              _2: args
+            }, constr);
     case /* Ptyp_object */4 :
         const o = name._1;
         const fields = Stdlib__List.map((function (param) {
                 return [
-                        param[0],
-                        param[1],
-                        transl_poly_type(env, policy, param[2])
-                      ];
+                  param[0],
+                  param[1],
+                  transl_poly_type(env, policy, param[2])
+                ];
               }), name._0);
         const ty$5 = newobj(transl_fields(loc, env, policy, /* [] */0, o, fields));
         return ctyp({
-                    TAG: /* Ttyp_object */4,
-                    _0: fields,
-                    _1: o
-                  }, ty$5);
+              TAG: /* Ttyp_object */4,
+              _0: fields,
+              _1: o
+            }, ty$5);
     case /* Ptyp_class */5 :
         const stl$3 = name._1;
         const lid$1 = name._0;
@@ -60639,8 +60639,8 @@ function transl_type(env, policy, styp) {
                 const row = repr(ty).desc;
                 if (/* tag */typeof row === "number" || typeof row === "string") {
                   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                            MEL_EXN_ID: Stdlib.Not_found
-                          });
+                        MEL_EXN_ID: Stdlib.Not_found
+                      });
                 }
                 switch (row.TAG) {
                   case /* Tconstr */3 :
@@ -60651,17 +60651,17 @@ function transl_type(env, policy, styp) {
                         return ;
                       }
                       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                MEL_EXN_ID: Stdlib.Not_found
-                              });
+                            MEL_EXN_ID: Stdlib.Not_found
+                          });
                   default:
                     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                              MEL_EXN_ID: Stdlib.Not_found
-                            });
+                          MEL_EXN_ID: Stdlib.Not_found
+                        });
                 }
               } else {
                 throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                          MEL_EXN_ID: Stdlib.Not_found
-                        });
+                      MEL_EXN_ID: Stdlib.Not_found
+                    });
               }
             };
           };
@@ -60713,13 +60713,13 @@ function transl_type(env, policy, styp) {
               if (exn$3.MEL_EXN_ID === Stdlib.Not_found) {
                 find_class$1(env, styp.ptyp_loc, lid$1.txt);
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            41701,
-                            57
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        41701,
+                        57
+                      ]
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(exn$3.MEL_EXN_ID, exn$3);
             }
@@ -60731,16 +60731,16 @@ function transl_type(env, policy, styp) {
         const path$1 = match$1[0];
         if (Stdlib__List.length(stl$3) !== decl$2.type_arity) {
           throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                    MEL_EXN_ID: $$Error$6,
-                    _1: styp.ptyp_loc,
-                    _2: env,
-                    _3: {
-                      TAG: /* Type_arity_mismatch */3,
-                      _0: lid$1.txt,
-                      _1: decl$2.type_arity,
-                      _2: Stdlib__List.length(stl$3)
-                    }
-                  });
+                MEL_EXN_ID: $$Error$6,
+                _1: styp.ptyp_loc,
+                _2: env,
+                _3: {
+                  TAG: /* Type_arity_mismatch */3,
+                  _0: lid$1.txt,
+                  _1: decl$2.type_arity,
+                  _2: Stdlib__List.length(stl$3)
+                }
+              });
         }
         const args$1 = Stdlib__List.map((function (param) {
                 return transl_type(env, policy, param);
@@ -60754,14 +60754,14 @@ function transl_type(env, policy, styp) {
                   const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
                   if (trace.MEL_EXN_ID === Unify) {
                     throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                              MEL_EXN_ID: $$Error$6,
-                              _1: param[0].ptyp_loc,
-                              _2: env,
-                              _3: {
-                                TAG: /* Type_mismatch */6,
-                                _0: swap_list(trace._1)
-                              }
-                            });
+                          MEL_EXN_ID: $$Error$6,
+                          _1: param[0].ptyp_loc,
+                          _2: env,
+                          _3: {
+                            TAG: /* Type_mismatch */6,
+                            _0: swap_list(trace._1)
+                          }
+                        });
                   }
                   throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
                 }
@@ -60777,14 +60777,14 @@ function transl_type(env, policy, styp) {
           const trace$1 = Caml_js_exceptions.internalToOCamlException(raw_trace$1);
           if (trace$1.MEL_EXN_ID === Unify) {
             throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                      MEL_EXN_ID: $$Error$6,
-                      _1: styp.ptyp_loc,
-                      _2: env,
-                      _3: {
-                        TAG: /* Type_mismatch */6,
-                        _0: trace$1._1
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$6,
+                  _1: styp.ptyp_loc,
+                  _2: env,
+                  _3: {
+                    TAG: /* Type_mismatch */6,
+                    _0: trace$1._1
+                  }
+                });
           }
           throw new Caml_js_exceptions.MelangeError(trace$1.MEL_EXN_ID, trace$1);
         }
@@ -60792,13 +60792,13 @@ function transl_type(env, policy, styp) {
         let ty$7;
         if (/* tag */typeof row === "number" || typeof row === "string") {
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      41749,
-                      10
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  41749,
+                  10
+                ]
+              });
         }
         switch (row.TAG) {
           case /* Tobject */4 :
@@ -60822,30 +60822,30 @@ function transl_type(env, policy, styp) {
                       } else {
                         const ty = match._0;
                         tmp = ty !== undefined ? ({
-                              TAG: /* Reither */1,
-                              _0: false,
-                              _1: {
-                                hd: ty,
-                                tl: /* [] */0
-                              },
-                              _2: false,
-                              _3: {
-                                contents: undefined
-                              }
-                            }) : ({
-                              TAG: /* Reither */1,
-                              _0: true,
-                              _1: /* [] */0,
-                              _2: false,
-                              _3: {
-                                contents: undefined
-                              }
-                            });
+                            TAG: /* Reither */1,
+                            _0: false,
+                            _1: {
+                              hd: ty,
+                              tl: /* [] */0
+                            },
+                            _2: false,
+                            _3: {
+                              contents: undefined
+                            }
+                          }) : ({
+                            TAG: /* Reither */1,
+                            _0: true,
+                            _1: /* [] */0,
+                            _2: false,
+                            _3: {
+                              contents: undefined
+                            }
+                          });
                       }
                       return [
-                              param[0],
-                              tmp
-                            ];
+                        param[0],
+                        tmp
+                      ];
                     }), row$1.row_fields);
               const row_row_more = newvar(validate_name(undefined), undefined);
               const row_row_name = [
@@ -60862,21 +60862,21 @@ function transl_type(env, policy, styp) {
               };
               const $$static = static_row(row$2);
               const row$3 = $$static ? ({
-                    row_fields: fields$1,
-                    row_more: newty2(current_level.contents, /* Tnil */0),
-                    row_bound: undefined,
-                    row_closed: true,
-                    row_fixed: false,
-                    row_name: row_row_name
-                  }) : (
+                  row_fields: fields$1,
+                  row_more: newty2(current_level.contents, /* Tnil */0),
+                  row_bound: undefined,
+                  row_closed: true,
+                  row_fixed: false,
+                  row_name: row_row_name
+                }) : (
                   policy !== /* Univars */2 ? row$2 : ({
-                        row_fields: fields$1,
-                        row_more: new_pre_univar(undefined, undefined),
-                        row_bound: undefined,
-                        row_closed: true,
-                        row_fixed: false,
-                        row_name: row_row_name
-                      })
+                      row_fields: fields$1,
+                      row_more: new_pre_univar(undefined, undefined),
+                      row_bound: undefined,
+                      row_closed: true,
+                      row_fixed: false,
+                      row_name: row_row_name
+                    })
                 );
               ty$7 = newty2(current_level.contents, {
                     TAG: /* Tvariant */8,
@@ -60885,20 +60885,20 @@ function transl_type(env, policy, styp) {
               break;
           default:
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "jscomp/test/ocaml_typedtree_test.ml",
-                        41749,
-                        10
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "jscomp/test/ocaml_typedtree_test.ml",
+                    41749,
+                    10
+                  ]
+                });
         }
         return ctyp({
-                    TAG: /* Ttyp_class */5,
-                    _0: path$1,
-                    _1: lid$1,
-                    _2: args$1
-                  }, ty$7);
+              TAG: /* Ttyp_class */5,
+              _0: path$1,
+              _1: lid$1,
+              _2: args$1
+            }, ty$7);
     case /* Ptyp_alias */6 :
         const alias = name._1;
         const st = name._0;
@@ -60925,14 +60925,14 @@ function transl_type(env, policy, styp) {
             if (trace$2.MEL_EXN_ID === Unify) {
               const trace$3 = swap_list(trace$2._1);
               throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                        MEL_EXN_ID: $$Error$6,
-                        _1: styp.ptyp_loc,
-                        _2: env,
-                        _3: {
-                          TAG: /* Alias_type_mismatch */7,
-                          _0: trace$3
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$6,
+                    _1: styp.ptyp_loc,
+                    _2: env,
+                    _3: {
+                      TAG: /* Alias_type_mismatch */7,
+                      _0: trace$3
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(trace$2.MEL_EXN_ID, trace$2);
           }
@@ -60958,14 +60958,14 @@ function transl_type(env, policy, styp) {
               if (trace$4.MEL_EXN_ID === Unify) {
                 const trace$5 = swap_list(trace$4._1);
                 throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                          MEL_EXN_ID: $$Error$6,
-                          _1: styp.ptyp_loc,
-                          _2: env,
-                          _3: {
-                            TAG: /* Alias_type_mismatch */7,
-                            _0: trace$5
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$6,
+                      _1: styp.ptyp_loc,
+                      _2: env,
+                      _3: {
+                        TAG: /* Alias_type_mismatch */7,
+                        _0: trace$5
+                      }
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(trace$4.MEL_EXN_ID, trace$4);
             }
@@ -61016,10 +61016,10 @@ function transl_type(env, policy, styp) {
           }
         }
         return ctyp({
-                    TAG: /* Ttyp_alias */6,
-                    _0: cty,
-                    _1: alias
-                  }, cty.ctyp_type);
+              TAG: /* Ttyp_alias */6,
+              _0: cty,
+              _1: alias
+            }, cty.ctyp_type);
     case /* Ptyp_variant */7 :
         const present = name._2;
         const closed = name._1;
@@ -61054,15 +61054,15 @@ function transl_type(env, policy, styp) {
             const l$p = match[0];
             if (l !== l$p) {
               throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                        MEL_EXN_ID: $$Error$6,
-                        _1: styp.ptyp_loc,
-                        _2: env,
-                        _3: {
-                          TAG: /* Variant_tags */12,
-                          _0: l,
-                          _1: l$p
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$6,
+                    _1: styp.ptyp_loc,
+                    _2: env,
+                    _3: {
+                      TAG: /* Variant_tags */12,
+                      _0: l,
+                      _1: l$p
+                    }
+                  });
             }
             const ty = mkfield(l, f);
             const ty$p = mkfield(l, match[1]);
@@ -61082,15 +61082,15 @@ function transl_type(env, policy, styp) {
               const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
               if (trace.MEL_EXN_ID === Unify) {
                 throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                          MEL_EXN_ID: $$Error$6,
-                          _1: loc,
-                          _2: env,
-                          _3: {
-                            TAG: /* Constructor_mismatch */10,
-                            _0: ty,
-                            _1: ty$p
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$6,
+                      _1: loc,
+                      _2: env,
+                      _3: {
+                        TAG: /* Constructor_mismatch */10,
+                        _0: ty,
+                        _1: ty$p
+                      }
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
             }
@@ -61099,9 +61099,9 @@ function transl_type(env, policy, styp) {
             const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn.MEL_EXN_ID === Stdlib.Not_found) {
               return Stdlib__Hashtbl.add(hfields, h, [
-                          l,
-                          f
-                        ]);
+                    l,
+                    f
+                  ]);
             }
             throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
           }
@@ -61136,31 +61136,31 @@ function transl_type(env, policy, styp) {
             if (exit === 1) {
               if (Stdlib__List.length(stl) > 1 || c && Caml_obj.caml_notequal(stl, /* [] */0)) {
                 throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                          MEL_EXN_ID: $$Error$6,
-                          _1: styp.ptyp_loc,
-                          _2: env,
-                          _3: {
-                            TAG: /* Present_has_conjunction */8,
-                            _0: l
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$6,
+                      _1: styp.ptyp_loc,
+                      _2: env,
+                      _3: {
+                        TAG: /* Present_has_conjunction */8,
+                        _0: l
+                      }
+                    });
               }
               f = tl ? ({
-                    TAG: /* Rpresent */0,
-                    _0: tl.hd.ctyp_type
-                  }) : ({
-                    TAG: /* Rpresent */0,
-                    _0: undefined
-                  });
+                  TAG: /* Rpresent */0,
+                  _0: tl.hd.ctyp_type
+                }) : ({
+                  TAG: /* Rpresent */0,
+                  _0: undefined
+                });
             }
             add_typed_field(styp.ptyp_loc, l, f);
             return {
-                    TAG: /* Ttag */0,
-                    _0: l,
-                    _1: sty._1,
-                    _2: c,
-                    _3: tl
-                  };
+              TAG: /* Ttag */0,
+              _0: l,
+              _1: sty._1,
+              _2: c,
+              _3: tl
+            };
           }
           const sty$1 = sty._0;
           const cty = transl_type(env, policy, sty$1);
@@ -61175,8 +61175,8 @@ function transl_type(env, policy, styp) {
           try {
             Stdlib__Hashtbl.iter((function (param, param$1) {
                     throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                              MEL_EXN_ID: Stdlib.Exit
-                            });
+                          MEL_EXN_ID: Stdlib.Exit
+                        });
                   }), hfields);
             name$2.contents = nm;
           }
@@ -61199,14 +61199,14 @@ function transl_type(env, policy, styp) {
               case /* Tvar */0 :
                   if (nm !== undefined) {
                     throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                              MEL_EXN_ID: $$Error$6,
-                              _1: sty$1.ptyp_loc,
-                              _2: env,
-                              _3: {
-                                TAG: /* Unbound_type_constructor_2 */2,
-                                _0: nm[0]
-                              }
-                            });
+                          MEL_EXN_ID: $$Error$6,
+                          _1: sty$1.ptyp_loc,
+                          _2: env,
+                          _3: {
+                            TAG: /* Unbound_type_constructor_2 */2,
+                            _0: nm[0]
+                          }
+                        });
                   }
                   exit$1 = 1;
                   break;
@@ -61224,14 +61224,14 @@ function transl_type(env, policy, styp) {
           }
           if (exit$1 === 1) {
             throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                      MEL_EXN_ID: $$Error$6,
-                      _1: sty$1.ptyp_loc,
-                      _2: env,
-                      _3: {
-                        TAG: /* Not_a_variant */11,
-                        _0: ty
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$6,
+                  _1: sty$1.ptyp_loc,
+                  _2: env,
+                  _3: {
+                    TAG: /* Not_a_variant */11,
+                    _0: ty
+                  }
+                });
           }
           Stdlib__List.iter((function (param) {
                   const f = param[1];
@@ -61240,45 +61240,45 @@ function transl_type(env, policy, styp) {
                   if (present !== undefined && !Stdlib__List.mem(l, present)) {
                     if (/* tag */typeof f === "number" || typeof f === "string") {
                       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                MEL_EXN_ID: "Assert_failure",
-                                _1: [
-                                  "jscomp/test/ocaml_typedtree_test.ml",
-                                  41862,
-                                  24
-                                ]
-                              });
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "jscomp/test/ocaml_typedtree_test.ml",
+                              41862,
+                              24
+                            ]
+                          });
                     }
                     if (f.TAG === /* Rpresent */0) {
                       const ty = f._0;
                       f$1 = ty !== undefined ? ({
-                            TAG: /* Reither */1,
-                            _0: false,
-                            _1: {
-                              hd: ty,
-                              tl: /* [] */0
-                            },
-                            _2: false,
-                            _3: {
-                              contents: undefined
-                            }
-                          }) : ({
-                            TAG: /* Reither */1,
-                            _0: true,
-                            _1: /* [] */0,
-                            _2: false,
-                            _3: {
-                              contents: undefined
-                            }
-                          });
+                          TAG: /* Reither */1,
+                          _0: false,
+                          _1: {
+                            hd: ty,
+                            tl: /* [] */0
+                          },
+                          _2: false,
+                          _3: {
+                            contents: undefined
+                          }
+                        }) : ({
+                          TAG: /* Reither */1,
+                          _0: true,
+                          _1: /* [] */0,
+                          _2: false,
+                          _3: {
+                            contents: undefined
+                          }
+                        });
                     } else {
                       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                MEL_EXN_ID: "Assert_failure",
-                                _1: [
-                                  "jscomp/test/ocaml_typedtree_test.ml",
-                                  41862,
-                                  24
-                                ]
-                              });
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "jscomp/test/ocaml_typedtree_test.ml",
+                              41862,
+                              24
+                            ]
+                          });
                     }
                   } else {
                     f$1 = f;
@@ -61286,16 +61286,16 @@ function transl_type(env, policy, styp) {
                   add_typed_field(sty$1.ptyp_loc, l, f$1);
                 }), fl);
           return {
-                  TAG: /* Tinherit */1,
-                  _0: cty
-                };
+            TAG: /* Tinherit */1,
+            _0: cty
+          };
         };
         const tfields = Stdlib__List.map(add_field, name._0);
         const fields$2 = Stdlib__Hashtbl.fold((function (param, p, l) {
                 return {
-                        hd: p,
-                        tl: l
-                      };
+                  hd: p,
+                  tl: l
+                };
               }), hfields, /* [] */0);
         if (present !== undefined) {
           Stdlib__List.iter((function (l) {
@@ -61303,14 +61303,14 @@ function transl_type(env, policy, styp) {
                     return ;
                   }
                   throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                            MEL_EXN_ID: $$Error$6,
-                            _1: styp.ptyp_loc,
-                            _2: env,
-                            _3: {
-                              TAG: /* Present_has_no_type */9,
-                              _0: l
-                            }
-                          });
+                        MEL_EXN_ID: $$Error$6,
+                        _1: styp.ptyp_loc,
+                        _2: env,
+                        _3: {
+                          TAG: /* Present_has_no_type */9,
+                          _0: l
+                        }
+                      });
                 }), present);
         }
         const row_row_fields = Stdlib__List.rev(fields$2);
@@ -61327,40 +61327,40 @@ function transl_type(env, policy, styp) {
         };
         const $$static$1 = static_row(row$4);
         const row$5 = $$static$1 ? ({
-              row_fields: row_row_fields,
-              row_more: newty2(current_level.contents, /* Tnil */0),
-              row_bound: undefined,
-              row_closed: row_row_closed,
-              row_fixed: false,
-              row_name: row_row_name$1
-            }) : (
+            row_fields: row_row_fields,
+            row_more: newty2(current_level.contents, /* Tnil */0),
+            row_bound: undefined,
+            row_closed: row_row_closed,
+            row_fixed: false,
+            row_name: row_row_name$1
+          }) : (
             policy !== /* Univars */2 ? row$4 : ({
-                  row_fields: row_row_fields,
-                  row_more: new_pre_univar(undefined, undefined),
-                  row_bound: undefined,
-                  row_closed: row_row_closed,
-                  row_fixed: false,
-                  row_name: row_row_name$1
-                })
+                row_fields: row_row_fields,
+                row_more: new_pre_univar(undefined, undefined),
+                row_bound: undefined,
+                row_closed: row_row_closed,
+                row_fixed: false,
+                row_name: row_row_name$1
+              })
           );
         const ty$10 = newty2(current_level.contents, {
               TAG: /* Tvariant */8,
               _0: row$5
             });
         return ctyp({
-                    TAG: /* Ttyp_variant */7,
-                    _0: tfields,
-                    _1: closed,
-                    _2: present
-                  }, ty$10);
+              TAG: /* Ttyp_variant */7,
+              _0: tfields,
+              _1: closed,
+              _2: present
+            }, ty$10);
     case /* Ptyp_poly */8 :
         const vars = name._0;
         begin_def(undefined);
         const new_univars = Stdlib__List.map((function (name) {
                 return [
-                        name,
-                        newvar(validate_name(name), undefined)
-                      ];
+                  name,
+                  newvar(validate_name(name), undefined)
+                ];
               }), vars);
         const old_univars = univars.contents;
         univars.contents = Stdlib.$at(new_univars, univars.contents);
@@ -61383,20 +61383,20 @@ function transl_type(env, policy, styp) {
                     _0: name._0
                   };
                   return {
-                          hd: v,
-                          tl: tyl
-                        };
+                    hd: v,
+                    tl: tyl
+                  };
                 }
                 throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                          MEL_EXN_ID: $$Error$6,
-                          _1: styp.ptyp_loc,
-                          _2: env,
-                          _3: {
-                            TAG: /* Cannot_quantify */14,
-                            _0: param[0],
-                            _1: v
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$6,
+                      _1: styp.ptyp_loc,
+                      _2: env,
+                      _3: {
+                        TAG: /* Cannot_quantify */14,
+                        _0: param[0],
+                        _1: v
+                      }
+                    });
               }), /* [] */0, new_univars);
         const ty$p = newty2(100000000, {
               TAG: /* Tpoly */10,
@@ -61405,10 +61405,10 @@ function transl_type(env, policy, styp) {
             });
         unify_var(env, newvar(validate_name(undefined), undefined), ty$p);
         return ctyp({
-                    TAG: /* Ttyp_poly */8,
-                    _0: vars,
-                    _1: cty$1
-                  }, ty$p);
+              TAG: /* Ttyp_poly */8,
+              _0: vars,
+              _1: cty$1
+            }, ty$p);
     case /* Ptyp_package */9 :
         const match$6 = name._0;
         const p = match$6[0];
@@ -61422,9 +61422,9 @@ function transl_type(env, policy, styp) {
         widen(z);
         const ptys = Stdlib__List.map((function (param) {
                 return [
-                        param[0],
-                        transl_type(env, policy, param[1])
-                      ];
+                  param[0],
+                  transl_type(env, policy, param[1])
+                ];
               }), l$1);
         const path$2 = Curry._3(transl_modtype_longident.contents, styp.ptyp_loc, env, p.txt);
         const desc_1 = Stdlib__List.map((function (param) {
@@ -61441,19 +61441,19 @@ function transl_type(env, policy, styp) {
         };
         const ty$12 = newty2(current_level.contents, desc$1);
         return ctyp({
-                    TAG: /* Ttyp_package */9,
-                    _0: {
-                      pack_path: path$2,
-                      pack_fields: ptys,
-                      pack_type: mty.mty_type,
-                      pack_txt: p
-                    }
-                  }, ty$12);
+              TAG: /* Ttyp_package */9,
+              _0: {
+                pack_path: path$2,
+                pack_fields: ptys,
+                pack_type: mty.mty_type,
+                pack_txt: p
+              }
+            }, ty$12);
     case /* Ptyp_extension */10 :
         throw new Caml_js_exceptions.MelangeError(Error_forward, {
-                  MEL_EXN_ID: Error_forward,
-                  _1: error_of_extension(name._0)
-                });
+              MEL_EXN_ID: Error_forward,
+              _1: error_of_extension(name._0)
+            });
     
   }
 }
@@ -61468,26 +61468,26 @@ function transl_fields(loc, env, policy, seen, o, param) {
     const s = match[0];
     if (Stdlib__List.mem(s, seen)) {
       throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                MEL_EXN_ID: $$Error$6,
-                _1: loc,
-                _2: env,
-                _3: {
-                  TAG: /* Repeated_method_label */16,
-                  _0: s
-                }
-              });
+            MEL_EXN_ID: $$Error$6,
+            _1: loc,
+            _2: env,
+            _3: {
+              TAG: /* Repeated_method_label */16,
+              _0: s
+            }
+          });
     }
     const ty2 = transl_fields(loc, env, policy, {
           hd: s,
           tl: seen
         }, o, param.tl);
     return newty2(current_level.contents, {
-                TAG: /* Tfield */5,
-                _0: s,
-                _1: /* Fpresent */0,
-                _2: match[2].ctyp_type,
-                _3: ty2
-              });
+          TAG: /* Tfield */5,
+          _0: s,
+          _1: /* Fpresent */0,
+          _2: match[2].ctyp_type,
+          _3: ty2
+        });
   }
   if (o === /* Closed */0) {
     return newty2(current_level.contents, /* Tnil */0);
@@ -61526,15 +61526,15 @@ function make_fixed_univars(ty) {
                   return p;
                 } else {
                   return [
-                          p[0],
-                          {
-                            TAG: /* Reither */1,
-                            _0: match._0,
-                            _1: match._1,
-                            _2: true,
-                            _3: match._3
-                          }
-                        ];
+                    p[0],
+                    {
+                      TAG: /* Reither */1,
+                      _0: match._0,
+                      _1: match._1,
+                      _2: true,
+                      _3: match._3
+                    }
+                  ];
                 }
               }), row$1.row_fields),
         row_more: row$1.row_more,
@@ -61585,14 +61585,14 @@ function globalize_used_variables(env, fixed) {
             if (exn$1.MEL_EXN_ID === Stdlib.Not_found) {
               if (fixed && is_Tvar(repr(ty))) {
                 throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                          MEL_EXN_ID: $$Error$6,
-                          _1: loc,
-                          _2: env,
-                          _3: {
-                            TAG: /* Unbound_type_variable */0,
-                            _0: "'" + name
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$6,
+                      _1: loc,
+                      _2: env,
+                      _3: {
+                        TAG: /* Unbound_type_variable */0,
+                        _0: "'" + name
+                      }
+                    });
               }
               const v2 = new_global_var(validate_name(undefined), undefined);
               r.contents = {
@@ -61619,14 +61619,14 @@ function globalize_used_variables(env, fixed) {
               const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
               if (trace.MEL_EXN_ID === Unify) {
                 throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                          MEL_EXN_ID: $$Error$6,
-                          _1: param[0],
-                          _2: env,
-                          _3: {
-                            TAG: /* Type_mismatch */6,
-                            _0: trace._1
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$6,
+                      _1: param[0],
+                      _2: env,
+                      _3: {
+                        TAG: /* Type_mismatch */6,
+                        _0: trace._1
+                      }
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
             }
@@ -61676,25 +61676,25 @@ function transl_simple_type_univars(env, styp) {
               _0: name._0
             };
             return {
-                    hd: v$1,
-                    tl: acc
-                  };
+              hd: v$1,
+              tl: acc
+            };
           }
         }), /* [] */0, pre_univars.contents);
   const ty = typ.ctyp_type;
   make_fixed_univars(ty);
   unmark_type(ty);
   return {
-          ctyp_desc: typ.ctyp_desc,
-          ctyp_type: instance(undefined, env, newty2(100000000, {
-                    TAG: /* Tpoly */10,
-                    _0: typ.ctyp_type,
-                    _1: univs
-                  })),
-          ctyp_env: typ.ctyp_env,
-          ctyp_loc: typ.ctyp_loc,
-          ctyp_attributes: typ.ctyp_attributes
-        };
+    ctyp_desc: typ.ctyp_desc,
+    ctyp_type: instance(undefined, env, newty2(100000000, {
+              TAG: /* Tpoly */10,
+              _0: typ.ctyp_type,
+              _1: univs
+            })),
+    ctyp_env: typ.ctyp_env,
+    ctyp_loc: typ.ctyp_loc,
+    ctyp_attributes: typ.ctyp_attributes
+  };
 }
 
 function transl_simple_type_delayed(env, styp) {
@@ -61705,9 +61705,9 @@ function transl_simple_type_delayed(env, styp) {
   make_fixed_univars(ty);
   unmark_type(ty);
   return [
-          typ,
-          globalize_used_variables(env, false)
-        ];
+    typ,
+    globalize_used_variables(env, false)
+  ];
 }
 
 function transl_type_scheme(env, styp) {
@@ -61734,23 +61734,23 @@ function spellcheck(ppf, fold, env, lid) {
     const dist = edit_distance(target, head, cutoff);
     if (dist === undefined) {
       return [
-              best_choice,
-              best_dist
-            ];
+        best_choice,
+        best_dist
+      ];
     }
     const choice = dist < best_dist ? ({
-          hd: head,
-          tl: /* [] */0
-        }) : (
+        hd: head,
+        tl: /* [] */0
+      }) : (
         dist === best_dist ? ({
-              hd: head,
-              tl: best_choice
-            }) : best_choice
+            hd: head,
+            tl: best_choice
+          }) : best_choice
       );
     return [
-            choice,
-            dist < best_dist ? dist : best_dist
-          ];
+      choice,
+      dist < best_dist ? dist : best_dist
+    ];
   };
   const init = [
     /* [] */0,
@@ -61805,13 +61805,13 @@ function spellcheck(ppf, fold, env, lid) {
     case /* Lident */0 :
         const s = lid._0;
         return handle(Curry._4(fold, (function (param, param$1) {
-                          return compare(s, param, param$1);
-                        }), undefined, env, init));
+                    return compare(s, param, param$1);
+                  }), undefined, env, init));
     case /* Ldot */1 :
         const s$1 = lid._1;
         return handle(Curry._4(fold, (function (param, param$1) {
-                          return compare(s$1, param, param$1);
-                        }), lid._0, env, init));
+                    return compare(s$1, param, param$1);
+                  }), lid._0, env, init));
     case /* Lapply */2 :
         return ;
     
@@ -61821,20 +61821,20 @@ function spellcheck(ppf, fold, env, lid) {
 function spellcheck_simple(ppf, fold, extr) {
   return function (param, param$1) {
     return spellcheck(ppf, (function (f) {
-                  return Curry._1(fold, (function (decl, x) {
-                                return Curry._2(f, Curry._1(extr, decl), x);
-                              }));
-                }), param, param$1);
+            return Curry._1(fold, (function (decl, x) {
+                    return Curry._2(f, Curry._1(extr, decl), x);
+                  }));
+          }), param, param$1);
   };
 }
 
 function spellcheck$1(ppf, fold) {
   return function (param, param$1) {
     return spellcheck(ppf, (function (f) {
-                  return Curry._1(fold, (function (s, param, param$1, x) {
-                                return Curry._2(f, s, x);
-                              }));
-                }), param, param$1);
+            return Curry._1(fold, (function (s, param, param$1, x) {
+                    return Curry._2(f, s, x);
+                  }));
+          }), param, param$1);
   };
 }
 
@@ -61848,69 +61848,135 @@ register_error_of_exn(function (err) {
       }
       const env = err._2;
       return error_of_printer(err._1, (function (param, param$1) {
-                    if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
-                      if (param$1 === /* Recursive_type */0) {
-                        return Stdlib__Format.fprintf(param)({
-                                    TAG: /* Format */0,
-                                    _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: "This type is recursive",
-                                      _1: /* End_of_format */0
-                                    },
-                                    _1: "This type is recursive"
-                                  });
-                      } else {
-                        return Stdlib__Format.fprintf(param)({
-                                    TAG: /* Format */0,
+              if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
+                if (param$1 === /* Recursive_type */0) {
+                  return Stdlib__Format.fprintf(param)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: "This type is recursive",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "This type is recursive"
+                      });
+                } else {
+                  return Stdlib__Format.fprintf(param)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: "Illegal recursive module reference",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "Illegal recursive module reference"
+                      });
+                }
+              }
+              switch (param$1.TAG) {
+                case /* Unbound_type_variable */0 :
+                    return Curry._1(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "Unbound type parameter ",
+                                _1: {
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
+                                  _1: {
+                                    TAG: /* Formatting_lit */17,
+                                    _0: /* Flush_newline */4,
+                                    _1: /* End_of_format */0
+                                  }
+                                }
+                              },
+                              _1: "Unbound type parameter %s@."
+                            }), param$1._0);
+                case /* Unbound_type_constructor */1 :
+                    const lid = param$1._0;
+                    Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "Unbound type constructor ",
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: /* End_of_format */0
+                                }
+                              },
+                              _1: "Unbound type constructor %a"
+                            }), longident, lid);
+                    return spellcheck$1(param, fold_types)(env, lid);
+                case /* Unbound_type_constructor_2 */2 :
+                    return Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "The type constructor",
+                                _1: {
+                                  TAG: /* Formatting_lit */17,
+                                  _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@ ",
+                                    _1: 1,
+                                    _2: 0
+                                  },
+                                  _1: {
+                                    TAG: /* Alpha */15,
                                     _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: "Illegal recursive module reference",
-                                      _1: /* End_of_format */0
-                                    },
-                                    _1: "Illegal recursive module reference"
-                                  });
-                      }
-                    }
-                    switch (param$1.TAG) {
-                      case /* Unbound_type_variable */0 :
-                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: "Unbound type parameter ",
-                                            _1: {
-                                              TAG: /* String */2,
-                                              _0: /* No_padding */0,
-                                              _1: {
-                                                TAG: /* Formatting_lit */17,
-                                                _0: /* Flush_newline */4,
-                                                _1: /* End_of_format */0
-                                              }
-                                            }
-                                          },
-                                          _1: "Unbound type parameter %s@."
-                                        }), param$1._0);
-                      case /* Unbound_type_constructor */1 :
-                          const lid = param$1._0;
-                          Curry._2(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Formatting_lit */17,
+                                      _0: {
+                                        TAG: /* Break */0,
+                                        _0: "@ ",
+                                        _1: 1,
+                                        _2: 0
+                                      },
+                                      _1: {
+                                        TAG: /* String_literal */11,
+                                        _0: "is not yet completely defined",
+                                        _1: /* End_of_format */0
+                                      }
+                                    }
+                                  }
+                                }
+                              },
+                              _1: "The type constructor@ %a@ is not yet completely defined"
+                            }), path, param$1._0);
+                case /* Type_arity_mismatch */3 :
+                    return Curry._4(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* Formatting_gen */18,
+                                _0: {
+                                  TAG: /* Open_box */1,
+                                  _0: {
                                     TAG: /* Format */0,
+                                    _0: /* End_of_format */0,
+                                    _1: ""
+                                  }
+                                },
+                                _1: {
+                                  TAG: /* String_literal */11,
+                                  _0: "The type constructor ",
+                                  _1: {
+                                    TAG: /* Alpha */15,
                                     _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: "Unbound type constructor ",
+                                      TAG: /* Formatting_lit */17,
+                                      _0: {
+                                        TAG: /* Break */0,
+                                        _0: "@ ",
+                                        _1: 1,
+                                        _2: 0
+                                      },
                                       _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: /* End_of_format */0
-                                      }
-                                    },
-                                    _1: "Unbound type constructor %a"
-                                  }), longident, lid);
-                          return spellcheck$1(param, fold_types)(env, lid);
-                      case /* Unbound_type_constructor_2 */2 :
-                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
-                                          _0: {
+                                        TAG: /* String_literal */11,
+                                        _0: "expects ",
+                                        _1: {
+                                          TAG: /* Int */4,
+                                          _0: /* Int_i */3,
+                                          _1: /* No_padding */0,
+                                          _2: /* No_precision */0,
+                                          _3: {
                                             TAG: /* String_literal */11,
-                                            _0: "The type constructor",
+                                            _0: " argument(s),",
                                             _1: {
                                               TAG: /* Formatting_lit */17,
                                               _0: {
@@ -61920,431 +61986,187 @@ register_error_of_exn(function (err) {
                                                 _2: 0
                                               },
                                               _1: {
-                                                TAG: /* Alpha */15,
-                                                _0: {
-                                                  TAG: /* Formatting_lit */17,
-                                                  _0: {
-                                                    TAG: /* Break */0,
-                                                    _0: "@ ",
-                                                    _1: 1,
-                                                    _2: 0
-                                                  },
-                                                  _1: {
+                                                TAG: /* String_literal */11,
+                                                _0: "but is here applied to ",
+                                                _1: {
+                                                  TAG: /* Int */4,
+                                                  _0: /* Int_i */3,
+                                                  _1: /* No_padding */0,
+                                                  _2: /* No_precision */0,
+                                                  _3: {
                                                     TAG: /* String_literal */11,
-                                                    _0: "is not yet completely defined",
-                                                    _1: /* End_of_format */0
+                                                    _0: " argument(s)",
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: /* Close_box */0,
+                                                      _1: /* End_of_format */0
+                                                    }
                                                   }
                                                 }
                                               }
                                             }
-                                          },
-                                          _1: "The type constructor@ %a@ is not yet completely defined"
-                                        }), path, param$1._0);
-                      case /* Type_arity_mismatch */3 :
-                          return Curry._4(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              },
+                              _1: "@[The type constructor %a@ expects %i argument(s),@ but is here applied to %i argument(s)@]"
+                            }), longident, param$1._0, param$1._1, param$1._2);
+                case /* Bound_type_variable */4 :
+                    return Curry._1(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "Already bound type parameter '",
+                                _1: {
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
+                                  _1: /* End_of_format */0
+                                }
+                              },
+                              _1: "Already bound type parameter '%s"
+                            }), param$1._0);
+                case /* Unbound_row_variable */5 :
+                    return Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "Unbound row variable in #",
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: /* End_of_format */0
+                                }
+                              },
+                              _1: "Unbound row variable in #%a"
+                            }), longident, param$1._0);
+                case /* Type_mismatch */6 :
+                    return report_unification_error(param, empty, undefined, param$1._0, (function (ppf) {
+                            Stdlib__Format.fprintf(ppf)({
+                                  TAG: /* Format */0,
+                                  _0: {
+                                    TAG: /* String_literal */11,
+                                    _0: "This type",
+                                    _1: /* End_of_format */0
+                                  },
+                                  _1: "This type"
+                                });
+                          }), (function (ppf) {
+                            Stdlib__Format.fprintf(ppf)({
+                                  TAG: /* Format */0,
+                                  _0: {
+                                    TAG: /* String_literal */11,
+                                    _0: "should be an instance of type",
+                                    _1: /* End_of_format */0
+                                  },
+                                  _1: "should be an instance of type"
+                                });
+                          }));
+                case /* Alias_type_mismatch */7 :
+                    return report_unification_error(param, empty, undefined, param$1._0, (function (ppf) {
+                            Stdlib__Format.fprintf(ppf)({
+                                  TAG: /* Format */0,
+                                  _0: {
+                                    TAG: /* String_literal */11,
+                                    _0: "This alias is bound to type",
+                                    _1: /* End_of_format */0
+                                  },
+                                  _1: "This alias is bound to type"
+                                });
+                          }), (function (ppf) {
+                            Stdlib__Format.fprintf(ppf)({
+                                  TAG: /* Format */0,
+                                  _0: {
+                                    TAG: /* String_literal */11,
+                                    _0: "but is used as an instance of type",
+                                    _1: /* End_of_format */0
+                                  },
+                                  _1: "but is used as an instance of type"
+                                });
+                          }));
+                case /* Present_has_conjunction */8 :
+                    return Curry._1(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "The present constructor ",
+                                _1: {
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
+                                  _1: {
+                                    TAG: /* String_literal */11,
+                                    _0: " has a conjunctive type",
+                                    _1: /* End_of_format */0
+                                  }
+                                }
+                              },
+                              _1: "The present constructor %s has a conjunctive type"
+                            }), param$1._0);
+                case /* Present_has_no_type */9 :
+                    return Curry._1(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "The present constructor ",
+                                _1: {
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
+                                  _1: {
+                                    TAG: /* String_literal */11,
+                                    _0: " has no type",
+                                    _1: /* End_of_format */0
+                                  }
+                                }
+                              },
+                              _1: "The present constructor %s has no type"
+                            }), param$1._0);
+                case /* Constructor_mismatch */10 :
+                    const ty$p = param$1._1;
+                    const ty = param$1._0;
+                    return wrap_printing_env(env, (function (param$2) {
+                            reset_and_mark_loops_list({
+                                  hd: ty,
+                                  tl: {
+                                    hd: ty$p,
+                                    tl: /* [] */0
+                                  }
+                                });
+                            Curry._6(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
                                           _0: {
-                                            TAG: /* Formatting_gen */18,
+                                            TAG: /* Format */0,
                                             _0: {
-                                              TAG: /* Open_box */1,
-                                              _0: {
-                                                TAG: /* Format */0,
-                                                _0: /* End_of_format */0,
-                                                _1: ""
-                                              }
+                                              TAG: /* String_literal */11,
+                                              _0: "<hov>",
+                                              _1: /* End_of_format */0
                                             },
+                                            _1: "<hov>"
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* String */2,
+                                          _0: /* No_padding */0,
+                                          _1: {
+                                            TAG: /* Char_literal */12,
+                                            _0: /* ' ' */32,
                                             _1: {
-                                              TAG: /* String_literal */11,
-                                              _0: "The type constructor ",
-                                              _1: {
-                                                TAG: /* Alpha */15,
+                                              TAG: /* Alpha */15,
+                                              _0: {
+                                                TAG: /* Formatting_lit */17,
                                                 _0: {
-                                                  TAG: /* Formatting_lit */17,
-                                                  _0: {
-                                                    TAG: /* Break */0,
-                                                    _0: "@ ",
-                                                    _1: 1,
-                                                    _2: 0
-                                                  },
-                                                  _1: {
-                                                    TAG: /* String_literal */11,
-                                                    _0: "expects ",
-                                                    _1: {
-                                                      TAG: /* Int */4,
-                                                      _0: /* Int_i */3,
-                                                      _1: /* No_padding */0,
-                                                      _2: /* No_precision */0,
-                                                      _3: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: " argument(s),",
-                                                        _1: {
-                                                          TAG: /* Formatting_lit */17,
-                                                          _0: {
-                                                            TAG: /* Break */0,
-                                                            _0: "@ ",
-                                                            _1: 1,
-                                                            _2: 0
-                                                          },
-                                                          _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "but is here applied to ",
-                                                            _1: {
-                                                              TAG: /* Int */4,
-                                                              _0: /* Int_i */3,
-                                                              _1: /* No_padding */0,
-                                                              _2: /* No_precision */0,
-                                                              _3: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " argument(s)",
-                                                                _1: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: /* Close_box */0,
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          },
-                                          _1: "@[The type constructor %a@ expects %i argument(s),@ but is here applied to %i argument(s)@]"
-                                        }), longident, param$1._0, param$1._1, param$1._2);
-                      case /* Bound_type_variable */4 :
-                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: "Already bound type parameter '",
-                                            _1: {
-                                              TAG: /* String */2,
-                                              _0: /* No_padding */0,
-                                              _1: /* End_of_format */0
-                                            }
-                                          },
-                                          _1: "Already bound type parameter '%s"
-                                        }), param$1._0);
-                      case /* Unbound_row_variable */5 :
-                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: "Unbound row variable in #",
-                                            _1: {
-                                              TAG: /* Alpha */15,
-                                              _0: /* End_of_format */0
-                                            }
-                                          },
-                                          _1: "Unbound row variable in #%a"
-                                        }), longident, param$1._0);
-                      case /* Type_mismatch */6 :
-                          return report_unification_error(param, empty, undefined, param$1._0, (function (ppf) {
-                                        Stdlib__Format.fprintf(ppf)({
-                                              TAG: /* Format */0,
-                                              _0: {
-                                                TAG: /* String_literal */11,
-                                                _0: "This type",
-                                                _1: /* End_of_format */0
-                                              },
-                                              _1: "This type"
-                                            });
-                                      }), (function (ppf) {
-                                        Stdlib__Format.fprintf(ppf)({
-                                              TAG: /* Format */0,
-                                              _0: {
-                                                TAG: /* String_literal */11,
-                                                _0: "should be an instance of type",
-                                                _1: /* End_of_format */0
-                                              },
-                                              _1: "should be an instance of type"
-                                            });
-                                      }));
-                      case /* Alias_type_mismatch */7 :
-                          return report_unification_error(param, empty, undefined, param$1._0, (function (ppf) {
-                                        Stdlib__Format.fprintf(ppf)({
-                                              TAG: /* Format */0,
-                                              _0: {
-                                                TAG: /* String_literal */11,
-                                                _0: "This alias is bound to type",
-                                                _1: /* End_of_format */0
-                                              },
-                                              _1: "This alias is bound to type"
-                                            });
-                                      }), (function (ppf) {
-                                        Stdlib__Format.fprintf(ppf)({
-                                              TAG: /* Format */0,
-                                              _0: {
-                                                TAG: /* String_literal */11,
-                                                _0: "but is used as an instance of type",
-                                                _1: /* End_of_format */0
-                                              },
-                                              _1: "but is used as an instance of type"
-                                            });
-                                      }));
-                      case /* Present_has_conjunction */8 :
-                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: "The present constructor ",
-                                            _1: {
-                                              TAG: /* String */2,
-                                              _0: /* No_padding */0,
-                                              _1: {
-                                                TAG: /* String_literal */11,
-                                                _0: " has a conjunctive type",
-                                                _1: /* End_of_format */0
-                                              }
-                                            }
-                                          },
-                                          _1: "The present constructor %s has a conjunctive type"
-                                        }), param$1._0);
-                      case /* Present_has_no_type */9 :
-                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: "The present constructor ",
-                                            _1: {
-                                              TAG: /* String */2,
-                                              _0: /* No_padding */0,
-                                              _1: {
-                                                TAG: /* String_literal */11,
-                                                _0: " has no type",
-                                                _1: /* End_of_format */0
-                                              }
-                                            }
-                                          },
-                                          _1: "The present constructor %s has no type"
-                                        }), param$1._0);
-                      case /* Constructor_mismatch */10 :
-                          const ty$p = param$1._1;
-                          const ty = param$1._0;
-                          return wrap_printing_env(env, (function (param$2) {
-                                        reset_and_mark_loops_list({
-                                              hd: ty,
-                                              tl: {
-                                                hd: ty$p,
-                                                tl: /* [] */0
-                                              }
-                                            });
-                                        Curry._6(Stdlib__Format.fprintf(param)({
-                                                  TAG: /* Format */0,
-                                                  _0: {
-                                                    TAG: /* Formatting_gen */18,
-                                                    _0: {
-                                                      TAG: /* Open_box */1,
-                                                      _0: {
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "<hov>",
-                                                          _1: /* End_of_format */0
-                                                        },
-                                                        _1: "<hov>"
-                                                      }
-                                                    },
-                                                    _1: {
-                                                      TAG: /* String */2,
-                                                      _0: /* No_padding */0,
-                                                      _1: {
-                                                        TAG: /* Char_literal */12,
-                                                        _0: /* ' ' */32,
-                                                        _1: {
-                                                          TAG: /* Alpha */15,
-                                                          _0: {
-                                                            TAG: /* Formatting_lit */17,
-                                                            _0: {
-                                                              TAG: /* Break */0,
-                                                              _0: "@ ",
-                                                              _1: 1,
-                                                              _2: 0
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Alpha */15,
-                                                                  _0: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: /* Close_box */0,
-                                                                    _1: /* End_of_format */0
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  },
-                                                  _1: "@[<hov>%s %a@ %s@ %a@]"
-                                                }), "This variant type contains a constructor", type_expr$1, ty, "which should be", type_expr$1, ty$p);
-                                      }));
-                      case /* Not_a_variant */11 :
-                          const ty$1 = param$1._0;
-                          reset(undefined);
-                          mark_loops(ty$1);
-                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* Formatting_gen */18,
-                                            _0: {
-                                              TAG: /* Open_box */1,
-                                              _0: {
-                                                TAG: /* Format */0,
-                                                _0: /* End_of_format */0,
-                                                _1: ""
-                                              }
-                                            },
-                                            _1: {
-                                              TAG: /* String_literal */11,
-                                              _0: "The type ",
-                                              _1: {
-                                                TAG: /* Alpha */15,
-                                                _0: {
-                                                  TAG: /* Formatting_lit */17,
-                                                  _0: {
-                                                    TAG: /* Break */0,
-                                                    _0: "@ ",
-                                                    _1: 1,
-                                                    _2: 0
-                                                  },
-                                                  _1: {
-                                                    TAG: /* String_literal */11,
-                                                    _0: "is not a polymorphic variant type",
-                                                    _1: {
-                                                      TAG: /* Formatting_lit */17,
-                                                      _0: /* Close_box */0,
-                                                      _1: /* End_of_format */0
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          },
-                                          _1: "@[The type %a@ is not a polymorphic variant type@]"
-                                        }), type_expr$1, ty$1);
-                      case /* Variant_tags */12 :
-                          return Curry._3(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* Formatting_gen */18,
-                                            _0: {
-                                              TAG: /* Open_box */1,
-                                              _0: {
-                                                TAG: /* Format */0,
-                                                _0: /* End_of_format */0,
-                                                _1: ""
-                                              }
-                                            },
-                                            _1: {
-                                              TAG: /* String_literal */11,
-                                              _0: "Variant tags `",
-                                              _1: {
-                                                TAG: /* String */2,
-                                                _0: /* No_padding */0,
-                                                _1: {
-                                                  TAG: /* Formatting_lit */17,
-                                                  _0: {
-                                                    TAG: /* Break */0,
-                                                    _0: "@ ",
-                                                    _1: 1,
-                                                    _2: 0
-                                                  },
-                                                  _1: {
-                                                    TAG: /* String_literal */11,
-                                                    _0: "and `",
-                                                    _1: {
-                                                      TAG: /* String */2,
-                                                      _0: /* No_padding */0,
-                                                      _1: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: " have the same hash value.",
-                                                        _1: {
-                                                          TAG: /* Formatting_lit */17,
-                                                          _0: {
-                                                            TAG: /* Break */0,
-                                                            _0: "@ ",
-                                                            _1: 1,
-                                                            _2: 0
-                                                          },
-                                                          _1: {
-                                                            TAG: /* String */2,
-                                                            _0: /* No_padding */0,
-                                                            _1: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: /* Close_box */0,
-                                                              _1: /* End_of_format */0
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          },
-                                          _1: "@[Variant tags `%s@ and `%s have the same hash value.@ %s@]"
-                                        }), param$1._0, param$1._1, "Change one of them.");
-                      case /* Invalid_variable_name */13 :
-                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: "The type variable name ",
-                                            _1: {
-                                              TAG: /* String */2,
-                                              _0: /* No_padding */0,
-                                              _1: {
-                                                TAG: /* String_literal */11,
-                                                _0: " is not allowed in programs",
-                                                _1: /* End_of_format */0
-                                              }
-                                            }
-                                          },
-                                          _1: "The type variable name %s is not allowed in programs"
-                                        }), param$1._0);
-                      case /* Cannot_quantify */14 :
-                          const v = param$1._1;
-                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* Formatting_gen */18,
-                                            _0: {
-                                              TAG: /* Open_box */1,
-                                              _0: {
-                                                TAG: /* Format */0,
-                                                _0: {
-                                                  TAG: /* String_literal */11,
-                                                  _0: "<hov>",
-                                                  _1: /* End_of_format */0
+                                                  TAG: /* Break */0,
+                                                  _0: "@ ",
+                                                  _1: 1,
+                                                  _2: 0
                                                 },
-                                                _1: "<hov>"
-                                              }
-                                            },
-                                            _1: {
-                                              TAG: /* String_literal */11,
-                                              _0: "The universal type variable '",
-                                              _1: {
-                                                TAG: /* String */2,
-                                                _0: /* No_padding */0,
                                                 _1: {
-                                                  TAG: /* String_literal */11,
-                                                  _0: " cannot be generalized:",
+                                                  TAG: /* String */2,
+                                                  _0: /* No_padding */0,
                                                   _1: {
                                                     TAG: /* Formatting_lit */17,
                                                     _0: {
@@ -62354,228 +62176,406 @@ register_error_of_exn(function (err) {
                                                       _2: 0
                                                     },
                                                     _1: {
-                                                      TAG: /* String */2,
-                                                      _0: /* No_padding */0,
-                                                      _1: {
-                                                        TAG: /* Char_literal */12,
-                                                        _0: /* '.' */46,
-                                                        _1: {
-                                                          TAG: /* Formatting_lit */17,
-                                                          _0: /* Close_box */0,
-                                                          _1: /* End_of_format */0
-                                                        }
+                                                      TAG: /* Alpha */15,
+                                                      _0: {
+                                                        TAG: /* Formatting_lit */17,
+                                                        _0: /* Close_box */0,
+                                                        _1: /* End_of_format */0
                                                       }
                                                     }
                                                   }
                                                 }
                                               }
                                             }
-                                          },
-                                          _1: "@[<hov>The universal type variable '%s cannot be generalized:@ %s.@]"
-                                        }), param$1._0, is_Tvar(v) ? "it escapes its scope" : (
-                                        is_Tunivar(v) ? "it is already bound to another variable" : "it is not a variable"
-                                      ));
-                      case /* Multiple_constraints_on_type */15 :
-                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
-                                          _0: {
+                                          }
+                                        }
+                                      },
+                                      _1: "@[<hov>%s %a@ %s@ %a@]"
+                                    }), "This variant type contains a constructor", type_expr$1, ty, "which should be", type_expr$1, ty$p);
+                          }));
+                case /* Not_a_variant */11 :
+                    const ty$1 = param$1._0;
+                    reset(undefined);
+                    mark_loops(ty$1);
+                    return Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* Formatting_gen */18,
+                                _0: {
+                                  TAG: /* Open_box */1,
+                                  _0: {
+                                    TAG: /* Format */0,
+                                    _0: /* End_of_format */0,
+                                    _1: ""
+                                  }
+                                },
+                                _1: {
+                                  TAG: /* String_literal */11,
+                                  _0: "The type ",
+                                  _1: {
+                                    TAG: /* Alpha */15,
+                                    _0: {
+                                      TAG: /* Formatting_lit */17,
+                                      _0: {
+                                        TAG: /* Break */0,
+                                        _0: "@ ",
+                                        _1: 1,
+                                        _2: 0
+                                      },
+                                      _1: {
+                                        TAG: /* String_literal */11,
+                                        _0: "is not a polymorphic variant type",
+                                        _1: {
+                                          TAG: /* Formatting_lit */17,
+                                          _0: /* Close_box */0,
+                                          _1: /* End_of_format */0
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              },
+                              _1: "@[The type %a@ is not a polymorphic variant type@]"
+                            }), type_expr$1, ty$1);
+                case /* Variant_tags */12 :
+                    return Curry._3(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* Formatting_gen */18,
+                                _0: {
+                                  TAG: /* Open_box */1,
+                                  _0: {
+                                    TAG: /* Format */0,
+                                    _0: /* End_of_format */0,
+                                    _1: ""
+                                  }
+                                },
+                                _1: {
+                                  TAG: /* String_literal */11,
+                                  _0: "Variant tags `",
+                                  _1: {
+                                    TAG: /* String */2,
+                                    _0: /* No_padding */0,
+                                    _1: {
+                                      TAG: /* Formatting_lit */17,
+                                      _0: {
+                                        TAG: /* Break */0,
+                                        _0: "@ ",
+                                        _1: 1,
+                                        _2: 0
+                                      },
+                                      _1: {
+                                        TAG: /* String_literal */11,
+                                        _0: "and `",
+                                        _1: {
+                                          TAG: /* String */2,
+                                          _0: /* No_padding */0,
+                                          _1: {
                                             TAG: /* String_literal */11,
-                                            _0: "Multiple constraints for type ",
+                                            _0: " have the same hash value.",
                                             _1: {
-                                              TAG: /* Alpha */15,
-                                              _0: /* End_of_format */0
-                                            }
-                                          },
-                                          _1: "Multiple constraints for type %a"
-                                        }), longident, param$1._0);
-                      case /* Repeated_method_label */16 :
-                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* Formatting_gen */18,
-                                            _0: {
-                                              TAG: /* Open_box */1,
+                                              TAG: /* Formatting_lit */17,
                                               _0: {
-                                                TAG: /* Format */0,
-                                                _0: /* End_of_format */0,
-                                                _1: ""
-                                              }
-                                            },
-                                            _1: {
-                                              TAG: /* String_literal */11,
-                                              _0: "This is the second method `",
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
                                               _1: {
                                                 TAG: /* String */2,
                                                 _0: /* No_padding */0,
                                                 _1: {
-                                                  TAG: /* String_literal */11,
-                                                  _0: "' of this object type.",
-                                                  _1: {
-                                                    TAG: /* Formatting_lit */17,
-                                                    _0: {
-                                                      TAG: /* Break */0,
-                                                      _0: "@ ",
-                                                      _1: 1,
-                                                      _2: 0
-                                                    },
-                                                    _1: {
-                                                      TAG: /* String */2,
-                                                      _0: /* No_padding */0,
-                                                      _1: {
-                                                        TAG: /* Formatting_lit */17,
-                                                        _0: /* Close_box */0,
-                                                        _1: /* End_of_format */0
-                                                      }
-                                                    }
-                                                  }
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: /* Close_box */0,
+                                                  _1: /* End_of_format */0
                                                 }
                                               }
                                             }
-                                          },
-                                          _1: "@[This is the second method `%s' of this object type.@ %s@]"
-                                        }), param$1._0, "Multiple occurences are not allowed.");
-                      case /* Unbound_value */17 :
-                          const lid$1 = param$1._0;
-                          Curry._2(Stdlib__Format.fprintf(param)({
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              },
+                              _1: "@[Variant tags `%s@ and `%s have the same hash value.@ %s@]"
+                            }), param$1._0, param$1._1, "Change one of them.");
+                case /* Invalid_variable_name */13 :
+                    return Curry._1(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "The type variable name ",
+                                _1: {
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
+                                  _1: {
+                                    TAG: /* String_literal */11,
+                                    _0: " is not allowed in programs",
+                                    _1: /* End_of_format */0
+                                  }
+                                }
+                              },
+                              _1: "The type variable name %s is not allowed in programs"
+                            }), param$1._0);
+                case /* Cannot_quantify */14 :
+                    const v = param$1._1;
+                    return Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* Formatting_gen */18,
+                                _0: {
+                                  TAG: /* Open_box */1,
+                                  _0: {
                                     TAG: /* Format */0,
                                     _0: {
                                       TAG: /* String_literal */11,
-                                      _0: "Unbound value ",
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: /* End_of_format */0
-                                      }
+                                      _0: "<hov>",
+                                      _1: /* End_of_format */0
                                     },
-                                    _1: "Unbound value %a"
-                                  }), longident, lid$1);
-                          return spellcheck$1(param, fold_values)(env, lid$1);
-                      case /* Unbound_constructor */18 :
-                          const lid$2 = param$1._0;
-                          Curry._2(Stdlib__Format.fprintf(param)({
-                                    TAG: /* Format */0,
-                                    _0: {
+                                    _1: "<hov>"
+                                  }
+                                },
+                                _1: {
+                                  TAG: /* String_literal */11,
+                                  _0: "The universal type variable '",
+                                  _1: {
+                                    TAG: /* String */2,
+                                    _0: /* No_padding */0,
+                                    _1: {
                                       TAG: /* String_literal */11,
-                                      _0: "Unbound constructor ",
+                                      _0: " cannot be generalized:",
                                       _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: /* End_of_format */0
+                                        TAG: /* Formatting_lit */17,
+                                        _0: {
+                                          TAG: /* Break */0,
+                                          _0: "@ ",
+                                          _1: 1,
+                                          _2: 0
+                                        },
+                                        _1: {
+                                          TAG: /* String */2,
+                                          _0: /* No_padding */0,
+                                          _1: {
+                                            TAG: /* Char_literal */12,
+                                            _0: /* '.' */46,
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: /* Close_box */0,
+                                              _1: /* End_of_format */0
+                                            }
+                                          }
+                                        }
                                       }
-                                    },
-                                    _1: "Unbound constructor %a"
-                                  }), longident, lid$2);
-                          return spellcheck_simple(param, fold_constructors, (function (d) {
-                                          return d.cstr_name;
-                                        }))(env, lid$2);
-                      case /* Unbound_label */19 :
-                          const lid$3 = param$1._0;
-                          Curry._2(Stdlib__Format.fprintf(param)({
+                                    }
+                                  }
+                                }
+                              },
+                              _1: "@[<hov>The universal type variable '%s cannot be generalized:@ %s.@]"
+                            }), param$1._0, is_Tvar(v) ? "it escapes its scope" : (
+                            is_Tunivar(v) ? "it is already bound to another variable" : "it is not a variable"
+                          ));
+                case /* Multiple_constraints_on_type */15 :
+                    return Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "Multiple constraints for type ",
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: /* End_of_format */0
+                                }
+                              },
+                              _1: "Multiple constraints for type %a"
+                            }), longident, param$1._0);
+                case /* Repeated_method_label */16 :
+                    return Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* Formatting_gen */18,
+                                _0: {
+                                  TAG: /* Open_box */1,
+                                  _0: {
                                     TAG: /* Format */0,
-                                    _0: {
+                                    _0: /* End_of_format */0,
+                                    _1: ""
+                                  }
+                                },
+                                _1: {
+                                  TAG: /* String_literal */11,
+                                  _0: "This is the second method `",
+                                  _1: {
+                                    TAG: /* String */2,
+                                    _0: /* No_padding */0,
+                                    _1: {
                                       TAG: /* String_literal */11,
-                                      _0: "Unbound record field ",
+                                      _0: "' of this object type.",
                                       _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: /* End_of_format */0
-                                      }
-                                    },
-                                    _1: "Unbound record field %a"
-                                  }), longident, lid$3);
-                          return spellcheck_simple(param, fold_labels, (function (d) {
-                                          return d.lbl_name;
-                                        }))(env, lid$3);
-                      case /* Unbound_module */20 :
-                          const lid$4 = param$1._0;
-                          Curry._2(Stdlib__Format.fprintf(param)({
-                                    TAG: /* Format */0,
-                                    _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: "Unbound module ",
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: /* End_of_format */0
-                                      }
-                                    },
-                                    _1: "Unbound module %a"
-                                  }), longident, lid$4);
-                          return spellcheck$1(param, fold_modules)(env, lid$4);
-                      case /* Unbound_class */21 :
-                          const lid$5 = param$1._0;
-                          Curry._2(Stdlib__Format.fprintf(param)({
-                                    TAG: /* Format */0,
-                                    _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: "Unbound class ",
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: /* End_of_format */0
-                                      }
-                                    },
-                                    _1: "Unbound class %a"
-                                  }), longident, lid$5);
-                          return spellcheck$1(param, fold_classs)(env, lid$5);
-                      case /* Unbound_modtype */22 :
-                          const lid$6 = param$1._0;
-                          Curry._2(Stdlib__Format.fprintf(param)({
-                                    TAG: /* Format */0,
-                                    _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: "Unbound module type ",
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: /* End_of_format */0
-                                      }
-                                    },
-                                    _1: "Unbound module type %a"
-                                  }), longident, lid$6);
-                          return spellcheck$1(param, fold_modtypes)(env, lid$6);
-                      case /* Unbound_cltype */23 :
-                          const lid$7 = param$1._0;
-                          Curry._2(Stdlib__Format.fprintf(param)({
-                                    TAG: /* Format */0,
-                                    _0: {
-                                      TAG: /* String_literal */11,
-                                      _0: "Unbound class type ",
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: /* End_of_format */0
+                                        TAG: /* Formatting_lit */17,
+                                        _0: {
+                                          TAG: /* Break */0,
+                                          _0: "@ ",
+                                          _1: 1,
+                                          _2: 0
+                                        },
+                                        _1: {
+                                          TAG: /* String */2,
+                                          _0: /* No_padding */0,
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: /* Close_box */0,
+                                            _1: /* End_of_format */0
+                                          }
+                                        }
                                       }
-                                    },
-                                    _1: "Unbound class type %a"
-                                  }), longident, lid$7);
-                          return spellcheck$1(param, fold_cltypes)(env, lid$7);
-                      case /* Ill_typed_functor_application */24 :
-                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: "Ill-typed functor application ",
-                                            _1: {
-                                              TAG: /* Alpha */15,
-                                              _0: /* End_of_format */0
-                                            }
-                                          },
-                                          _1: "Ill-typed functor application %a"
-                                        }), longident, param$1._0);
-                      case /* Access_functor_as_structure */25 :
-                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                          TAG: /* Format */0,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: "The module ",
-                                            _1: {
-                                              TAG: /* Alpha */15,
-                                              _0: {
-                                                TAG: /* String_literal */11,
-                                                _0: " is a functor, not a structure",
-                                                _1: /* End_of_format */0
-                                              }
-                                            }
-                                          },
-                                          _1: "The module %a is a functor, not a structure"
-                                        }), longident, param$1._0);
-                      
-                    }
-                  }), err._3);
+                                    }
+                                  }
+                                }
+                              },
+                              _1: "@[This is the second method `%s' of this object type.@ %s@]"
+                            }), param$1._0, "Multiple occurences are not allowed.");
+                case /* Unbound_value */17 :
+                    const lid$1 = param$1._0;
+                    Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "Unbound value ",
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: /* End_of_format */0
+                                }
+                              },
+                              _1: "Unbound value %a"
+                            }), longident, lid$1);
+                    return spellcheck$1(param, fold_values)(env, lid$1);
+                case /* Unbound_constructor */18 :
+                    const lid$2 = param$1._0;
+                    Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "Unbound constructor ",
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: /* End_of_format */0
+                                }
+                              },
+                              _1: "Unbound constructor %a"
+                            }), longident, lid$2);
+                    return spellcheck_simple(param, fold_constructors, (function (d) {
+                              return d.cstr_name;
+                            }))(env, lid$2);
+                case /* Unbound_label */19 :
+                    const lid$3 = param$1._0;
+                    Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "Unbound record field ",
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: /* End_of_format */0
+                                }
+                              },
+                              _1: "Unbound record field %a"
+                            }), longident, lid$3);
+                    return spellcheck_simple(param, fold_labels, (function (d) {
+                              return d.lbl_name;
+                            }))(env, lid$3);
+                case /* Unbound_module */20 :
+                    const lid$4 = param$1._0;
+                    Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "Unbound module ",
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: /* End_of_format */0
+                                }
+                              },
+                              _1: "Unbound module %a"
+                            }), longident, lid$4);
+                    return spellcheck$1(param, fold_modules)(env, lid$4);
+                case /* Unbound_class */21 :
+                    const lid$5 = param$1._0;
+                    Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "Unbound class ",
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: /* End_of_format */0
+                                }
+                              },
+                              _1: "Unbound class %a"
+                            }), longident, lid$5);
+                    return spellcheck$1(param, fold_classs)(env, lid$5);
+                case /* Unbound_modtype */22 :
+                    const lid$6 = param$1._0;
+                    Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "Unbound module type ",
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: /* End_of_format */0
+                                }
+                              },
+                              _1: "Unbound module type %a"
+                            }), longident, lid$6);
+                    return spellcheck$1(param, fold_modtypes)(env, lid$6);
+                case /* Unbound_cltype */23 :
+                    const lid$7 = param$1._0;
+                    Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "Unbound class type ",
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: /* End_of_format */0
+                                }
+                              },
+                              _1: "Unbound class type %a"
+                            }), longident, lid$7);
+                    return spellcheck$1(param, fold_cltypes)(env, lid$7);
+                case /* Ill_typed_functor_application */24 :
+                    return Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "Ill-typed functor application ",
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: /* End_of_format */0
+                                }
+                              },
+                              _1: "Ill-typed functor application %a"
+                            }), longident, param$1._0);
+                case /* Access_functor_as_structure */25 :
+                    return Curry._2(Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "The module ",
+                                _1: {
+                                  TAG: /* Alpha */15,
+                                  _0: {
+                                    TAG: /* String_literal */11,
+                                    _0: " is a functor, not a structure",
+                                    _1: /* End_of_format */0
+                                  }
+                                }
+                              },
+                              _1: "The module %a is a functor, not a structure"
+                            }), longident, param$1._0);
+                
+              }
+            }), err._3);
     });
 
 const $$Error$7 = /* @__PURE__ */Caml_exceptions.create("Ocaml_typedtree_test.Typecore.Error");
@@ -62585,52 +62585,52 @@ const Error_forward$1 = /* @__PURE__ */Caml_exceptions.create("Ocaml_typedtree_t
 const type_module = {
   contents: (function (env, md) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  42440,
-                  22
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              42440,
+              22
+            ]
+          });
     })
 };
 
 const type_open = {
   contents: (function (param) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  42446,
-                  16
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              42446,
+              16
+            ]
+          });
     })
 };
 
 const type_package = {
   contents: (function (param) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  42451,
-                  16
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              42451,
+              16
+            ]
+          });
     })
 };
 
 const type_object = {
   contents: (function (env, s) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  42455,
-                  20
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              42455,
+              20
+            ]
+          });
     })
 };
 
@@ -62681,8 +62681,8 @@ function iter_expression(f, e) {
         case /* Pexp_apply */5 :
             expr(pel._0);
             return Stdlib__List.iter((function (param) {
-                          expr(param[1]);
-                        }), pel._1);
+                    expr(param[1]);
+                  }), pel._1);
         case /* Pexp_match */6 :
         case /* Pexp_try */7 :
             break;
@@ -62692,8 +62692,8 @@ function iter_expression(f, e) {
         case /* Pexp_record */11 :
             may(expr, pel._1);
             return Stdlib__List.iter((function (param) {
-                          expr(param[1]);
-                        }), pel._0);
+                    expr(param[1]);
+                  }), pel._0);
         case /* Pexp_setfield */13 :
             expr(pel._0);
             _e = pel._2;
@@ -62717,8 +62717,8 @@ function iter_expression(f, e) {
             continue ;
         case /* Pexp_override */24 :
             return Stdlib__List.iter((function (param) {
-                          expr(param[1]);
-                        }), pel._0);
+                    expr(param[1]);
+                  }), pel._0);
         case /* Pexp_letmodule */25 :
             expr(pel._2);
             return module_expr(pel._1);
@@ -62790,12 +62790,12 @@ function iter_expression(f, e) {
           return module_expr(l._0.pmb_expr);
       case /* Pstr_recmodule */7 :
           return Stdlib__List.iter((function (x) {
-                        module_expr(x.pmb_expr);
-                      }), l._0);
+                  module_expr(x.pmb_expr);
+                }), l._0);
       case /* Pstr_class */10 :
           return Stdlib__List.iter((function (c) {
-                        class_expr(c.pci_expr);
-                      }), l._0);
+                  class_expr(c.pci_expr);
+                }), l._0);
       case /* Pstr_include */12 :
           return module_expr(l._0.pincl_mod);
       default:
@@ -62816,8 +62816,8 @@ function iter_expression(f, e) {
         case /* Pcl_apply */3 :
             class_expr(match._0);
             return Stdlib__List.iter((function (param) {
-                          expr(param[1]);
-                        }), match._1);
+                    expr(param[1]);
+                  }), match._1);
         case /* Pcl_let */4 :
             Stdlib__List.iter(binding, match._1);
             _ce = match._2;
@@ -62887,11 +62887,11 @@ function all_idents_cases(el) {
           iter_expression(f, cp.pc_rhs);
         }), el);
   return Stdlib__Hashtbl.fold((function (x, param, rest) {
-                return {
-                        hd: x,
-                        tl: rest
-                      };
-              }), idents, /* [] */0);
+          return {
+            hd: x,
+            tl: rest
+          };
+        }), idents, /* [] */0);
 }
 
 function type_constant(param) {
@@ -62916,27 +62916,27 @@ function type_constant(param) {
 
 function type_option$1(ty) {
   return newty2(current_level.contents, {
-              TAG: /* Tconstr */3,
-              _0: path_option,
-              _1: {
-                hd: ty,
-                tl: /* [] */0
-              },
-              _2: {
-                contents: /* Mnil */0
-              }
-            });
+        TAG: /* Tconstr */3,
+        _0: path_option,
+        _1: {
+          hd: ty,
+          tl: /* [] */0
+        },
+        _2: {
+          contents: /* Mnil */0
+        }
+      });
 }
 
 function mkexp$1(exp_desc, exp_type, exp_loc, exp_env) {
   return {
-          exp_desc: exp_desc,
-          exp_loc: exp_loc,
-          exp_extra: /* [] */0,
-          exp_type: exp_type,
-          exp_env: exp_env,
-          exp_attributes: /* [] */0
-        };
+    exp_desc: exp_desc,
+    exp_loc: exp_loc,
+    exp_extra: /* [] */0,
+    exp_type: exp_type,
+    exp_env: exp_env,
+    exp_attributes: /* [] */0
+  };
 }
 
 function option_none(ty, loc) {
@@ -62946,14 +62946,14 @@ function option_none(ty, loc) {
   };
   const cnone = lookup_constructor(lid, initial_safe_string);
   return mkexp$1({
-              TAG: /* Texp_construct */8,
-              _0: {
-                txt: lid,
-                loc: none
-              },
-              _1: cnone,
-              _2: /* [] */0
-            }, ty, loc, initial_safe_string);
+        TAG: /* Texp_construct */8,
+        _0: {
+          txt: lid,
+          loc: none
+        },
+        _1: cnone,
+        _2: /* [] */0
+      }, ty, loc, initial_safe_string);
 }
 
 function option_some(texp) {
@@ -62963,17 +62963,17 @@ function option_some(texp) {
   };
   const csome = lookup_constructor(lid, initial_safe_string);
   return mkexp$1({
-              TAG: /* Texp_construct */8,
-              _0: {
-                txt: lid,
-                loc: none
-              },
-              _1: csome,
-              _2: {
-                hd: texp,
-                tl: /* [] */0
-              }
-            }, type_option$1(texp.exp_type), texp.exp_loc, texp.exp_env);
+        TAG: /* Texp_construct */8,
+        _0: {
+          txt: lid,
+          loc: none
+        },
+        _1: csome,
+        _2: {
+          hd: texp,
+          tl: /* [] */0
+        }
+      }, type_option$1(texp.exp_type), texp.exp_loc, texp.exp_env);
 }
 
 function extract_option_type(env, ty) {
@@ -62987,13 +62987,13 @@ function extract_option_type(env, ty) {
     
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              42638,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          42638,
+          9
+        ]
+      });
 }
 
 function extract_concrete_record(env, ty) {
@@ -63001,19 +63001,19 @@ function extract_concrete_record(env, ty) {
   const match$1 = match[2].type_kind;
   if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   }
   if (match$1.TAG === /* Type_record */0) {
     return [
-            match[0],
-            match[1],
-            match$1._0
-          ];
+      match[0],
+      match[1],
+      match$1._0
+    ];
   }
   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-            MEL_EXN_ID: Stdlib.Not_found
-          });
+        MEL_EXN_ID: Stdlib.Not_found
+      });
 }
 
 function extract_concrete_variant(env, ty) {
@@ -63024,25 +63024,25 @@ function extract_concrete_variant(env, ty) {
   if (/* tag */typeof cstrs === "number" || typeof cstrs === "string") {
     if (cstrs !== /* Type_abstract */0) {
       return [
-              p0,
-              p,
-              /* [] */0
-            ];
+        p0,
+        p,
+        /* [] */0
+      ];
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   } else {
     if (cstrs.TAG !== /* Type_record */0) {
       return [
-              p0,
-              p,
-              cstrs._0
-            ];
+        p0,
+        p,
+        cstrs._0
+      ];
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   }
 }
 
@@ -63050,20 +63050,20 @@ function extract_label_names(sexp, env, ty) {
   try {
     const match = extract_concrete_record(env, ty);
     return Stdlib__List.map((function (l) {
-                  return l.ld_id;
-                }), match[2]);
+            return l.ld_id;
+          }), match[2]);
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Stdlib.Not_found) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  42656,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              42656,
+              4
+            ]
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -63071,14 +63071,14 @@ function extract_label_names(sexp, env, ty) {
 
 function explicit_arity(param) {
   return Stdlib__List.exists((function (param) {
-                switch (param[0].txt) {
-                  case "explicit_arity" :
-                  case "ocaml.explicit_arity" :
-                      return true;
-                  default:
-                    return false;
-                }
-              }), param);
+          switch (param[0].txt) {
+            case "explicit_arity" :
+            case "ocaml.explicit_arity" :
+                return true;
+            default:
+              return false;
+          }
+        }), param);
 }
 
 function unify_pat_types(loc, env, ty, ty$p) {
@@ -63089,26 +63089,26 @@ function unify_pat_types(loc, env, ty, ty$p) {
     const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
     if (trace.MEL_EXN_ID === Unify) {
       throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                MEL_EXN_ID: $$Error$7,
-                _1: loc,
-                _2: env,
-                _3: {
-                  TAG: /* Pattern_type_clash */3,
-                  _0: trace._1
-                }
-              });
+            MEL_EXN_ID: $$Error$7,
+            _1: loc,
+            _2: env,
+            _3: {
+              TAG: /* Pattern_type_clash */3,
+              _0: trace._1
+            }
+          });
     }
     if (trace.MEL_EXN_ID === Tags) {
       throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                MEL_EXN_ID: $$Error$6,
-                _1: loc,
-                _2: env,
-                _3: {
-                  TAG: /* Variant_tags */12,
-                  _0: trace._1,
-                  _1: trace._2
-                }
-              });
+            MEL_EXN_ID: $$Error$6,
+            _1: loc,
+            _2: env,
+            _3: {
+              TAG: /* Variant_tags */12,
+              _0: trace._1,
+              _1: trace._2
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
   }
@@ -63122,26 +63122,26 @@ function unify_exp_types(loc, env, ty, expected_ty) {
     const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
     if (trace.MEL_EXN_ID === Unify) {
       throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                MEL_EXN_ID: $$Error$7,
-                _1: loc,
-                _2: env,
-                _3: {
-                  TAG: /* Expr_type_clash */7,
-                  _0: trace._1
-                }
-              });
+            MEL_EXN_ID: $$Error$7,
+            _1: loc,
+            _2: env,
+            _3: {
+              TAG: /* Expr_type_clash */7,
+              _0: trace._1
+            }
+          });
     }
     if (trace.MEL_EXN_ID === Tags) {
       throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                MEL_EXN_ID: $$Error$6,
-                _1: loc,
-                _2: env,
-                _3: {
-                  TAG: /* Variant_tags */12,
-                  _0: trace._1,
-                  _1: trace._2
-                }
-              });
+            MEL_EXN_ID: $$Error$6,
+            _1: loc,
+            _2: env,
+            _3: {
+              TAG: /* Variant_tags */12,
+              _0: trace._1,
+              _1: trace._2
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
   }
@@ -63157,13 +63157,13 @@ function get_newtype_level$1(param) {
     return y;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              42694,
-              12
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          42694,
+          12
+        ]
+      });
 }
 
 function unify_pat_types_gadt(loc, env, ty, ty$p) {
@@ -63173,13 +63173,13 @@ function unify_pat_types_gadt(loc, env, ty, ty$p) {
     newtype_level$2 = x;
   } else {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                42699,
-                14
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            42699,
+            14
+          ]
+        });
   }
   try {
     try {
@@ -63196,9 +63196,9 @@ function unify_pat_types_gadt(loc, env, ty, ty$p) {
       Curry._1(TypePairs.clear, unify_eq_set);
       if (e.MEL_EXN_ID === Unify) {
         throw new Caml_js_exceptions.MelangeError(Unify, {
-                  MEL_EXN_ID: Unify,
-                  _1: e._1
-                });
+              MEL_EXN_ID: Unify,
+              _1: e._1
+            });
       }
       newtype_level.contents = undefined;
       throw new Caml_js_exceptions.MelangeError(e.MEL_EXN_ID, e);
@@ -63208,37 +63208,37 @@ function unify_pat_types_gadt(loc, env, ty, ty$p) {
     const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
     if (trace.MEL_EXN_ID === Unify) {
       throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                MEL_EXN_ID: $$Error$7,
-                _1: loc,
-                _2: env.contents,
-                _3: {
-                  TAG: /* Pattern_type_clash */3,
-                  _0: trace._1
-                }
-              });
+            MEL_EXN_ID: $$Error$7,
+            _1: loc,
+            _2: env.contents,
+            _3: {
+              TAG: /* Pattern_type_clash */3,
+              _0: trace._1
+            }
+          });
     }
     if (trace.MEL_EXN_ID === Tags) {
       throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                MEL_EXN_ID: $$Error$6,
-                _1: loc,
-                _2: env.contents,
-                _3: {
-                  TAG: /* Variant_tags */12,
-                  _0: trace._1,
-                  _1: trace._2
-                }
-              });
+            MEL_EXN_ID: $$Error$6,
+            _1: loc,
+            _2: env.contents,
+            _3: {
+              TAG: /* Variant_tags */12,
+              _0: trace._1,
+              _1: trace._2
+            }
+          });
     }
     if (trace.MEL_EXN_ID === Unification_recursive_abbrev) {
       throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                MEL_EXN_ID: $$Error$7,
-                _1: loc,
-                _2: env.contents,
-                _3: {
-                  TAG: /* Recursive_local_constraint */33,
-                  _0: trace._1
-                }
-              });
+            MEL_EXN_ID: $$Error$7,
+            _1: loc,
+            _2: env.contents,
+            _3: {
+              TAG: /* Recursive_local_constraint */33,
+              _0: trace._1
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
   }
@@ -63262,13 +63262,13 @@ function finalize_variant(pat) {
   let row$1;
   if (/* tag */typeof row === "number" || typeof row === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                42725,
-                15
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            42725,
+            15
+          ]
+        });
   }
   if (row.TAG === /* Tvariant */8) {
     const row$2 = row._0;
@@ -63276,13 +63276,13 @@ function finalize_variant(pat) {
     row$1 = row_repr_aux(/* [] */0, row$2);
   } else {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                42725,
-                15
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            42725,
+            15
+          ]
+        });
   }
   const match$2 = row_field(match._0, row$1);
   if (/* tag */typeof match$2 === "number" || typeof match$2 === "string") {
@@ -63295,9 +63295,9 @@ function finalize_variant(pat) {
   if (c) {
     if (!match$2._1 && !row$1.row_closed) {
       return set_row_field(match$2._3, {
-                  TAG: /* Rpresent */0,
-                  _0: undefined
-                });
+            TAG: /* Rpresent */0,
+            _0: undefined
+          });
     }
     
   } else {
@@ -63311,33 +63311,33 @@ function finalize_variant(pat) {
       if (opat !== undefined) {
         const partial_arg = opat.pat_env;
         return Stdlib__List.iter((function (param) {
-                      return unify_pat(partial_arg, opat, param);
-                    }), {
-                    hd: ty,
-                    tl: match$3.tl
-                  });
+                return unify_pat(partial_arg, opat, param);
+              }), {
+              hd: ty,
+              tl: match$3.tl
+            });
       }
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  42733,
-                  40
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              42733,
+              40
+            ]
+          });
     }
     
   }
   if (match$2._2 && !row_fixed(row$1)) {
     return set_row_field(match$2._3, {
-                TAG: /* Reither */1,
-                _0: c,
-                _1: /* [] */0,
-                _2: false,
-                _3: {
-                  contents: undefined
-                }
-              });
+          TAG: /* Reither */1,
+          _0: c,
+          _1: /* [] */0,
+          _2: false,
+          _3: {
+            contents: undefined
+          }
+        });
   }
   
 }
@@ -63360,8 +63360,8 @@ function has_variants(p) {
               return ;
             }
             throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                      MEL_EXN_ID: Stdlib.Exit
-                    });
+                  MEL_EXN_ID: Stdlib.Exit
+                });
           }), p);
     return false;
   }
@@ -63409,14 +63409,14 @@ function enter_variable(is_moduleOpt, is_as_variableOpt, loc, name, ty) {
             return param[0].name === name.txt;
           }), pattern_variables.contents)) {
     throw new Caml_js_exceptions.MelangeError($$Error$7, {
-              MEL_EXN_ID: $$Error$7,
-              _1: loc,
-              _2: empty,
-              _3: {
-                TAG: /* Multiply_bound_variable */5,
-                _0: name.txt
-              }
-            });
+          MEL_EXN_ID: $$Error$7,
+          _1: loc,
+          _2: empty,
+          _3: {
+            TAG: /* Multiply_bound_variable */5,
+            _0: name.txt
+          }
+        });
   }
   const id = create(name.txt);
   pattern_variables.contents = {
@@ -63432,11 +63432,11 @@ function enter_variable(is_moduleOpt, is_as_variableOpt, loc, name, ty) {
   if (is_module) {
     if (!allow_modules.contents) {
       throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                MEL_EXN_ID: $$Error$7,
-                _1: loc,
-                _2: empty,
-                _3: /* Modules_not_allowed */2
-              });
+            MEL_EXN_ID: $$Error$7,
+            _1: loc,
+            _2: empty,
+            _3: /* Modules_not_allowed */2
+          });
     }
     module_variables.contents = {
       hd: [
@@ -63460,8 +63460,8 @@ function enter_variable(is_moduleOpt, is_as_variableOpt, loc, name, ty) {
 
 function sort_pattern_variables(vs) {
   return Stdlib__List.sort((function (param, param$1) {
-                return Caml.caml_string_compare(param[0].name, param$1[0].name);
-              }), vs);
+          return Caml.caml_string_compare(param[0].name, param$1[0].name);
+        }), vs);
 }
 
 function enter_orpat_variables(loc, env, p1_vs, p2_vs) {
@@ -63492,59 +63492,59 @@ function enter_orpat_variables(loc, env, p1_vs, p2_vs) {
               const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
               if (trace.MEL_EXN_ID === Unify) {
                 throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                          MEL_EXN_ID: $$Error$7,
-                          _1: loc,
-                          _2: env,
-                          _3: {
-                            TAG: /* Or_pattern_type_clash */4,
-                            _0: x1,
-                            _1: trace._1
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$7,
+                      _1: loc,
+                      _2: env,
+                      _3: {
+                        TAG: /* Or_pattern_type_clash */4,
+                        _0: x1,
+                        _1: trace._1
+                      }
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
             }
             return {
-                    hd: [
-                      x2,
-                      x1
-                    ],
-                    tl: unify_vars(rem1, rem2)
-                  };
+              hd: [
+                x2,
+                x1
+              ],
+              tl: unify_vars(rem1, rem2)
+            };
           }
           const min_var = x1.name < x2.name ? x1 : x2;
           throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                    MEL_EXN_ID: $$Error$7,
-                    _1: loc,
-                    _2: env,
-                    _3: {
-                      TAG: /* Orpat_vars */6,
-                      _0: min_var
-                    }
-                  });
-        }
-        throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                  MEL_EXN_ID: $$Error$7,
-                  _1: loc,
-                  _2: env,
-                  _3: {
-                    TAG: /* Orpat_vars */6,
-                    _0: x1
-                  }
-                });
-      }
-      if (!p2_vs) {
-        return /* [] */0;
-      }
-      throw new Caml_js_exceptions.MelangeError($$Error$7, {
                 MEL_EXN_ID: $$Error$7,
                 _1: loc,
                 _2: env,
                 _3: {
                   TAG: /* Orpat_vars */6,
-                  _0: p2_vs.hd[0]
+                  _0: min_var
                 }
               });
+        }
+        throw new Caml_js_exceptions.MelangeError($$Error$7, {
+              MEL_EXN_ID: $$Error$7,
+              _1: loc,
+              _2: env,
+              _3: {
+                TAG: /* Orpat_vars */6,
+                _0: x1
+              }
+            });
+      }
+      if (!p2_vs) {
+        return /* [] */0;
+      }
+      throw new Caml_js_exceptions.MelangeError($$Error$7, {
+            MEL_EXN_ID: $$Error$7,
+            _1: loc,
+            _2: env,
+            _3: {
+              TAG: /* Orpat_vars */6,
+              _0: p2_vs.hd[0]
+            }
+          });
     };
   };
   return unify_vars(p1_vs$1, p2_vs$1);
@@ -63566,9 +63566,9 @@ function build_as_type(env, _p) {
                   return build_as_type(env, param);
                 }), pl._0);
           return newty2(current_level.contents, {
-                      TAG: /* Ttuple */2,
-                      _0: tyl
-                    });
+                TAG: /* Ttuple */2,
+                _0: tyl
+              });
       case /* Tpat_construct */4 :
           const pl$1 = pl._2;
           const cstr = pl._1;
@@ -63629,9 +63629,9 @@ function build_as_type(env, _p) {
           const ty$1 = newvar(undefined, undefined);
           const ppl = Stdlib__List.map((function (param) {
                   return [
-                          param[1].lbl_pos,
-                          param[2]
-                        ];
+                    param[1].lbl_pos,
+                    param[2]
+                  ];
                 }), lpl);
           const do_label = function (lbl) {
             const match = instance_label(false, lbl);
@@ -63658,13 +63658,13 @@ function build_as_type(env, _p) {
             if (refinable) {
               const arg = Stdlib__List.assoc(lbl.lbl_pos, ppl);
               return unify_pat(env, {
-                          pat_desc: arg.pat_desc,
-                          pat_loc: arg.pat_loc,
-                          pat_extra: arg.pat_extra,
-                          pat_type: build_as_type(env, arg),
-                          pat_env: arg.pat_env,
-                          pat_attributes: arg.pat_attributes
-                        }, ty_arg);
+                    pat_desc: arg.pat_desc,
+                    pat_loc: arg.pat_loc,
+                    pat_extra: arg.pat_extra,
+                    pat_type: build_as_type(env, arg),
+                    pat_env: arg.pat_env,
+                    pat_attributes: arg.pat_attributes
+                  }, ty_arg);
             }
             const match$2 = instance_label(false, lbl);
             unify$2(env, ty_arg, match$2[1]);
@@ -63736,14 +63736,14 @@ function build_or_pat(env, loc, lid) {
   }
   if (exit === 1) {
     throw new Caml_js_exceptions.MelangeError($$Error$7, {
-              MEL_EXN_ID: $$Error$7,
-              _1: loc,
-              _2: env,
-              _3: {
-                TAG: /* Not_a_variant_type */30,
-                _0: lid
-              }
-            });
+          MEL_EXN_ID: $$Error$7,
+          _1: loc,
+          _2: env,
+          _3: {
+            TAG: /* Not_a_variant_type */30,
+            _0: lid
+          }
+        });
   }
   const match$1 = Stdlib__List.fold_left((function (param, param$1) {
           const l = param$1[0];
@@ -63752,77 +63752,77 @@ function build_or_pat(env, loc, lid) {
           const match = row_field_repr_aux(/* [] */0, param$1[1]);
           if (/* tag */typeof match === "number" || typeof match === "string") {
             return [
-                    pats,
-                    fields
-                  ];
+              pats,
+              fields
+            ];
           }
           if (match.TAG !== /* Rpresent */0) {
             return [
-                    pats,
-                    fields
-                  ];
+              pats,
+              fields
+            ];
           }
           const ty = match._0;
           if (ty !== undefined) {
             return [
-                    {
-                      hd: [
-                        l,
-                        {
-                          pat_desc: /* Tpat_any */0,
-                          pat_loc: none,
-                          pat_extra: /* [] */0,
-                          pat_type: ty,
-                          pat_env: env,
-                          pat_attributes: /* [] */0
-                        }
-                      ],
-                      tl: pats
+              {
+                hd: [
+                  l,
+                  {
+                    pat_desc: /* Tpat_any */0,
+                    pat_loc: none,
+                    pat_extra: /* [] */0,
+                    pat_type: ty,
+                    pat_env: env,
+                    pat_attributes: /* [] */0
+                  }
+                ],
+                tl: pats
+              },
+              {
+                hd: [
+                  l,
+                  {
+                    TAG: /* Reither */1,
+                    _0: false,
+                    _1: {
+                      hd: ty,
+                      tl: /* [] */0
                     },
-                    {
-                      hd: [
-                        l,
-                        {
-                          TAG: /* Reither */1,
-                          _0: false,
-                          _1: {
-                            hd: ty,
-                            tl: /* [] */0
-                          },
-                          _2: true,
-                          _3: {
-                            contents: undefined
-                          }
-                        }
-                      ],
-                      tl: fields
+                    _2: true,
+                    _3: {
+                      contents: undefined
                     }
-                  ];
+                  }
+                ],
+                tl: fields
+              }
+            ];
           } else {
             return [
-                    {
-                      hd: [
-                        l,
-                        undefined
-                      ],
-                      tl: pats
-                    },
-                    {
-                      hd: [
-                        l,
-                        {
-                          TAG: /* Reither */1,
-                          _0: true,
-                          _1: /* [] */0,
-                          _2: true,
-                          _3: {
-                            contents: undefined
-                          }
-                        }
-                      ],
-                      tl: fields
+              {
+                hd: [
+                  l,
+                  undefined
+                ],
+                tl: pats
+              },
+              {
+                hd: [
+                  l,
+                  {
+                    TAG: /* Reither */1,
+                    _0: true,
+                    _1: /* [] */0,
+                    _2: true,
+                    _3: {
+                      contents: undefined
                     }
-                  ];
+                  }
+                ],
+                tl: fields
+              }
+            ];
           }
         }), [
         /* [] */0,
@@ -63865,57 +63865,57 @@ function build_or_pat(env, loc, lid) {
   };
   const pats = Stdlib__List.map((function (param) {
           return {
-                  pat_desc: {
-                    TAG: /* Tpat_variant */5,
-                    _0: param[0],
-                    _1: param[1],
-                    _2: row$p
-                  },
-                  pat_loc: gloc,
-                  pat_extra: /* [] */0,
-                  pat_type: ty$1,
-                  pat_env: env,
-                  pat_attributes: /* [] */0
-                };
+            pat_desc: {
+              TAG: /* Tpat_variant */5,
+              _0: param[0],
+              _1: param[1],
+              _2: row$p
+            },
+            pat_loc: gloc,
+            pat_extra: /* [] */0,
+            pat_type: ty$1,
+            pat_env: env,
+            pat_attributes: /* [] */0
+          };
         }), match$1[0]);
   if (pats) {
     const r = Stdlib__List.fold_left((function (pat, pat0) {
             return {
-                    pat_desc: {
-                      TAG: /* Tpat_or */8,
-                      _0: pat0,
-                      _1: pat,
-                      _2: row0
-                    },
-                    pat_loc: gloc,
-                    pat_extra: /* [] */0,
-                    pat_type: ty$1,
-                    pat_env: env,
-                    pat_attributes: /* [] */0
-                  };
+              pat_desc: {
+                TAG: /* Tpat_or */8,
+                _0: pat0,
+                _1: pat,
+                _2: row0
+              },
+              pat_loc: gloc,
+              pat_extra: /* [] */0,
+              pat_type: ty$1,
+              pat_env: env,
+              pat_attributes: /* [] */0
+            };
           }), pats.hd, pats.tl);
     return [
-            path,
-            rp({
-                  pat_desc: r.pat_desc,
-                  pat_loc: loc,
-                  pat_extra: r.pat_extra,
-                  pat_type: r.pat_type,
-                  pat_env: r.pat_env,
-                  pat_attributes: r.pat_attributes
-                }),
-            ty$1
-          ];
+      path,
+      rp({
+            pat_desc: r.pat_desc,
+            pat_loc: loc,
+            pat_extra: r.pat_extra,
+            pat_type: r.pat_type,
+            pat_env: r.pat_env,
+            pat_attributes: r.pat_attributes
+          }),
+      ty$1
+    ];
   }
   throw new Caml_js_exceptions.MelangeError($$Error$7, {
-            MEL_EXN_ID: $$Error$7,
-            _1: loc,
-            _2: env,
-            _3: {
-              TAG: /* Not_a_variant_type */30,
-              _0: lid
-            }
-          });
+        MEL_EXN_ID: $$Error$7,
+        _1: loc,
+        _2: env,
+        _3: {
+          TAG: /* Not_a_variant_type */30,
+          _0: lid
+        }
+      });
 }
 
 function expand_path(env, _p) {
@@ -63975,18 +63975,18 @@ function wrap_disambiguate(kind, ty, f, x) {
       }
       if (match.TAG === /* Wrong_name */13) {
         throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                  MEL_EXN_ID: $$Error$7,
-                  _1: exn._1,
-                  _2: exn._2,
-                  _3: {
-                    TAG: /* Wrong_name */13,
-                    _0: kind,
-                    _1: ty,
-                    _2: match._2,
-                    _3: match._3,
-                    _4: match._4
-                  }
-                });
+              MEL_EXN_ID: $$Error$7,
+              _1: exn._1,
+              _2: exn._2,
+              _3: {
+                TAG: /* Wrong_name */13,
+                _0: kind,
+                _1: ty,
+                _2: match._2,
+                _3: match._3,
+                _4: match._4
+              }
+            });
       }
       throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
     } else {
@@ -64001,25 +64001,25 @@ function get_type_path$1(env, d) {
   const match = d.lbl_res.desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                42965,
-                11
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            42965,
+            11
+          ]
+        });
   }
   if (match.TAG === /* Tconstr */3) {
     return match._0;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              42965,
-              11
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          42965,
+          11
+        ]
+      });
 }
 
 function lookup_from_type(env, tpath, lid) {
@@ -64031,33 +64031,33 @@ function lookup_from_type(env, tpath, lid) {
         const s$1 = s._0;
         try {
           return Stdlib__List.find((function (nd) {
-                        return nd.lbl_name === s$1;
-                      }), descrs);
+                  return nd.lbl_name === s$1;
+                }), descrs);
         }
         catch (raw_exn){
           const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
           if (exn.MEL_EXN_ID === Stdlib.Not_found) {
             throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                      MEL_EXN_ID: $$Error$7,
-                      _1: lid.loc,
-                      _2: env,
-                      _3: {
-                        TAG: /* Wrong_name */13,
-                        _0: "",
-                        _1: newvar(undefined, undefined),
-                        _2: type_kind,
-                        _3: tpath,
-                        _4: lid.txt
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$7,
+                  _1: lid.loc,
+                  _2: env,
+                  _3: {
+                    TAG: /* Wrong_name */13,
+                    _0: "",
+                    _1: newvar(undefined, undefined),
+                    _2: type_kind,
+                    _3: tpath,
+                    _4: lid.txt
+                  }
+                });
           }
           throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
         }
     case /* Ldot */1 :
     case /* Lapply */2 :
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     
   }
 }
@@ -64194,22 +64194,22 @@ function disambiguate(warnOpt, check_lkOpt, scope, lid, env, opath, lbls) {
                       const tp0 = get_type_path$1(env, param[0]);
                       const tp = expand_path(env, tp0);
                       return [
-                              tp0,
-                              tp
-                            ];
+                        tp0,
+                        tp
+                      ];
                     }), lbls);
               throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                        MEL_EXN_ID: $$Error$7,
-                        _1: lid.loc,
-                        _2: env,
-                        _3: {
-                          TAG: /* Name_type_mismatch */14,
-                          _0: type_kind,
-                          _1: lid.txt,
-                          _2: tp,
-                          _3: tpl
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$7,
+                    _1: lid.loc,
+                    _2: env,
+                    _3: {
+                      TAG: /* Name_type_mismatch */14,
+                      _0: type_kind,
+                      _1: lid.txt,
+                      _2: tp,
+                      _3: tpl
+                    }
+                  });
             }
           } else {
             throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
@@ -64257,8 +64257,8 @@ function disambiguate_label_by_ids(keep, env, closed, ids, labels) {
             Stdlib__Hashtbl.add(lbls, lbl.lbl_name, undefined);
           }), param[0].lbl_all);
     return Stdlib__List.for_all((function (param) {
-                  return Stdlib__Hashtbl.mem(lbls, param);
-                }), ids);
+            return Stdlib__Hashtbl.mem(lbls, param);
+          }), ids);
   };
   const check_closed = function (param) {
     if (closed) {
@@ -64270,21 +64270,21 @@ function disambiguate_label_by_ids(keep, env, closed, ids, labels) {
   const labels$p = Stdlib__List.filter(check_ids, labels);
   if (keep && Caml_obj.caml_equal(labels$p, /* [] */0)) {
     return [
-            false,
-            labels
-          ];
+      false,
+      labels
+    ];
   }
   const labels$p$p = Stdlib__List.filter(check_closed, labels$p);
   if (keep && Caml_obj.caml_equal(labels$p$p, /* [] */0)) {
     return [
-            false,
-            labels$p
-          ];
+      false,
+      labels$p
+    ];
   } else {
     return [
-            true,
-            labels$p$p
-          ];
+      true,
+      labels$p$p
+    ];
   }
 }
 
@@ -64370,10 +64370,10 @@ function disambiguate_lid_a_list(loc, closed, env, opath, lid_a_list) {
   const lbl_a_list = Stdlib__List.map((function (param) {
           const lid = param[0];
           return [
-                  lid,
-                  process_label(lid),
-                  param[1]
-                ];
+            lid,
+            process_label(lid),
+            param[1]
+          ];
         }), lid_a_list);
   if (w_pr.contents) {
     prerr_warning(loc, {
@@ -64460,20 +64460,20 @@ function type_label_a_list(labels, loc, closed, env, type_lbl_a, opath, lid_a_li
                       switch (s.TAG) {
                         case /* Lident */0 :
                             return [
-                                    lid,
-                                    Stdlib__Hashtbl.find(labels$1, s._0),
-                                    param[1]
-                                  ];
+                              lid,
+                              Stdlib__Hashtbl.find(labels$1, s._0),
+                              param[1]
+                            ];
                         case /* Ldot */1 :
                         case /* Lapply */2 :
                             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                      MEL_EXN_ID: "Assert_failure",
-                                      _1: [
-                                        "jscomp/test/ocaml_typedtree_test.ml",
-                                        43182,
-                                        17
-                                      ]
-                                    });
+                                  MEL_EXN_ID: "Assert_failure",
+                                  _1: [
+                                    "jscomp/test/ocaml_typedtree_test.ml",
+                                    43182,
+                                    17
+                                  ]
+                                });
                         
                       }
                     }), lid_a_list);
@@ -64501,16 +64501,16 @@ function type_label_a_list(labels, loc, closed, env, type_lbl_a, opath, lid_a_li
               switch (s.TAG) {
                 case /* Lident */0 :
                     return [
-                            {
-                              txt: {
-                                TAG: /* Ldot */1,
-                                _0: modname,
-                                _1: s._0
-                              },
-                              loc: lid.loc
-                            },
-                            lid_a[1]
-                          ];
+                      {
+                        txt: {
+                          TAG: /* Ldot */1,
+                          _0: modname,
+                          _1: s._0
+                        },
+                        loc: lid.loc
+                      },
+                      lid_a[1]
+                    ];
                 case /* Ldot */1 :
                 case /* Lapply */2 :
                     return lid_a;
@@ -64535,14 +64535,14 @@ function check_recordpat_labels(loc, lbl_pat_list, closed) {
     const label = param[1];
     if (Caml_array.get(defined, label.lbl_pos)) {
       throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                MEL_EXN_ID: $$Error$7,
-                _1: loc,
-                _2: empty,
-                _3: {
-                  TAG: /* Label_multiply_defined */10,
-                  _0: label.lbl_name
-                }
-              });
+            MEL_EXN_ID: $$Error$7,
+            _1: loc,
+            _2: empty,
+            _3: {
+              TAG: /* Label_multiply_defined */10,
+              _0: label.lbl_name
+            }
+          });
     }
     Caml_array.set(defined, label.lbl_pos, true);
   };
@@ -64579,25 +64579,25 @@ function get_type_path$2(env, d) {
   const match = d.cstr_res.desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                42965,
-                11
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            42965,
+            11
+          ]
+        });
   }
   if (match.TAG === /* Tconstr */3) {
     return match._0;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              42965,
-              11
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          42965,
+          11
+        ]
+      });
 }
 
 function lookup_from_type$1(env, tpath, lid) {
@@ -64609,33 +64609,33 @@ function lookup_from_type$1(env, tpath, lid) {
         const s$1 = s._0;
         try {
           return Stdlib__List.find((function (nd) {
-                        return nd.cstr_name === s$1;
-                      }), descrs);
+                  return nd.cstr_name === s$1;
+                }), descrs);
         }
         catch (raw_exn){
           const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
           if (exn.MEL_EXN_ID === Stdlib.Not_found) {
             throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                      MEL_EXN_ID: $$Error$7,
-                      _1: lid.loc,
-                      _2: env,
-                      _3: {
-                        TAG: /* Wrong_name */13,
-                        _0: "",
-                        _1: newvar(undefined, undefined),
-                        _2: type_kind$1,
-                        _3: tpath,
-                        _4: lid.txt
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$7,
+                  _1: lid.loc,
+                  _2: env,
+                  _3: {
+                    TAG: /* Wrong_name */13,
+                    _0: "",
+                    _1: newvar(undefined, undefined),
+                    _2: type_kind$1,
+                    _3: tpath,
+                    _4: lid.txt
+                  }
+                });
           }
           throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
         }
     case /* Ldot */1 :
     case /* Lapply */2 :
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     
   }
 }
@@ -64772,22 +64772,22 @@ function disambiguate$1(warnOpt, check_lkOpt, scope, lid, env, opath, lbls) {
                       const tp0 = get_type_path$2(env, param[0]);
                       const tp = expand_path(env, tp0);
                       return [
-                              tp0,
-                              tp
-                            ];
+                        tp0,
+                        tp
+                      ];
                     }), lbls);
               throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                        MEL_EXN_ID: $$Error$7,
-                        _1: lid.loc,
-                        _2: env,
-                        _3: {
-                          TAG: /* Name_type_mismatch */14,
-                          _0: type_kind$1,
-                          _1: lid.txt,
-                          _2: tp,
-                          _3: tpl
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$7,
+                    _1: lid.loc,
+                    _2: env,
+                    _3: {
+                      TAG: /* Name_type_mismatch */14,
+                      _0: type_kind$1,
+                      _1: lid.txt,
+                      _2: tp,
+                      _3: tpl
+                    }
+                  });
             }
           } else {
             throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
@@ -64834,13 +64834,13 @@ function unify_head_only(loc, env, ty, constr) {
   const match$1 = repr(ty_res).desc;
   if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                43255,
-                9
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            43255,
+            9
+          ]
+        });
   }
   if (match$1.TAG === /* Tconstr */3) {
     ty_res.desc = {
@@ -64855,13 +64855,13 @@ function unify_head_only(loc, env, ty, constr) {
     return unify_pat_types(loc, env, ty_res, ty);
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              43255,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          43255,
+          9
+        ]
+      });
 }
 
 function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty) {
@@ -64876,30 +64876,30 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
   const name = sp.ppat_desc;
   if (/* tag */typeof name === "number" || typeof name === "string") {
     return rp({
-                pat_desc: /* Tpat_any */0,
-                pat_loc: loc,
-                pat_extra: /* [] */0,
-                pat_type: expected_ty,
-                pat_env: env.contents,
-                pat_attributes: sp.ppat_attributes
-              });
+          pat_desc: /* Tpat_any */0,
+          pat_loc: loc,
+          pat_extra: /* [] */0,
+          pat_type: expected_ty,
+          pat_env: env.contents,
+          pat_attributes: sp.ppat_attributes
+        });
   }
   switch (name.TAG) {
     case /* Ppat_var */0 :
         const name$1 = name._0;
         const id = enter_variable(undefined, undefined, loc, name$1, expected_ty);
         return rp({
-                    pat_desc: {
-                      TAG: /* Tpat_var */0,
-                      _0: id,
-                      _1: name$1
-                    },
-                    pat_loc: loc,
-                    pat_extra: /* [] */0,
-                    pat_type: expected_ty,
-                    pat_env: env.contents,
-                    pat_attributes: sp.ppat_attributes
-                  });
+              pat_desc: {
+                TAG: /* Tpat_var */0,
+                _0: id,
+                _1: name$1
+              },
+              pat_loc: loc,
+              pat_extra: /* [] */0,
+              pat_type: expected_ty,
+              pat_env: env.contents,
+              pat_attributes: sp.ppat_attributes
+            });
     case /* Ppat_alias */1 :
         const name$2 = name._1;
         const q = type_pat$1(undefined, undefined)(name._0, expected_ty);
@@ -64911,32 +64911,32 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
             }, ty_var);
         const id$1 = enter_variable(undefined, true, loc, name$2, ty_var);
         return rp({
-                    pat_desc: {
-                      TAG: /* Tpat_alias */1,
-                      _0: q,
-                      _1: id$1,
-                      _2: name$2
-                    },
-                    pat_loc: loc,
-                    pat_extra: /* [] */0,
-                    pat_type: q.pat_type,
-                    pat_env: env.contents,
-                    pat_attributes: sp.ppat_attributes
-                  });
+              pat_desc: {
+                TAG: /* Tpat_alias */1,
+                _0: q,
+                _1: id$1,
+                _2: name$2
+              },
+              pat_loc: loc,
+              pat_extra: /* [] */0,
+              pat_type: q.pat_type,
+              pat_env: env.contents,
+              pat_attributes: sp.ppat_attributes
+            });
     case /* Ppat_constant */2 :
         const cst = name._0;
         unify_pat_types(loc, env.contents, type_constant(cst), expected_ty);
         return rp({
-                    pat_desc: {
-                      TAG: /* Tpat_constant */2,
-                      _0: cst
-                    },
-                    pat_loc: loc,
-                    pat_extra: /* [] */0,
-                    pat_type: expected_ty,
-                    pat_env: env.contents,
-                    pat_attributes: sp.ppat_attributes
-                  });
+              pat_desc: {
+                TAG: /* Tpat_constant */2,
+                _0: cst
+              },
+              pat_loc: loc,
+              pat_extra: /* [] */0,
+              pat_type: expected_ty,
+              pat_env: env.contents,
+              pat_attributes: sp.ppat_attributes
+            });
     case /* Ppat_interval */3 :
         const c1 = name._0;
         if (c1.TAG === /* Const_char */1) {
@@ -64954,14 +64954,14 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
             const loop = function (c1, c2) {
               if (c1 === c2) {
                 return constant(gloc, undefined, {
-                            TAG: /* Const_char */1,
-                            _0: c1
-                          });
+                      TAG: /* Const_char */1,
+                      _0: c1
+                    });
               } else {
                 return or_(gloc, undefined, constant(gloc, undefined, {
-                                TAG: /* Const_char */1,
-                                _0: c1
-                              }), loop(Stdlib__Char.chr(c1 + 1 | 0), c2));
+                          TAG: /* Const_char */1,
+                          _0: c1
+                        }), loop(Stdlib__Char.chr(c1 + 1 | 0), c2));
               }
             };
             const p = c1$1 <= c2$1 ? loop(c1$1, c2$1) : loop(c2$1, c1$1);
@@ -64975,18 +64975,18 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
             return type_pat$1(undefined, undefined)(p$1, expected_ty);
           }
           throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                    MEL_EXN_ID: $$Error$7,
-                    _1: loc,
-                    _2: env.contents,
-                    _3: /* Invalid_interval */5
-                  });
+                MEL_EXN_ID: $$Error$7,
+                _1: loc,
+                _2: env.contents,
+                _3: /* Invalid_interval */5
+              });
         }
         throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                  MEL_EXN_ID: $$Error$7,
-                  _1: loc,
-                  _2: env.contents,
-                  _3: /* Invalid_interval */5
-                });
+              MEL_EXN_ID: $$Error$7,
+              _1: loc,
+              _2: env.contents,
+              _3: /* Invalid_interval */5
+            });
     case /* Ppat_tuple */4 :
         const spl = name._0;
         if (Stdlib__List.length(spl) < 2) {
@@ -64994,9 +64994,9 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
         }
         const spl_ann = Stdlib__List.map((function (p) {
                 return [
-                        p,
-                        newvar(undefined, undefined)
-                      ];
+                  p,
+                  newvar(undefined, undefined)
+                ];
               }), spl);
         const desc = {
           TAG: /* Ttuple */2,
@@ -65010,16 +65010,16 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
                 return type_pat$1(undefined, undefined)(param[0], param[1]);
               }), spl_ann);
         return rp({
-                    pat_desc: {
-                      TAG: /* Tpat_tuple */3,
-                      _0: pl
-                    },
-                    pat_loc: loc,
-                    pat_extra: /* [] */0,
-                    pat_type: expected_ty,
-                    pat_env: env.contents,
-                    pat_attributes: sp.ppat_attributes
-                  });
+              pat_desc: {
+                TAG: /* Tpat_tuple */3,
+                _0: pl
+              },
+              pat_loc: loc,
+              pat_extra: /* [] */0,
+              pat_type: expected_ty,
+              pat_env: env.contents,
+              pat_attributes: sp.ppat_attributes
+            });
     case /* Ppat_construct */5 :
         const sarg = name._1;
         const lid = name._0;
@@ -65079,15 +65079,15 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
             return ;
           }
           throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                    MEL_EXN_ID: $$Error$7,
-                    _1: lid.loc,
-                    _2: env.contents,
-                    _3: {
-                      TAG: /* Unqualified_gadt_pattern */34,
-                      _0: tpath,
-                      _1: constr.cstr_name
-                    }
-                  });
+                MEL_EXN_ID: $$Error$7,
+                _1: lid.loc,
+                _2: env.contents,
+                _3: {
+                  TAG: /* Unqualified_gadt_pattern */34,
+                  _0: tpath,
+                  _1: constr.cstr_name
+                }
+              });
         };
         const partial_arg = env.contents;
         const partial_arg$1 = check_lk;
@@ -65098,11 +65098,11 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
         check_deprecated(loc, constr.cstr_attributes, constr.cstr_name);
         if (no_existentials && Caml_obj.caml_notequal(constr.cstr_existentials, /* [] */0)) {
           throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                    MEL_EXN_ID: $$Error$7,
-                    _1: loc,
-                    _2: env.contents,
-                    _3: /* Unexpected_existential */4
-                  });
+                MEL_EXN_ID: $$Error$7,
+                _1: loc,
+                _2: env.contents,
+                _3: /* Unexpected_existential */4
+              });
         }
         if (constr.cstr_generalized) {
           unify_head_only(loc, env.contents, expected_ty, constr);
@@ -65124,25 +65124,25 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
             }
           } else {
             sargs = spl$1.TAG === /* Ppat_tuple */4 && (constr.cstr_arity > 1 || explicit_arity(sp.ppat_attributes)) ? spl$1._0 : ({
-                  hd: sarg,
-                  tl: /* [] */0
-                });
+                hd: sarg,
+                tl: /* [] */0
+              });
           }
         } else {
           sargs = /* [] */0;
         }
         if (Stdlib__List.length(sargs) !== constr.cstr_arity) {
           throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                    MEL_EXN_ID: $$Error$7,
-                    _1: loc,
-                    _2: env.contents,
-                    _3: {
-                      TAG: /* Constructor_arity_mismatch */1,
-                      _0: lid.txt,
-                      _1: constr.cstr_arity,
-                      _2: Stdlib__List.length(sargs)
-                    }
-                  });
+                MEL_EXN_ID: $$Error$7,
+                _1: loc,
+                _2: env.contents,
+                _3: {
+                  TAG: /* Constructor_arity_mismatch */1,
+                  _0: lid.txt,
+                  _1: constr.cstr_arity,
+                  _2: Stdlib__List.length(sargs)
+                }
+              });
         }
         const match$2 = instance_constructor([
               env,
@@ -65158,25 +65158,25 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
                 return type_pat$1(undefined, undefined)(p, t);
               }), sargs, match$2[0]);
         return rp({
-                    pat_desc: {
-                      TAG: /* Tpat_construct */4,
-                      _0: lid,
-                      _1: constr,
-                      _2: args
-                    },
-                    pat_loc: loc,
-                    pat_extra: /* [] */0,
-                    pat_type: expected_ty,
-                    pat_env: env.contents,
-                    pat_attributes: sp.ppat_attributes
-                  });
+              pat_desc: {
+                TAG: /* Tpat_construct */4,
+                _0: lid,
+                _1: constr,
+                _2: args
+              },
+              pat_loc: loc,
+              pat_extra: /* [] */0,
+              pat_type: expected_ty,
+              pat_env: env.contents,
+              pat_attributes: sp.ppat_attributes
+            });
     case /* Ppat_variant */6 :
         const sarg$1 = name._1;
         const l = name._0;
         const arg_type = sarg$1 !== undefined ? ({
-              hd: newvar(undefined, undefined),
-              tl: /* [] */0
-            }) : /* [] */0;
+            hd: newvar(undefined, undefined),
+            tl: /* [] */0
+          }) : /* [] */0;
         const row_row_fields = {
           hd: [
             l,
@@ -65207,27 +65207,27 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
                 }), expected_ty);
         const arg = sarg$1 !== undefined && arg_type && !arg_type.tl ? type_pat$1(undefined, undefined)(sarg$1, arg_type.hd) : undefined;
         return rp({
-                    pat_desc: {
-                      TAG: /* Tpat_variant */5,
-                      _0: l,
-                      _1: arg,
-                      _2: {
-                        contents: {
-                          row_fields: row_row_fields,
-                          row_more: newvar(undefined, undefined),
-                          row_bound: undefined,
-                          row_closed: false,
-                          row_fixed: false,
-                          row_name: undefined
-                        }
-                      }
-                    },
-                    pat_loc: loc,
-                    pat_extra: /* [] */0,
-                    pat_type: expected_ty,
-                    pat_env: env.contents,
-                    pat_attributes: sp.ppat_attributes
-                  });
+              pat_desc: {
+                TAG: /* Tpat_variant */5,
+                _0: l,
+                _1: arg,
+                _2: {
+                  contents: {
+                    row_fields: row_row_fields,
+                    row_more: newvar(undefined, undefined),
+                    row_bound: undefined,
+                    row_closed: false,
+                    row_fixed: false,
+                    row_name: undefined
+                  }
+                }
+              },
+              pat_loc: loc,
+              pat_extra: /* [] */0,
+              pat_type: expected_ty,
+              pat_env: env.contents,
+              pat_attributes: sp.ppat_attributes
+            });
     case /* Ppat_record */7 :
         const closed = name._1;
         const lid_sp_list = name._0;
@@ -65276,15 +65276,15 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
             const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
             if (trace.MEL_EXN_ID === Unify) {
               throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                        MEL_EXN_ID: $$Error$7,
-                        _1: label_lid.loc,
-                        _2: env.contents,
-                        _3: {
-                          TAG: /* Label_mismatch */2,
-                          _0: label_lid.txt,
-                          _1: trace._1
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$7,
+                    _1: label_lid.loc,
+                    _2: env.contents,
+                    _3: {
+                      TAG: /* Label_mismatch */2,
+                      _0: label_lid.txt,
+                      _1: trace._1
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
           }
@@ -65305,22 +65305,22 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
             };
             if (Stdlib__List.exists(instantiated, vars)) {
               throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                        MEL_EXN_ID: $$Error$7,
-                        _1: label_lid.loc,
-                        _2: env.contents,
-                        _3: {
-                          TAG: /* Polymorphic_label */0,
-                          _0: label_lid.txt
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$7,
+                    _1: label_lid.loc,
+                    _2: env.contents,
+                    _3: {
+                      TAG: /* Polymorphic_label */0,
+                      _0: label_lid.txt
+                    }
+                  });
             }
             
           }
           return [
-                  label_lid,
-                  label,
-                  arg
-                ];
+            label_lid,
+            label,
+            arg
+          ];
         };
         const partial_arg$2 = env.contents;
         const lbl_pat_list = wrap_disambiguate("This record pattern is expected to have", expected_ty, (function (param) {
@@ -65329,40 +65329,40 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
         check_recordpat_labels(loc, lbl_pat_list, closed);
         unify_pat_types(loc, env.contents, record_ty, expected_ty);
         return rp({
-                    pat_desc: {
-                      TAG: /* Tpat_record */6,
-                      _0: lbl_pat_list,
-                      _1: closed
-                    },
-                    pat_loc: loc,
-                    pat_extra: /* [] */0,
-                    pat_type: expected_ty,
-                    pat_env: env.contents,
-                    pat_attributes: sp.ppat_attributes
-                  });
+              pat_desc: {
+                TAG: /* Tpat_record */6,
+                _0: lbl_pat_list,
+                _1: closed
+              },
+              pat_loc: loc,
+              pat_extra: /* [] */0,
+              pat_type: expected_ty,
+              pat_env: env.contents,
+              pat_attributes: sp.ppat_attributes
+            });
     case /* Ppat_array */8 :
         const ty_elt = newvar(undefined, undefined);
         unify_pat_types(loc, env.contents, instance_def(type_array(ty_elt)), expected_ty);
         const spl_ann$1 = Stdlib__List.map((function (p) {
                 return [
-                        p,
-                        newvar(undefined, undefined)
-                      ];
+                  p,
+                  newvar(undefined, undefined)
+                ];
               }), name._0);
         const pl$1 = Stdlib__List.map((function (param) {
                 return type_pat$1(undefined, undefined)(param[0], ty_elt);
               }), spl_ann$1);
         return rp({
-                    pat_desc: {
-                      TAG: /* Tpat_array */7,
-                      _0: pl$1
-                    },
-                    pat_loc: loc,
-                    pat_extra: /* [] */0,
-                    pat_type: expected_ty,
-                    pat_env: env.contents,
-                    pat_attributes: sp.ppat_attributes
-                  });
+              pat_desc: {
+                TAG: /* Tpat_array */7,
+                _0: pl$1
+              },
+              pat_loc: loc,
+              pat_extra: /* [] */0,
+              pat_type: expected_ty,
+              pat_env: env.contents,
+              pat_attributes: sp.ppat_attributes
+            });
     case /* Ppat_or */9 :
         const initial_pattern_variables = pattern_variables.contents;
         const p1 = type_pat$1(/* Inside_or */1, undefined)(name._0, expected_ty);
@@ -65373,18 +65373,18 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
         const alpha_env = enter_orpat_variables(loc, env.contents, p1_variables, p2_variables);
         pattern_variables.contents = p1_variables;
         return rp({
-                    pat_desc: {
-                      TAG: /* Tpat_or */8,
-                      _0: p1,
-                      _1: alpha_pat(alpha_env, p2),
-                      _2: undefined
-                    },
-                    pat_loc: loc,
-                    pat_extra: /* [] */0,
-                    pat_type: expected_ty,
-                    pat_env: env.contents,
-                    pat_attributes: sp.ppat_attributes
-                  });
+              pat_desc: {
+                TAG: /* Tpat_or */8,
+                _0: p1,
+                _1: alpha_pat(alpha_env, p2),
+                _2: undefined
+              },
+              pat_loc: loc,
+              pat_extra: /* [] */0,
+              pat_type: expected_ty,
+              pat_env: env.contents,
+              pat_attributes: sp.ppat_attributes
+            });
     case /* Ppat_constraint */10 :
         const sp$1 = name._0;
         let exit$1 = 0;
@@ -65410,13 +65410,13 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
             const match$6 = ty$1.desc;
             if (/* tag */typeof match$6 === "number" || typeof match$6 === "string") {
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          43318,
-                          13
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/ocaml_typedtree_test.ml",
+                      43318,
+                      13
+                    ]
+                  });
             }
             if (match$6.TAG === /* Tpoly */10) {
               begin_def(undefined);
@@ -65428,36 +65428,36 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
                   }, ty$p);
               const id$2 = enter_variable(undefined, undefined, lloc, name$4, ty$p);
               return rp({
-                          pat_desc: {
-                            TAG: /* Tpat_var */0,
-                            _0: id$2,
-                            _1: name$4
-                          },
-                          pat_loc: lloc,
-                          pat_extra: {
-                            hd: [
-                              {
-                                TAG: /* Tpat_constraint */0,
-                                _0: cty
-                              },
-                              loc,
-                              sp.ppat_attributes
-                            ],
-                            tl: /* [] */0
-                          },
-                          pat_type: ty$1,
-                          pat_env: env.contents,
-                          pat_attributes: /* [] */0
-                        });
+                    pat_desc: {
+                      TAG: /* Tpat_var */0,
+                      _0: id$2,
+                      _1: name$4
+                    },
+                    pat_loc: lloc,
+                    pat_extra: {
+                      hd: [
+                        {
+                          TAG: /* Tpat_constraint */0,
+                          _0: cty
+                        },
+                        loc,
+                        sp.ppat_attributes
+                      ],
+                      tl: /* [] */0
+                    },
+                    pat_type: ty$1,
+                    pat_env: env.contents,
+                    pat_attributes: /* [] */0
+                  });
             }
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "jscomp/test/ocaml_typedtree_test.ml",
-                        43318,
-                        13
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "jscomp/test/ocaml_typedtree_test.ml",
+                    43318,
+                    13
+                  ]
+                });
           }
         }
         if (exit$1 === 1) {
@@ -65492,43 +65492,43 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
           } else {
             if (match$9.TAG === /* Tpat_var */0) {
               return {
-                      pat_desc: {
-                        TAG: /* Tpat_alias */1,
-                        _0: {
-                          pat_desc: /* Tpat_any */0,
-                          pat_loc: p$2.pat_loc,
-                          pat_extra: p$2.pat_extra,
-                          pat_type: p$2.pat_type,
-                          pat_env: p$2.pat_env,
-                          pat_attributes: /* [] */0
-                        },
-                        _1: match$9._0,
-                        _2: match$9._1
-                      },
-                      pat_loc: p$2.pat_loc,
-                      pat_extra: {
-                        hd: extra,
-                        tl: /* [] */0
-                      },
-                      pat_type: ty$3,
-                      pat_env: p$2.pat_env,
-                      pat_attributes: p$2.pat_attributes
-                    };
+                pat_desc: {
+                  TAG: /* Tpat_alias */1,
+                  _0: {
+                    pat_desc: /* Tpat_any */0,
+                    pat_loc: p$2.pat_loc,
+                    pat_extra: p$2.pat_extra,
+                    pat_type: p$2.pat_type,
+                    pat_env: p$2.pat_env,
+                    pat_attributes: /* [] */0
+                  },
+                  _1: match$9._0,
+                  _2: match$9._1
+                },
+                pat_loc: p$2.pat_loc,
+                pat_extra: {
+                  hd: extra,
+                  tl: /* [] */0
+                },
+                pat_type: ty$3,
+                pat_env: p$2.pat_env,
+                pat_attributes: p$2.pat_attributes
+              };
             }
             exit$2 = 2;
           }
           if (exit$2 === 2) {
             return {
-                    pat_desc: p$2.pat_desc,
-                    pat_loc: p$2.pat_loc,
-                    pat_extra: {
-                      hd: extra,
-                      tl: p$2.pat_extra
-                    },
-                    pat_type: ty$3,
-                    pat_env: p$2.pat_env,
-                    pat_attributes: p$2.pat_attributes
-                  };
+              pat_desc: p$2.pat_desc,
+              pat_loc: p$2.pat_loc,
+              pat_extra: {
+                hd: extra,
+                tl: p$2.pat_extra
+              },
+              pat_type: ty$3,
+              pat_env: p$2.pat_env,
+              pat_attributes: p$2.pat_attributes
+            };
           }
           
         }
@@ -65539,73 +65539,73 @@ function type_pat(constrs, labels, no_existentials, mode, env, sp, expected_ty)
         const p$3 = match$10[1];
         unify_pat_types(loc, env.contents, match$10[2], expected_ty);
         return {
-                pat_desc: p$3.pat_desc,
-                pat_loc: p$3.pat_loc,
-                pat_extra: {
-                  hd: [
-                    {
-                      TAG: /* Tpat_type */1,
-                      _0: match$10[0],
-                      _1: lid$1
-                    },
-                    loc,
-                    sp.ppat_attributes
-                  ],
-                  tl: p$3.pat_extra
-                },
-                pat_type: p$3.pat_type,
-                pat_env: p$3.pat_env,
-                pat_attributes: p$3.pat_attributes
-              };
+          pat_desc: p$3.pat_desc,
+          pat_loc: p$3.pat_loc,
+          pat_extra: {
+            hd: [
+              {
+                TAG: /* Tpat_type */1,
+                _0: match$10[0],
+                _1: lid$1
+              },
+              loc,
+              sp.ppat_attributes
+            ],
+            tl: p$3.pat_extra
+          },
+          pat_type: p$3.pat_type,
+          pat_env: p$3.pat_env,
+          pat_attributes: p$3.pat_attributes
+        };
     case /* Ppat_lazy */12 :
         const nv = newvar(undefined, undefined);
         unify_pat_types(loc, env.contents, instance_def(type_lazy_t(nv)), expected_ty);
         const p1$1 = type_pat$1(undefined, undefined)(name._0, nv);
         return rp({
-                    pat_desc: {
-                      TAG: /* Tpat_lazy */9,
-                      _0: p1$1
-                    },
-                    pat_loc: loc,
-                    pat_extra: /* [] */0,
-                    pat_type: expected_ty,
-                    pat_env: env.contents,
-                    pat_attributes: sp.ppat_attributes
-                  });
+              pat_desc: {
+                TAG: /* Tpat_lazy */9,
+                _0: p1$1
+              },
+              pat_loc: loc,
+              pat_extra: /* [] */0,
+              pat_type: expected_ty,
+              pat_env: env.contents,
+              pat_attributes: sp.ppat_attributes
+            });
     case /* Ppat_unpack */13 :
         const name$5 = name._0;
         const id$3 = enter_variable(true, undefined, loc, name$5, expected_ty);
         return rp({
-                    pat_desc: {
-                      TAG: /* Tpat_var */0,
-                      _0: id$3,
-                      _1: name$5
-                    },
-                    pat_loc: sp.ppat_loc,
-                    pat_extra: {
-                      hd: [
-                        /* Tpat_unpack */0,
-                        loc,
-                        sp.ppat_attributes
-                      ],
-                      tl: /* [] */0
-                    },
-                    pat_type: expected_ty,
-                    pat_env: env.contents,
-                    pat_attributes: /* [] */0
-                  });
+              pat_desc: {
+                TAG: /* Tpat_var */0,
+                _0: id$3,
+                _1: name$5
+              },
+              pat_loc: sp.ppat_loc,
+              pat_extra: {
+                hd: [
+                  /* Tpat_unpack */0,
+                  loc,
+                  sp.ppat_attributes
+                ],
+                tl: /* [] */0
+              },
+              pat_type: expected_ty,
+              pat_env: env.contents,
+              pat_attributes: /* [] */0
+            });
     case /* Ppat_exception */14 :
         throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                  MEL_EXN_ID: $$Error$7,
-                  _1: loc,
-                  _2: env.contents,
-                  _3: /* Exception_pattern_below_toplevel */8
-                });
+              MEL_EXN_ID: $$Error$7,
+              _1: loc,
+              _2: env.contents,
+              _3: /* Exception_pattern_below_toplevel */8
+            });
     case /* Ppat_extension */15 :
         throw new Caml_js_exceptions.MelangeError(Error_forward$1, {
-                  MEL_EXN_ID: Error_forward$1,
-                  _1: error_of_extension(name._0)
-                });
+              MEL_EXN_ID: Error_forward$1,
+              _1: error_of_extension(name._0)
+            });
     
   }
 }
@@ -65655,8 +65655,8 @@ function check_partial$1(levOpt, env, expected_ty) {
       return /* Partial */0;
     } else {
       return check_partial_param((function (param, param$1, param$2) {
-                    return do_check_partial(pred, exhaust_gadt$1, param, param$1, param$2);
-                  }), do_check_fragile_gadt, param, param$1);
+              return do_check_partial(pred, exhaust_gadt$1, param, param$1, param$2);
+            }), do_check_fragile_gadt, param, param$1);
     }
   };
 }
@@ -65664,17 +65664,17 @@ function check_partial$1(levOpt, env, expected_ty) {
 function add_pattern_variables(check, check_as, env) {
   const pv = get_ref(pattern_variables);
   return [
-          Stdlib__List.fold_right((function (param, env) {
-                  const check$1 = param[4] ? check_as : check;
-                  return add_value(check$1, param[0], {
-                              val_type: param[1],
-                              val_kind: /* Val_reg */0,
-                              val_loc: param[3],
-                              val_attributes: /* [] */0
-                            }, env);
-                }), pv, env),
-          get_ref(module_variables)
-        ];
+    Stdlib__List.fold_right((function (param, env) {
+            const check$1 = param[4] ? check_as : check;
+            return add_value(check$1, param[0], {
+                  val_type: param[1],
+                  val_kind: /* Val_reg */0,
+                  val_loc: param[3],
+                  val_attributes: /* [] */0
+                }, env);
+          }), pv, env),
+    get_ref(module_variables)
+  ];
 }
 
 function type_pattern(lev, env, spat, scope, expected_ty) {
@@ -65685,21 +65685,21 @@ function type_pattern(lev, env, spat, scope, expected_ty) {
   const pat = type_pat$1(true, undefined, undefined, lev, new_env, spat, expected_ty);
   const match = add_pattern_variables((function (s) {
           return {
-                  TAG: /* Unused_var_strict */13,
-                  _0: s
-                };
+            TAG: /* Unused_var_strict */13,
+            _0: s
+          };
         }), (function (s) {
           return {
-                  TAG: /* Unused_var */12,
-                  _0: s
-                };
+            TAG: /* Unused_var */12,
+            _0: s
+          };
         }), new_env.contents);
   return [
-          pat,
-          match[0],
-          get_ref(pattern_force),
-          match[1]
-        ];
+    pat,
+    match[0],
+    get_ref(pattern_force),
+    match[1]
+  ];
 }
 
 function type_pattern_list(env, spatl, scope, expected_tys, allow) {
@@ -65712,11 +65712,11 @@ function type_pattern_list(env, spatl, scope, expected_tys, allow) {
         }), spatl, expected_tys);
   const match = add_pattern_variables(undefined, undefined, new_env.contents);
   return [
-          patl,
-          match[0],
-          get_ref(pattern_force),
-          match[1]
-        ];
+    patl,
+    match[0],
+    get_ref(pattern_force),
+    match[1]
+  ];
 }
 
 function type_class_arg_pattern(cl_num, val_env, met_env, l, spat) {
@@ -65745,49 +65745,49 @@ function type_class_arg_pattern(cl_num, val_env, met_env, l, spat) {
           const check = function (s) {
             if (as_var) {
               return {
-                      TAG: /* Unused_var */12,
-                      _0: s
-                    };
+                TAG: /* Unused_var */12,
+                _0: s
+              };
             } else {
               return {
-                      TAG: /* Unused_var_strict */13,
-                      _0: s
-                    };
+                TAG: /* Unused_var_strict */13,
+                _0: s
+              };
             }
           };
           const id$p = create(id.name);
           return [
-                  {
-                    hd: [
-                      id$p,
-                      param[2],
-                      id,
-                      ty
-                    ],
-                    tl: param$1[0]
+            {
+              hd: [
+                id$p,
+                param[2],
+                id,
+                ty
+              ],
+              tl: param$1[0]
+            },
+            add_value(check, id$p, {
+                  val_type: ty,
+                  val_kind: {
+                    TAG: /* Val_ivar */1,
+                    _0: /* Immutable */0,
+                    _1: cl_num
                   },
-                  add_value(check, id$p, {
-                        val_type: ty,
-                        val_kind: {
-                          TAG: /* Val_ivar */1,
-                          _0: /* Immutable */0,
-                          _1: cl_num
-                        },
-                        val_loc: param[3],
-                        val_attributes: /* [] */0
-                      }, param$1[1])
-                ];
+                  val_loc: param[3],
+                  val_attributes: /* [] */0
+                }, param$1[1])
+          ];
         }), pattern_variables.contents, [
         /* [] */0,
         met_env
       ]);
   const match$1 = add_pattern_variables(undefined, undefined, val_env);
   return [
-          pat,
-          match[0],
-          match$1[0],
-          match[1]
-        ];
+    pat,
+    match[0],
+    match$1[0],
+    match[1]
+  ];
 }
 
 function type_self_pattern(cl_num, privty, val_env, met_env, par_env, spat) {
@@ -65828,56 +65828,56 @@ function type_self_pattern(cl_num, privty, val_env, met_env, par_env, spat) {
           const ty = param[1];
           const id = param[0];
           return [
-                  add_value(undefined, id, {
-                        val_type: ty,
-                        val_kind: /* Val_unbound */1,
-                        val_loc: loc,
-                        val_attributes: /* [] */0
-                      }, param$1[0]),
-                  add_value((function (s) {
-                          if (as_var) {
-                            return {
-                                    TAG: /* Unused_var */12,
-                                    _0: s
-                                  };
-                          } else {
-                            return {
-                                    TAG: /* Unused_var_strict */13,
-                                    _0: s
-                                  };
-                          }
-                        }), id, {
-                        val_type: ty,
-                        val_kind: {
-                          TAG: /* Val_self */2,
-                          _0: meths,
-                          _1: vars,
-                          _2: cl_num,
-                          _3: privty
-                        },
-                        val_loc: loc,
-                        val_attributes: /* [] */0
-                      }, param$1[1]),
-                  add_value(undefined, id, {
-                        val_type: ty,
-                        val_kind: /* Val_unbound */1,
-                        val_loc: loc,
-                        val_attributes: /* [] */0
-                      }, param$1[2])
-                ];
+            add_value(undefined, id, {
+                  val_type: ty,
+                  val_kind: /* Val_unbound */1,
+                  val_loc: loc,
+                  val_attributes: /* [] */0
+                }, param$1[0]),
+            add_value((function (s) {
+                    if (as_var) {
+                      return {
+                        TAG: /* Unused_var */12,
+                        _0: s
+                      };
+                    } else {
+                      return {
+                        TAG: /* Unused_var_strict */13,
+                        _0: s
+                      };
+                    }
+                  }), id, {
+                  val_type: ty,
+                  val_kind: {
+                    TAG: /* Val_self */2,
+                    _0: meths,
+                    _1: vars,
+                    _2: cl_num,
+                    _3: privty
+                  },
+                  val_loc: loc,
+                  val_attributes: /* [] */0
+                }, param$1[1]),
+            add_value(undefined, id, {
+                  val_type: ty,
+                  val_kind: /* Val_unbound */1,
+                  val_loc: loc,
+                  val_attributes: /* [] */0
+                }, param$1[2])
+          ];
         }), pv, [
         val_env,
         met_env,
         par_env
       ]);
   return [
-          pat,
-          meths,
-          vars,
-          match[0],
-          match[1],
-          match[2]
-        ];
+    pat,
+    meths,
+    vars,
+    match[0],
+    match[1],
+    match[2]
+  ];
 }
 
 const delayed_checks = {
@@ -65963,12 +65963,12 @@ function is_nonexpansive(_exp) {
             return false;
           } else {
             return Stdlib__List.for_all((function (param) {
-                          if (is_nonexpansive_opt(param.c_guard)) {
-                            return is_nonexpansive(param.c_rhs);
-                          } else {
-                            return false;
-                          }
-                        }), el._1);
+                    if (is_nonexpansive_opt(param.c_guard)) {
+                      return is_nonexpansive(param.c_rhs);
+                    } else {
+                      return false;
+                    }
+                  }), el._1);
           }
       case /* Texp_tuple */7 :
           return Stdlib__List.for_all(is_nonexpansive, el._0);
@@ -66057,42 +66057,42 @@ function is_nonexpansive_mod(_mexp) {
     switch (str.TAG) {
       case /* Tmod_structure */1 :
           return Stdlib__List.for_all((function (item) {
-                        const id_mod_list = item.str_desc;
-                        switch (id_mod_list.TAG) {
-                          case /* Tstr_value */1 :
-                              return Stdlib__List.for_all((function (vb) {
-                                            return is_nonexpansive(vb.vb_expr);
-                                          }), id_mod_list._1);
-                          case /* Tstr_typext */4 :
-                              return Stdlib__List.for_all((function (param) {
-                                            if (param.ext_kind.TAG === /* Text_decl */0) {
-                                              return false;
-                                            } else {
-                                              return true;
-                                            }
-                                          }), id_mod_list._0.tyext_constructors);
-                          case /* Tstr_exception */5 :
-                              if (id_mod_list._0.ext_kind.TAG === /* Text_decl */0) {
-                                return false;
-                              } else {
-                                return true;
-                              }
-                          case /* Tstr_module */6 :
-                              return is_nonexpansive_mod(id_mod_list._0.mb_expr);
-                          case /* Tstr_recmodule */7 :
-                              return Stdlib__List.for_all((function (param) {
-                                            return is_nonexpansive_mod(param.mb_expr);
-                                          }), id_mod_list._0);
-                          case /* Tstr_class */10 :
-                              return false;
-                          case /* Tstr_include */12 :
-                              return is_nonexpansive_mod(id_mod_list._0.incl_mod);
-                          case /* Tstr_attribute */13 :
-                              return true;
-                          default:
-                            return true;
+                  const id_mod_list = item.str_desc;
+                  switch (id_mod_list.TAG) {
+                    case /* Tstr_value */1 :
+                        return Stdlib__List.for_all((function (vb) {
+                                return is_nonexpansive(vb.vb_expr);
+                              }), id_mod_list._1);
+                    case /* Tstr_typext */4 :
+                        return Stdlib__List.for_all((function (param) {
+                                if (param.ext_kind.TAG === /* Text_decl */0) {
+                                  return false;
+                                } else {
+                                  return true;
+                                }
+                              }), id_mod_list._0.tyext_constructors);
+                    case /* Tstr_exception */5 :
+                        if (id_mod_list._0.ext_kind.TAG === /* Text_decl */0) {
+                          return false;
+                        } else {
+                          return true;
                         }
-                      }), str._0.str_items);
+                    case /* Tstr_module */6 :
+                        return is_nonexpansive_mod(id_mod_list._0.mb_expr);
+                    case /* Tstr_recmodule */7 :
+                        return Stdlib__List.for_all((function (param) {
+                                return is_nonexpansive_mod(param.mb_expr);
+                              }), id_mod_list._0);
+                    case /* Tstr_class */10 :
+                        return false;
+                    case /* Tstr_include */12 :
+                        return is_nonexpansive_mod(id_mod_list._0.incl_mod);
+                    case /* Tstr_attribute */13 :
+                        return true;
+                    default:
+                      return true;
+                  }
+                }), str._0.str_items);
       case /* Tmod_ident */0 :
       case /* Tmod_functor */2 :
           return true;
@@ -66150,8 +66150,8 @@ function approx_type(env, _sty) {
             const match = lookup_type$1(args._0.txt, env);
             if (Stdlib__List.length(ctl) !== match[1].type_arity) {
               throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                        MEL_EXN_ID: Stdlib.Not_found
-                      });
+                    MEL_EXN_ID: Stdlib.Not_found
+                  });
             }
             const tyl = Stdlib__List.map((function (param) {
                     return approx_type(env, param);
@@ -66253,14 +66253,14 @@ function type_approx(env, _sexp) {
             const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
             if (trace.MEL_EXN_ID === Unify) {
               throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                        MEL_EXN_ID: $$Error$7,
-                        _1: sexp.pexp_loc,
-                        _2: env,
-                        _3: {
-                          TAG: /* Expr_type_clash */7,
-                          _0: trace._1
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$7,
+                    _1: sexp.pexp_loc,
+                    _2: env,
+                    _3: {
+                      TAG: /* Expr_type_clash */7,
+                      _0: trace._1
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
           }
@@ -66283,14 +66283,14 @@ function type_approx(env, _sexp) {
             const trace$1 = Caml_js_exceptions.internalToOCamlException(raw_trace$1);
             if (trace$1.MEL_EXN_ID === Unify) {
               throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                        MEL_EXN_ID: $$Error$7,
-                        _1: sexp.pexp_loc,
-                        _2: env,
-                        _3: {
-                          TAG: /* Expr_type_clash */7,
-                          _0: trace$1._1
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$7,
+                    _1: sexp.pexp_loc,
+                    _2: env,
+                    _3: {
+                      TAG: /* Expr_type_clash */7,
+                      _0: trace$1._1
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(trace$1.MEL_EXN_ID, trace$1);
           }
@@ -66303,45 +66303,45 @@ function type_approx(env, _sexp) {
 
 function list_labels(env, ty) {
   return wrap_trace_gadt_instances(env, (function (param) {
-                let _visited = /* [] */0;
-                let _ls = /* [] */0;
-                let _ty_fun = param;
-                while(true) {
-                  const ty_fun = _ty_fun;
-                  const ls = _ls;
-                  const visited = _visited;
-                  const ty = expand_head(env, ty_fun);
-                  if (Stdlib__List.memq(ty, visited)) {
-                    return [
-                            Stdlib__List.rev(ls),
-                            false
-                          ];
-                  }
-                  const match = ty.desc;
-                  if (/* tag */typeof match === "number" || typeof match === "string") {
-                    return [
-                            Stdlib__List.rev(ls),
-                            is_Tvar(ty)
-                          ];
-                  }
-                  if (match.TAG !== /* Tarrow */1) {
-                    return [
-                            Stdlib__List.rev(ls),
-                            is_Tvar(ty)
-                          ];
-                  }
-                  _ty_fun = match._2;
-                  _ls = {
-                    hd: match._0,
-                    tl: ls
-                  };
-                  _visited = {
-                    hd: ty,
-                    tl: visited
-                  };
-                  continue ;
-                };
-              }), ty);
+          let _visited = /* [] */0;
+          let _ls = /* [] */0;
+          let _ty_fun = param;
+          while(true) {
+            const ty_fun = _ty_fun;
+            const ls = _ls;
+            const visited = _visited;
+            const ty = expand_head(env, ty_fun);
+            if (Stdlib__List.memq(ty, visited)) {
+              return [
+                Stdlib__List.rev(ls),
+                false
+              ];
+            }
+            const match = ty.desc;
+            if (/* tag */typeof match === "number" || typeof match === "string") {
+              return [
+                Stdlib__List.rev(ls),
+                is_Tvar(ty)
+              ];
+            }
+            if (match.TAG !== /* Tarrow */1) {
+              return [
+                Stdlib__List.rev(ls),
+                is_Tvar(ty)
+              ];
+            }
+            _ty_fun = match._2;
+            _ls = {
+              hd: match._0,
+              tl: ls
+            };
+            _visited = {
+              hd: ty,
+              tl: visited
+            };
+            continue ;
+          };
+        }), ty);
 }
 
 function check_univars(env, expans, kind, exp, ty_expected, vars) {
@@ -66381,27 +66381,27 @@ function check_univars(env, expans, kind, exp, ty_expected, vars) {
       });
   const ty_expected$1 = repr(ty_expected);
   throw new Caml_js_exceptions.MelangeError($$Error$7, {
-            MEL_EXN_ID: $$Error$7,
-            _1: exp.exp_loc,
-            _2: env,
-            _3: {
-              TAG: /* Less_general */31,
-              _0: kind,
-              _1: {
-                hd: [
-                  ty,
-                  ty
-                ],
-                tl: {
-                  hd: [
-                    ty_expected$1,
-                    ty_expected$1
-                  ],
-                  tl: /* [] */0
-                }
-              }
+        MEL_EXN_ID: $$Error$7,
+        _1: exp.exp_loc,
+        _2: env,
+        _3: {
+          TAG: /* Less_general */31,
+          _0: kind,
+          _1: {
+            hd: [
+              ty,
+              ty
+            ],
+            tl: {
+              hd: [
+                ty_expected$1,
+                ty_expected$1
+              ],
+              tl: /* [] */0
             }
-          });
+          }
+        }
+      });
 }
 
 function check_application_result(env, statement, exp) {
@@ -66436,8 +66436,8 @@ function generalizable(level, ty) {
     }
     if (ty$1.level <= level) {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                MEL_EXN_ID: Stdlib.Exit
-              });
+            MEL_EXN_ID: Stdlib.Exit
+          });
     }
     mark_type_node(ty$1);
     iter_type_expr(check, ty$1);
@@ -66463,15 +66463,15 @@ const self_coercion = {
 
 function wrap_unpacks(sexp, unpacks) {
   return Stdlib__List.fold_left((function (sexp, param) {
-                const name = param[0];
-                return Curry._5(Ast_helper_Exp.letmodule, sexp.pexp_loc, undefined, name, unpack$1(param[1], undefined, Curry._3(Ast_helper_Exp.ident, name.loc, undefined, {
-                                    txt: {
-                                      TAG: /* Lident */0,
-                                      _0: name.txt
-                                    },
-                                    loc: name.loc
-                                  })), sexp);
-              }), sexp, unpacks);
+          const name = param[0];
+          return Curry._5(Ast_helper_Exp.letmodule, sexp.pexp_loc, undefined, name, unpack$1(param[1], undefined, Curry._3(Ast_helper_Exp.ident, name.loc, undefined, {
+                        txt: {
+                          TAG: /* Lident */0,
+                          _0: name.txt
+                        },
+                        loc: name.loc
+                      })), sexp);
+        }), sexp, unpacks);
 }
 
 function contains_variant_either(ty) {
@@ -66499,8 +66499,8 @@ function contains_variant_either(ty) {
                 return ;
               }
               throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                        MEL_EXN_ID: Stdlib.Exit
-                      });
+                    MEL_EXN_ID: Stdlib.Exit
+                  });
             }), row$1.row_fields);
     }
     iter_row(loop, row$1);
@@ -66531,8 +66531,8 @@ function iter_ppat(f, p) {
         return may(f, pats._1);
     case /* Ppat_record */7 :
         return Stdlib__List.iter((function (param) {
-                      Curry._1(f, param[1]);
-                    }), pats._0);
+                Curry._1(f, param[1]);
+              }), pats._0);
     case /* Ppat_tuple */4 :
     case /* Ppat_array */8 :
         return Stdlib__List.iter(f, pats._0);
@@ -66559,8 +66559,8 @@ function contains_polymorphic_variant(p) {
       case /* Ppat_variant */6 :
       case /* Ppat_type */11 :
           throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                    MEL_EXN_ID: Stdlib.Exit
-                  });
+                MEL_EXN_ID: Stdlib.Exit
+              });
       default:
         return iter_ppat(loop, p);
     }
@@ -66594,8 +66594,8 @@ function contains_gadt(env, p) {
                 return ;
               }
               throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                        MEL_EXN_ID: Stdlib.Exit
-                      });
+                    MEL_EXN_ID: Stdlib.Exit
+                  });
             }), cstrs);
     }
     catch (raw_exn){
@@ -66623,65 +66623,65 @@ function contains_gadt(env, p) {
 function check_absent_variant(env) {
   return function (param) {
     return iter_pattern((function (pat) {
-                  const match = pat.pat_desc;
-                  if (/* tag */typeof match === "number" || typeof match === "string") {
-                    return ;
-                  }
-                  if (match.TAG !== /* Tpat_variant */5) {
-                    return ;
-                  }
-                  const arg = match._1;
-                  const s = match._0;
-                  const row = row_repr_aux(/* [] */0, match._2.contents);
-                  if (Stdlib__List.exists((function (param) {
-                            if (s === param[0]) {
-                              return Caml_obj.caml_notequal(row_field_repr_aux(/* [] */0, param[1]), /* Rabsent */0);
-                            } else {
-                              return false;
-                            }
-                          }), row.row_fields) || !row.row_fixed && !static_row(row)) {
-                    return ;
-                  }
-                  const ty_arg = arg !== undefined ? ({
-                        hd: type_expr(identity, arg.pat_type),
-                        tl: /* [] */0
-                      }) : /* [] */0;
-                  const row$p_row_fields = {
-                    hd: [
-                      s,
-                      {
-                        TAG: /* Reither */1,
-                        _0: arg === undefined,
-                        _1: ty_arg,
-                        _2: true,
-                        _3: {
-                          contents: undefined
-                        }
+            const match = pat.pat_desc;
+            if (/* tag */typeof match === "number" || typeof match === "string") {
+              return ;
+            }
+            if (match.TAG !== /* Tpat_variant */5) {
+              return ;
+            }
+            const arg = match._1;
+            const s = match._0;
+            const row = row_repr_aux(/* [] */0, match._2.contents);
+            if (Stdlib__List.exists((function (param) {
+                      if (s === param[0]) {
+                        return Caml_obj.caml_notequal(row_field_repr_aux(/* [] */0, param[1]), /* Rabsent */0);
+                      } else {
+                        return false;
                       }
-                    ],
-                    tl: /* [] */0
-                  };
-                  const row$p_row_more = newvar(undefined, undefined);
-                  const row$p = {
-                    row_fields: row$p_row_fields,
-                    row_more: row$p_row_more,
-                    row_bound: undefined,
-                    row_closed: false,
-                    row_fixed: false,
-                    row_name: undefined
-                  };
-                  unify_pat(env, {
-                        pat_desc: pat.pat_desc,
-                        pat_loc: pat.pat_loc,
-                        pat_extra: pat.pat_extra,
-                        pat_type: newty2(current_level.contents, {
-                              TAG: /* Tvariant */8,
-                              _0: row$p
-                            }),
-                        pat_env: pat.pat_env,
-                        pat_attributes: pat.pat_attributes
-                      }, type_expr(identity, pat.pat_type));
-                }), param);
+                    }), row.row_fields) || !row.row_fixed && !static_row(row)) {
+              return ;
+            }
+            const ty_arg = arg !== undefined ? ({
+                hd: type_expr(identity, arg.pat_type),
+                tl: /* [] */0
+              }) : /* [] */0;
+            const row$p_row_fields = {
+              hd: [
+                s,
+                {
+                  TAG: /* Reither */1,
+                  _0: arg === undefined,
+                  _1: ty_arg,
+                  _2: true,
+                  _3: {
+                    contents: undefined
+                  }
+                }
+              ],
+              tl: /* [] */0
+            };
+            const row$p_row_more = newvar(undefined, undefined);
+            const row$p = {
+              row_fields: row$p_row_fields,
+              row_more: row$p_row_more,
+              row_bound: undefined,
+              row_closed: false,
+              row_fixed: false,
+              row_name: undefined
+            };
+            unify_pat(env, {
+                  pat_desc: pat.pat_desc,
+                  pat_loc: pat.pat_loc,
+                  pat_extra: pat.pat_extra,
+                  pat_type: newty2(current_level.contents, {
+                        TAG: /* Tvariant */8,
+                        _0: row$p
+                      }),
+                  pat_env: pat.pat_env,
+                  pat_attributes: pat.pat_attributes
+                }, type_expr(identity, pat.pat_type));
+          }), param);
   };
 }
 
@@ -66691,40 +66691,40 @@ function duplicate_ident_types(loc, caselist, env) {
         }), caselist);
   const idents = all_idents_cases(caselist$1);
   return Stdlib__List.fold_left((function (env, s) {
-                try {
-                  const match = lookup_value$1({
-                        TAG: /* Lident */0,
-                        _0: s
-                      }, env);
-                  const desc = match[1];
-                  const path = match[0];
-                  switch (path.TAG) {
-                    case /* Pident */0 :
-                        const desc_val_type = type_expr(identity, desc.val_type);
-                        const desc_val_kind = desc.val_kind;
-                        const desc_val_loc = desc.val_loc;
-                        const desc_val_attributes = desc.val_attributes;
-                        const desc$1 = {
-                          val_type: desc_val_type,
-                          val_kind: desc_val_kind,
-                          val_loc: desc_val_loc,
-                          val_attributes: desc_val_attributes
-                        };
-                        return add_value(undefined, path._0, desc$1, env);
-                    case /* Pdot */1 :
-                    case /* Papply */2 :
-                        return env;
-                    
-                  }
-                }
-                catch (raw_exn){
-                  const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-                  if (exn.MEL_EXN_ID === Stdlib.Not_found) {
-                    return env;
-                  }
-                  throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
-                }
-              }), env, idents);
+          try {
+            const match = lookup_value$1({
+                  TAG: /* Lident */0,
+                  _0: s
+                }, env);
+            const desc = match[1];
+            const path = match[0];
+            switch (path.TAG) {
+              case /* Pident */0 :
+                  const desc_val_type = type_expr(identity, desc.val_type);
+                  const desc_val_kind = desc.val_kind;
+                  const desc_val_loc = desc.val_loc;
+                  const desc_val_attributes = desc.val_attributes;
+                  const desc$1 = {
+                    val_type: desc_val_type,
+                    val_kind: desc_val_kind,
+                    val_loc: desc_val_loc,
+                    val_attributes: desc_val_attributes
+                  };
+                  return add_value(undefined, path._0, desc$1, env);
+              case /* Pdot */1 :
+              case /* Papply */2 :
+                  return env;
+              
+            }
+          }
+          catch (raw_exn){
+            const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
+            if (exn.MEL_EXN_ID === Stdlib.Not_found) {
+              return env;
+            }
+            throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
+          }
+        }), env, idents);
 }
 
 function unify_exp(env, exp, expected_ty) {
@@ -66767,9 +66767,9 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         if (annotations.contents) {
           const dloc = desc.val_loc;
           const annot = dloc.loc_ghost ? /* Iref_external */0 : ({
-                TAG: /* Iref_internal */0,
-                _0: dloc
-              });
+              TAG: /* Iref_internal */0,
+              _0: dloc
+            });
           const name$1 = name(parenthesized_ident, path);
           record$2({
                 TAG: /* An_ident */5,
@@ -66783,14 +66783,14 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
           if (match$1 === /* Val_unbound */1) {
             throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                      MEL_EXN_ID: $$Error$7,
-                      _1: loc,
-                      _2: env,
-                      _3: {
-                        TAG: /* Masked_instance_variable */29,
-                        _0: lid$1.txt
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$7,
+                  _1: loc,
+                  _2: env,
+                  _3: {
+                    TAG: /* Masked_instance_variable */29,
+                    _0: lid$1.txt
+                  }
+                });
           }
           tmp = {
             TAG: /* Texp_ident */0,
@@ -66817,13 +66817,13 @@ function type_expect_(in_function, env, sexp, ty_expected) {
                   case /* Ldot */1 :
                   case /* Lapply */2 :
                       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                MEL_EXN_ID: "Assert_failure",
-                                _1: [
-                                  "jscomp/test/ocaml_typedtree_test.ml",
-                                  44136,
-                                  38
-                                ]
-                              });
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "jscomp/test/ocaml_typedtree_test.ml",
+                              44136,
+                              38
+                            ]
+                          });
                   
                 }
                 tmp = {
@@ -66855,27 +66855,27 @@ function type_expect_(in_function, env, sexp, ty_expected) {
           }
         }
         return rue({
-                    exp_desc: tmp,
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: instance(undefined, env, desc.val_type),
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: tmp,
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: instance(undefined, env, desc.val_type),
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_constant */1 :
         const cst = lid._0;
         if (cst.TAG !== /* Const_string */2) {
           return rue({
-                      exp_desc: {
-                        TAG: /* Texp_constant */1,
-                        _0: cst
-                      },
-                      exp_loc: loc,
-                      exp_extra: /* [] */0,
-                      exp_type: type_constant(cst),
-                      exp_env: env,
-                      exp_attributes: sexp.pexp_attributes
-                    });
+                exp_desc: {
+                  TAG: /* Texp_constant */1,
+                  _0: cst
+                },
+                exp_loc: loc,
+                exp_extra: /* [] */0,
+                exp_type: type_constant(cst),
+                exp_env: env,
+                exp_attributes: sexp.pexp_attributes
+              });
         }
         const ty_exp = expand_head(env, ty_expected);
         const fmt6_path_0 = {
@@ -66907,16 +66907,16 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         }
         if (!is_format) {
           return rue({
-                      exp_desc: {
-                        TAG: /* Texp_constant */1,
-                        _0: cst
-                      },
-                      exp_loc: loc,
-                      exp_extra: /* [] */0,
-                      exp_type: instance_def(type_string),
-                      exp_env: env,
-                      exp_attributes: sexp.pexp_attributes
-                    });
+                exp_desc: {
+                  TAG: /* Texp_constant */1,
+                  _0: cst
+                },
+                exp_loc: loc,
+                exp_extra: /* [] */0,
+                exp_type: instance_def(type_string),
+                exp_env: env,
+                exp_attributes: sexp.pexp_attributes
+              });
         }
         const init = type_format(loc, cst._0, env);
         const format_parsetree_pexp_desc = init.pexp_desc;
@@ -66941,17 +66941,17 @@ function type_expect_(in_function, env, sexp, ty_expected) {
               const spat = match$6.pvb_pat;
               if (contains_gadt(env, spat)) {
                 return type_expect(in_function, env, {
-                            pexp_desc: {
-                              TAG: /* Pexp_match */6,
-                              _0: match$6.pvb_expr,
-                              _1: {
-                                hd: Curry._3(Ast_helper_Exp.$$case, spat, undefined, lid._2),
-                                tl: /* [] */0
-                              }
-                            },
-                            pexp_loc: sexp.pexp_loc,
-                            pexp_attributes: sexp.pexp_attributes
-                          }, ty_expected);
+                      pexp_desc: {
+                        TAG: /* Pexp_match */6,
+                        _0: match$6.pvb_expr,
+                        _1: {
+                          hd: Curry._3(Ast_helper_Exp.$$case, spat, undefined, lid._2),
+                          tl: /* [] */0
+                        }
+                      },
+                      pexp_loc: sexp.pexp_loc,
+                      pexp_attributes: sexp.pexp_attributes
+                    }, ty_expected);
               }
               exit = 1;
             }
@@ -66973,28 +66973,28 @@ function type_expect_(in_function, env, sexp, ty_expected) {
           }
           if (exit$1 === 2) {
             scp = rec_flag === /* Nonrecursive */0 ? ({
-                  TAG: /* Idef */1,
-                  _0: sbody.pexp_loc
-                }) : ({
-                  TAG: /* Idef */1,
-                  _0: loc
-                });
+                TAG: /* Idef */1,
+                _0: sbody.pexp_loc
+              }) : ({
+                TAG: /* Idef */1,
+                _0: loc
+              });
           }
           const match$8 = type_let(undefined, undefined, env, rec_flag, lid._1, scp, true);
           const body = type_expect(undefined, match$8[1], wrap_unpacks(sbody, match$8[2]), ty_expected);
           return re({
-                      exp_desc: {
-                        TAG: /* Texp_let */2,
-                        _0: rec_flag,
-                        _1: match$8[0],
-                        _2: body
-                      },
-                      exp_loc: loc,
-                      exp_extra: /* [] */0,
-                      exp_type: body.exp_type,
-                      exp_env: env,
-                      exp_attributes: sexp.pexp_attributes
-                    });
+                exp_desc: {
+                  TAG: /* Texp_let */2,
+                  _0: rec_flag,
+                  _1: match$8[0],
+                  _2: body
+                },
+                exp_loc: loc,
+                exp_extra: /* [] */0,
+                exp_type: body.exp_type,
+                exp_env: env,
+                exp_attributes: sexp.pexp_attributes
+              });
         }
         break;
     case /* Pexp_function */3 :
@@ -67005,13 +67005,13 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         if ($$default !== undefined) {
           if (!is_optional(l)) {
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "jscomp/test/ocaml_typedtree_test.ml",
-                        44215,
-                        6
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "jscomp/test/ocaml_typedtree_test.ml",
+                    44215,
+                    6
+                  ]
+                });
           }
           const default_loc = $$default.pexp_loc;
           const scases_0 = Curry._3(Ast_helper_Exp.$$case, construct(default_loc, undefined, {
@@ -67082,13 +67082,13 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         }
         const sexp$1 = lid._3;
         return type_function(in_function, loc, sexp$1.pexp_attributes, env, ty_expected, l, {
-                    hd: {
-                      pc_lhs: lid._2,
-                      pc_guard: undefined,
-                      pc_rhs: sexp$1
-                    },
-                    tl: /* [] */0
-                  });
+              hd: {
+                pc_lhs: lid._2,
+                pc_guard: undefined,
+                pc_rhs: sexp$1
+              },
+              tl: /* [] */0
+            });
     case /* Pexp_apply */5 :
         const sargs = lid._1;
         if (Caml_obj.caml_equal(sargs, /* [] */0)) {
@@ -67129,13 +67129,13 @@ function type_expect_(in_function, env, sexp, ty_expected) {
                     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
                     if (exn.MEL_EXN_ID === Unify) {
                       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                MEL_EXN_ID: "Assert_failure",
-                                _1: [
-                                  "jscomp/test/ocaml_typedtree_test.ml",
-                                  44266,
-                                  65
-                                ]
-                              });
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "jscomp/test/ocaml_typedtree_test.ml",
+                              44266,
+                              65
+                            ]
+                          });
                     }
                     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
                   }
@@ -67152,17 +67152,17 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         end_def(undefined);
         unify_var(env, newvar(undefined, undefined), funct.exp_type);
         return rue({
-                    exp_desc: {
-                      TAG: /* Texp_apply */4,
-                      _0: funct,
-                      _1: match$9[0]
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: match$9[1],
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_apply */4,
+                _0: funct,
+                _1: match$9[0]
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: match$9[1],
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_match */6 :
         begin_def(undefined);
         const arg = type_exp(env, lid._0);
@@ -67181,9 +67181,9 @@ function type_expect_(in_function, env, sexp, ty_expected) {
             const vc = _vc;
             if (!param) {
               return [
-                      Stdlib__List.rev(vc),
-                      Stdlib__List.rev(ec)
-                    ];
+                Stdlib__List.rev(vc),
+                Stdlib__List.rev(ec)
+              ];
             }
             const c = param.hd;
             const p = c.pc_lhs.ppat_desc;
@@ -67212,43 +67212,43 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         const val_caselist = match$10[0];
         if (Caml_obj.caml_equal(val_caselist, /* [] */0) && Caml_obj.caml_notequal(exn_caselist, /* [] */0)) {
           throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                    MEL_EXN_ID: $$Error$7,
-                    _1: loc,
-                    _2: env,
-                    _3: /* No_value_clauses */7
-                  });
+                MEL_EXN_ID: $$Error$7,
+                _1: loc,
+                _2: env,
+                _3: /* No_value_clauses */7
+              });
         }
         const match$11 = type_cases(undefined, env, arg.exp_type, ty_expected, true, loc, val_caselist);
         const match$12 = type_cases(undefined, env, type_exn, ty_expected, false, loc, exn_caselist);
         return re({
-                    exp_desc: {
-                      TAG: /* Texp_match */5,
-                      _0: arg,
-                      _1: match$11[0],
-                      _2: match$12[0],
-                      _3: match$11[1]
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: instance(undefined, env, ty_expected),
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_match */5,
+                _0: arg,
+                _1: match$11[0],
+                _2: match$12[0],
+                _3: match$11[1]
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: instance(undefined, env, ty_expected),
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_try */7 :
         const body$1 = type_expect(undefined, env, lid._0, ty_expected);
         const match$13 = type_cases(undefined, env, type_exn, ty_expected, false, loc, lid._1);
         return re({
-                    exp_desc: {
-                      TAG: /* Texp_try */6,
-                      _0: body$1,
-                      _1: match$13[0]
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: body$1.exp_type,
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_try */6,
+                _0: body$1,
+                _1: match$13[0]
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: body$1.exp_type,
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_tuple */8 :
         const sexpl = lid._0;
         if (Stdlib__List.length(sexpl) < 2) {
@@ -67256,9 +67256,9 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         }
         const subtypes = Stdlib__List.map((function (param) {
                 return newty2(100000000, {
-                            TAG: /* Tvar */0,
-                            _0: undefined
-                          });
+                      TAG: /* Tvar */0,
+                      _0: undefined
+                    });
               }), sexpl);
         const to_unify = newty2(100000000, {
               TAG: /* Ttuple */2,
@@ -67275,16 +67275,16 @@ function type_expect_(in_function, env, sexp, ty_expected) {
                 }), expl)
         };
         return re({
-                    exp_desc: {
-                      TAG: /* Texp_tuple */7,
-                      _0: expl
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: newty2(current_level.contents, desc$1),
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_tuple */7,
+                _0: expl
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: newty2(current_level.contents, desc$1),
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_construct */9 :
         let lid$2 = lid._0;
         let sarg = lid._1;
@@ -67316,24 +67316,24 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         if (sarg !== undefined) {
           const sel = sarg.pexp_desc;
           sargs$1 = sel.TAG === /* Pexp_tuple */8 && (constr.cstr_arity > 1 || explicit_arity(attrs)) ? sel._0 : ({
-                hd: sarg,
-                tl: /* [] */0
-              });
+              hd: sarg,
+              tl: /* [] */0
+            });
         } else {
           sargs$1 = /* [] */0;
         }
         if (Stdlib__List.length(sargs$1) !== constr.cstr_arity) {
           throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                    MEL_EXN_ID: $$Error$7,
-                    _1: loc,
-                    _2: env,
-                    _3: {
-                      TAG: /* Constructor_arity_mismatch */1,
-                      _0: lid$2.txt,
-                      _1: constr.cstr_arity,
-                      _2: Stdlib__List.length(sargs$1)
-                    }
-                  });
+                MEL_EXN_ID: $$Error$7,
+                _1: loc,
+                _2: env,
+                _3: {
+                  TAG: /* Constructor_arity_mismatch */1,
+                  _0: lid$2.txt,
+                  _1: constr.cstr_arity,
+                  _2: Stdlib__List.length(sargs$1)
+                }
+              });
         }
         const separate = principal.contents || env.local_constraints;
         if (separate) {
@@ -67383,13 +67383,13 @@ function type_expect_(in_function, env, sexp, ty_expected) {
           ];
         } else {
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      45498,
-                      11
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  45498,
+                  11
+                ]
+              });
         }
         const ty_res$1 = match$17[1];
         const texp_exp_desc = texp.exp_desc;
@@ -67413,28 +67413,28 @@ function type_expect_(in_function, env, sexp, ty_expected) {
               }), sargs$1, Stdlib__List.combine(ty_args, match$17[0]));
         if (constr.cstr_private === /* Private */0) {
           throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                    MEL_EXN_ID: $$Error$7,
-                    _1: loc,
-                    _2: env,
-                    _3: {
-                      TAG: /* Private_type */19,
-                      _0: ty_res$1
-                    }
-                  });
+                MEL_EXN_ID: $$Error$7,
+                _1: loc,
+                _2: env,
+                _3: {
+                  TAG: /* Private_type */19,
+                  _0: ty_res$1
+                }
+              });
         }
         return {
-                exp_desc: {
-                  TAG: /* Texp_construct */8,
-                  _0: lid$2,
-                  _1: constr,
-                  _2: args
-                },
-                exp_loc: texp_exp_loc,
-                exp_extra: texp_exp_extra,
-                exp_type: ty_res$1,
-                exp_env: texp_exp_env,
-                exp_attributes: texp_exp_attributes
-              };
+          exp_desc: {
+            TAG: /* Texp_construct */8,
+            _0: lid$2,
+            _1: constr,
+            _2: args
+          },
+          exp_loc: texp_exp_loc,
+          exp_extra: texp_exp_extra,
+          exp_type: ty_res$1,
+          exp_env: texp_exp_env,
+          exp_attributes: texp_exp_attributes
+        };
     case /* Pexp_variant */10 :
         const sarg$1 = lid._1;
         const l$1 = lid._0;
@@ -67446,15 +67446,15 @@ function type_expect_(in_function, env, sexp, ty_expected) {
             const row = match$18.desc;
             if (/* tag */typeof row === "number" || typeof row === "string") {
               throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                        MEL_EXN_ID: Stdlib.Not_found
-                      });
+                    MEL_EXN_ID: Stdlib.Not_found
+                  });
             }
             if (row.TAG === /* Tvariant */8) {
               const row0 = match$19.desc;
               if (/* tag */typeof row0 === "number" || typeof row0 === "string") {
                 throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                          MEL_EXN_ID: Stdlib.Not_found
-                        });
+                      MEL_EXN_ID: Stdlib.Not_found
+                    });
               }
               if (row0.TAG === /* Tvariant */8) {
                 const row$1 = row_repr_aux(/* [] */0, row._0);
@@ -67462,65 +67462,65 @@ function type_expect_(in_function, env, sexp, ty_expected) {
                 const match$21 = row_field_repr_aux(/* [] */0, Stdlib__List.assoc(l$1, row0._0.row_fields));
                 if (/* tag */typeof match$20 === "number" || typeof match$20 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                            MEL_EXN_ID: Stdlib.Not_found
-                          });
+                        MEL_EXN_ID: Stdlib.Not_found
+                      });
                 }
                 if (match$20.TAG === /* Rpresent */0) {
                   const ty$1 = match$20._0;
                   if (ty$1 !== undefined) {
                     if (/* tag */typeof match$21 === "number" || typeof match$21 === "string") {
                       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                MEL_EXN_ID: Stdlib.Not_found
-                              });
+                            MEL_EXN_ID: Stdlib.Not_found
+                          });
                     }
                     if (match$21.TAG === /* Rpresent */0) {
                       const ty0 = match$21._0;
                       if (ty0 !== undefined) {
                         const arg$1 = type_argument(env, sarg$1, ty$1, ty0);
                         return re({
-                                    exp_desc: {
-                                      TAG: /* Texp_variant */9,
-                                      _0: l$1,
-                                      _1: arg$1
-                                    },
-                                    exp_loc: loc,
-                                    exp_extra: /* [] */0,
-                                    exp_type: ty_expected0,
-                                    exp_env: env,
-                                    exp_attributes: sexp.pexp_attributes
-                                  });
+                              exp_desc: {
+                                TAG: /* Texp_variant */9,
+                                _0: l$1,
+                                _1: arg$1
+                              },
+                              exp_loc: loc,
+                              exp_extra: /* [] */0,
+                              exp_type: ty_expected0,
+                              exp_env: env,
+                              exp_attributes: sexp.pexp_attributes
+                            });
                       }
                       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                                MEL_EXN_ID: Stdlib.Not_found
-                              });
+                            MEL_EXN_ID: Stdlib.Not_found
+                          });
                     }
                     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                              MEL_EXN_ID: Stdlib.Not_found
-                            });
+                          MEL_EXN_ID: Stdlib.Not_found
+                        });
                   } else {
                     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                              MEL_EXN_ID: Stdlib.Not_found
-                            });
+                          MEL_EXN_ID: Stdlib.Not_found
+                        });
                   }
                 } else {
                   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                            MEL_EXN_ID: Stdlib.Not_found
-                          });
+                        MEL_EXN_ID: Stdlib.Not_found
+                      });
                 }
               } else {
                 throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                          MEL_EXN_ID: Stdlib.Not_found
-                        });
+                      MEL_EXN_ID: Stdlib.Not_found
+                    });
               }
             } else {
               throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                        MEL_EXN_ID: Stdlib.Not_found
-                      });
+                    MEL_EXN_ID: Stdlib.Not_found
+                  });
             }
           } else {
             throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                      MEL_EXN_ID: Stdlib.Not_found
-                    });
+                  MEL_EXN_ID: Stdlib.Not_found
+                });
           }
         }
         catch (raw_exn$1){
@@ -67553,17 +67553,17 @@ function type_expect_(in_function, env, sexp, ty_expected) {
               }
             };
             return rue({
-                        exp_desc: {
-                          TAG: /* Texp_variant */9,
-                          _0: l$1,
-                          _1: arg$2
-                        },
-                        exp_loc: loc,
-                        exp_extra: /* [] */0,
-                        exp_type: newty2(current_level.contents, desc$2),
-                        exp_env: env,
-                        exp_attributes: sexp.pexp_attributes
-                      });
+                  exp_desc: {
+                    TAG: /* Texp_variant */9,
+                    _0: l$1,
+                    _1: arg$2
+                  },
+                  exp_loc: loc,
+                  exp_extra: /* [] */0,
+                  exp_type: newty2(current_level.contents, desc$2),
+                  exp_env: env,
+                  exp_attributes: sexp.pexp_attributes
+                });
           }
           throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
         }
@@ -67591,10 +67591,10 @@ function type_expect_(in_function, env, sexp, ty_expected) {
           try {
             const match = extract_concrete_record(env, ty);
             return [
-                    match[0],
-                    match[1],
-                    ty.level === 100000000 || !principal.contents
-                  ];
+              match[0],
+              match[1],
+              ty.level === 100000000 || !principal.contents
+            ];
           }
           catch (raw_exn){
             const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -67641,8 +67641,8 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         const closed = opt_sexp === undefined;
         const lbl_exp_list = wrap_disambiguate("This record expression is expected to have", ty_record, (function (param) {
                 return type_label_a_list(undefined, loc, closed, env, (function (param) {
-                              return type_label_exp(true, env, loc, ty_record, param);
-                            }), opath$1, param);
+                        return type_label_exp(true, env, loc, ty_record, param);
+                      }), opath$1, param);
               }), lid_sexp_list);
         unify_exp_types(loc, env, ty_record, instance(undefined, env, ty_expected));
         const check_duplicates = function (_param) {
@@ -67656,14 +67656,14 @@ function type_expect_(in_function, env, sexp, ty_expected) {
               const lbl1 = param.hd[1];
               if (lbl1.lbl_pos === match.hd[1].lbl_pos) {
                 throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                          MEL_EXN_ID: $$Error$7,
-                          _1: loc,
-                          _2: env,
-                          _3: {
-                            TAG: /* Label_multiply_defined */10,
-                            _0: lbl1.lbl_name
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$7,
+                      _1: loc,
+                      _2: env,
+                      _3: {
+                        TAG: /* Label_multiply_defined */10,
+                        _0: lbl1.lbl_name
+                      }
+                    });
               }
               _param = param.tl;
               continue ;
@@ -67700,13 +67700,13 @@ function type_expect_(in_function, env, sexp, ty_expected) {
             };
           } else {
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "jscomp/test/ocaml_typedtree_test.ml",
-                        44455,
-                        15
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "jscomp/test/ocaml_typedtree_test.ml",
+                    44455,
+                    15
+                  ]
+                });
           }
         } else {
           opt_exp$1 = undefined;
@@ -67716,13 +67716,13 @@ function type_expect_(in_function, env, sexp, ty_expected) {
           num_fields = lbl_exp_list.hd[1].lbl_all.length;
         } else {
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      44458,
-                      38
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  44458,
+                  38
+                ]
+              });
         }
         if (opt_sexp === undefined && Stdlib__List.length(lid_sexp_list) !== num_fields) {
           const present_indices = Stdlib__List.map((function (param) {
@@ -67739,9 +67739,9 @@ function type_expect_(in_function, env, sexp, ty_expected) {
               const rem = param.tl;
               if (!Stdlib__List.mem(n, present_indices)) {
                 return {
-                        hd: param.hd,
-                        tl: missing_labels(n + 1 | 0, rem)
-                      };
+                  hd: param.hd,
+                  tl: missing_labels(n + 1 | 0, rem)
+                };
               }
               _param = rem;
               _n = n + 1 | 0;
@@ -67750,30 +67750,30 @@ function type_expect_(in_function, env, sexp, ty_expected) {
           };
           const missing = missing_labels(0, label_names);
           throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                    MEL_EXN_ID: $$Error$7,
-                    _1: loc,
-                    _2: env,
-                    _3: {
-                      TAG: /* Label_missing */11,
-                      _0: missing
-                    }
-                  });
+                MEL_EXN_ID: $$Error$7,
+                _1: loc,
+                _2: env,
+                _3: {
+                  TAG: /* Label_missing */11,
+                  _0: missing
+                }
+              });
         }
         if (opt_sexp !== undefined && Stdlib__List.length(lid_sexp_list) === num_fields) {
           prerr_warning(loc, /* Useless_record_with */11);
         }
         return re({
-                    exp_desc: {
-                      TAG: /* Texp_record */10,
-                      _0: lbl_exp_list,
-                      _1: opt_exp$1
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: instance(undefined, env, ty_expected),
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_record */10,
+                _0: lbl_exp_list,
+                _1: opt_exp$1
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: instance(undefined, env, ty_expected),
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_field */12 :
         const lid$3 = lid._1;
         const match$23 = type_label_access(env, loc, lid._0, lid$3);
@@ -67782,18 +67782,18 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         const match$24 = instance_label(false, label);
         unify_exp(env, record$3, match$24[2]);
         return rue({
-                    exp_desc: {
-                      TAG: /* Texp_field */11,
-                      _0: record$3,
-                      _1: lid$3,
-                      _2: label
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: match$24[1],
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_field */11,
+                _0: record$3,
+                _1: lid$3,
+                _2: label
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: match$24[1],
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_setfield */13 :
         const lid$4 = lid._1;
         const match$25 = type_label_access(env, loc, lid._0, lid$4);
@@ -67808,29 +67808,29 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         unify_exp(env, record$4, ty_record$1);
         if (label$1.lbl_mut === /* Immutable */0) {
           throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                    MEL_EXN_ID: $$Error$7,
-                    _1: loc,
-                    _2: env,
-                    _3: {
-                      TAG: /* Label_not_mutable */12,
-                      _0: lid$4.txt
-                    }
-                  });
+                MEL_EXN_ID: $$Error$7,
+                _1: loc,
+                _2: env,
+                _3: {
+                  TAG: /* Label_not_mutable */12,
+                  _0: lid$4.txt
+                }
+              });
         }
         return rue({
-                    exp_desc: {
-                      TAG: /* Texp_setfield */12,
-                      _0: record$4,
-                      _1: match$26[0],
-                      _2: label$1,
-                      _3: match$26[2]
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: instance_def(type_unit),
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_setfield */12,
+                _0: record$4,
+                _1: match$26[0],
+                _2: label$1,
+                _3: match$26[2]
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: instance_def(type_unit),
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_array */14 :
         const ty$3 = newty2(100000000, {
               TAG: /* Tvar */0,
@@ -67842,16 +67842,16 @@ function type_expect_(in_function, env, sexp, ty_expected) {
                 return type_expect(undefined, env, sarg, ty$3);
               }), lid._0);
         return re({
-                    exp_desc: {
-                      TAG: /* Texp_array */13,
-                      _0: argl
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: instance(undefined, env, ty_expected),
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_array */13,
+                _0: argl
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: instance(undefined, env, ty_expected),
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_ifthenelse */15 :
         const sifnot = lid._2;
         const sifso = lid._1;
@@ -67861,63 +67861,63 @@ function type_expect_(in_function, env, sexp, ty_expected) {
           const ifnot = type_expect(undefined, env, sifnot, ty_expected);
           unify_exp(env, ifnot, ifso.exp_type);
           return re({
-                      exp_desc: {
-                        TAG: /* Texp_ifthenelse */14,
-                        _0: cond,
-                        _1: ifso,
-                        _2: ifnot
-                      },
-                      exp_loc: loc,
-                      exp_extra: /* [] */0,
-                      exp_type: ifso.exp_type,
-                      exp_env: env,
-                      exp_attributes: sexp.pexp_attributes
-                    });
+                exp_desc: {
+                  TAG: /* Texp_ifthenelse */14,
+                  _0: cond,
+                  _1: ifso,
+                  _2: ifnot
+                },
+                exp_loc: loc,
+                exp_extra: /* [] */0,
+                exp_type: ifso.exp_type,
+                exp_env: env,
+                exp_attributes: sexp.pexp_attributes
+              });
         }
         const ifso$1 = type_expect(undefined, env, sifso, type_unit);
         return rue({
-                    exp_desc: {
-                      TAG: /* Texp_ifthenelse */14,
-                      _0: cond,
-                      _1: ifso$1,
-                      _2: undefined
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: ifso$1.exp_type,
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_ifthenelse */14,
+                _0: cond,
+                _1: ifso$1,
+                _2: undefined
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: ifso$1.exp_type,
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_sequence */16 :
         const exp1 = type_statement(env, lid._0);
         const exp2 = type_expect(undefined, env, lid._1, ty_expected);
         return re({
-                    exp_desc: {
-                      TAG: /* Texp_sequence */15,
-                      _0: exp1,
-                      _1: exp2
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: exp2.exp_type,
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_sequence */15,
+                _0: exp1,
+                _1: exp2
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: exp2.exp_type,
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_while */17 :
         const cond$1 = type_expect(undefined, env, lid._0, type_bool);
         const body$2 = type_statement(env, lid._1);
         return rue({
-                    exp_desc: {
-                      TAG: /* Texp_while */16,
-                      _0: cond$1,
-                      _1: body$2
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: instance_def(type_unit),
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_while */16,
+                _0: cond$1,
+                _1: body$2
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: instance_def(type_unit),
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_for */18 :
         const param = lid._0;
         const low = type_expect(undefined, env, lid._1, type_int);
@@ -67932,9 +67932,9 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         } else if (match$27.TAG === /* Ppat_var */0) {
           match$28 = enter_value((function (s) {
                     return {
-                            TAG: /* Unused_for_index */19,
-                            _0: s
-                          };
+                      TAG: /* Unused_for_index */19,
+                      _0: s
+                    };
                   }))(match$27._0.txt, {
                 val_type: instance_def(type_int),
                 val_kind: /* Val_reg */0,
@@ -67943,29 +67943,29 @@ function type_expect_(in_function, env, sexp, ty_expected) {
               }, env);
         } else {
           throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                    MEL_EXN_ID: $$Error$7,
-                    _1: param.ppat_loc,
-                    _2: env,
-                    _3: /* Invalid_for_loop_index */6
-                  });
+                MEL_EXN_ID: $$Error$7,
+                _1: param.ppat_loc,
+                _2: env,
+                _3: /* Invalid_for_loop_index */6
+              });
         }
         const body$3 = type_statement(match$28[1], lid._4);
         return rue({
-                    exp_desc: {
-                      TAG: /* Texp_for */17,
-                      _0: match$28[0],
-                      _1: param,
-                      _2: low,
-                      _3: high,
-                      _4: lid._3,
-                      _5: body$3
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: instance_def(type_unit),
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_for */17,
+                _0: match$28[0],
+                _1: param,
+                _2: low,
+                _3: high,
+                _4: lid._3,
+                _5: body$3
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: instance_def(type_unit),
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_constraint */19 :
         begin_def(undefined);
         const cty = transl_simple_type(env, false, lid._1);
@@ -67975,23 +67975,23 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         const arg$3 = type_argument(env, lid._0, ty$4, instance(undefined, env, ty$4));
         const ty$p = instance(undefined, env, ty$4);
         return rue({
-                    exp_desc: arg$3.exp_desc,
-                    exp_loc: arg$3.exp_loc,
-                    exp_extra: {
-                      hd: [
-                        {
-                          TAG: /* Texp_constraint */0,
-                          _0: cty
-                        },
-                        loc,
-                        sexp.pexp_attributes
-                      ],
-                      tl: arg$3.exp_extra
-                    },
-                    exp_type: ty$p,
-                    exp_env: env,
-                    exp_attributes: arg$3.exp_attributes
-                  });
+              exp_desc: arg$3.exp_desc,
+              exp_loc: arg$3.exp_loc,
+              exp_extra: {
+                hd: [
+                  {
+                    TAG: /* Texp_constraint */0,
+                    _0: cty
+                  },
+                  loc,
+                  sexp.pexp_attributes
+                ],
+                tl: arg$3.exp_extra
+              },
+              exp_type: ty$p,
+              exp_env: env,
+              exp_attributes: arg$3.exp_attributes
+            });
     case /* Pexp_coerce */20 :
         const sty$p = lid._2;
         const sty = lid._1;
@@ -68015,15 +68015,15 @@ function type_expect_(in_function, env, sexp, ty_expected) {
             const exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn$2);
             if (exn$2.MEL_EXN_ID === Subtype) {
               throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                        MEL_EXN_ID: $$Error$7,
-                        _1: loc,
-                        _2: env,
-                        _3: {
-                          TAG: /* Not_subtype */23,
-                          _0: exn$2._1,
-                          _1: exn$2._2
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$7,
+                    _1: loc,
+                    _2: env,
+                    _3: {
+                      TAG: /* Not_subtype */23,
+                      _0: exn$2._1,
+                      _1: exn$2._2
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$2.MEL_EXN_ID, exn$2);
           }
@@ -68111,15 +68111,15 @@ function type_expect_(in_function, env, sexp, ty_expected) {
                   const exn$4 = Caml_js_exceptions.internalToOCamlException(raw_exn$4);
                   if (exn$4.MEL_EXN_ID === Subtype) {
                     throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                              MEL_EXN_ID: $$Error$7,
-                              _1: loc,
-                              _2: env,
-                              _3: {
-                                TAG: /* Not_subtype */23,
-                                _0: exn$4._1,
-                                _1: exn$4._2
-                              }
-                            });
+                          MEL_EXN_ID: $$Error$7,
+                          _1: loc,
+                          _2: env,
+                          _3: {
+                            TAG: /* Not_subtype */23,
+                            _0: exn$4._1,
+                            _1: exn$4._2
+                          }
+                        });
                   }
                   throw new Caml_js_exceptions.MelangeError(exn$4.MEL_EXN_ID, exn$4);
                 }
@@ -68135,17 +68135,17 @@ function type_expect_(in_function, env, sexp, ty_expected) {
                 const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
                 if (trace.MEL_EXN_ID === Unify) {
                   throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                            MEL_EXN_ID: $$Error$7,
-                            _1: sarg$2.pexp_loc,
-                            _2: env,
-                            _3: {
-                              TAG: /* Coercion_failure */25,
-                              _0: ty$p$2,
-                              _1: full_expand(env, ty$p$2),
-                              _2: trace._1,
-                              _3: match$38[1]
-                            }
-                          });
+                        MEL_EXN_ID: $$Error$7,
+                        _1: sarg$2.pexp_loc,
+                        _2: env,
+                        _3: {
+                          TAG: /* Coercion_failure */25,
+                          _0: ty$p$2,
+                          _1: full_expand(env, ty$p$2),
+                          _2: trace._1,
+                          _3: match$38[1]
+                        }
+                      });
                 }
                 throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
               }
@@ -68160,24 +68160,24 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         }
         const arg$5 = match$29[0];
         return rue({
-                    exp_desc: arg$5.exp_desc,
-                    exp_loc: arg$5.exp_loc,
-                    exp_extra: {
-                      hd: [
-                        {
-                          TAG: /* Texp_coerce */1,
-                          _0: match$29[2],
-                          _1: match$29[3]
-                        },
-                        loc,
-                        sexp.pexp_attributes
-                      ],
-                      tl: arg$5.exp_extra
-                    },
-                    exp_type: match$29[1],
-                    exp_env: env,
-                    exp_attributes: arg$5.exp_attributes
-                  });
+              exp_desc: arg$5.exp_desc,
+              exp_loc: arg$5.exp_loc,
+              exp_extra: {
+                hd: [
+                  {
+                    TAG: /* Texp_coerce */1,
+                    _0: match$29[2],
+                    _1: match$29[3]
+                  },
+                  loc,
+                  sexp.pexp_attributes
+                ],
+                tl: arg$5.exp_extra
+              },
+              exp_type: match$29[1],
+              exp_env: env,
+              exp_attributes: arg$5.exp_attributes
+            });
     case /* Pexp_send */21 :
         const met = lid._1;
         const e = lid._0;
@@ -68224,14 +68224,14 @@ function type_expect_(in_function, env, sexp, ty_expected) {
                       const exn$5 = Caml_js_exceptions.internalToOCamlException(raw_exn$5);
                       if (exn$5.MEL_EXN_ID === Stdlib.Not_found) {
                         throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                                  MEL_EXN_ID: $$Error$7,
-                                  _1: e.pexp_loc,
-                                  _2: env,
-                                  _3: {
-                                    TAG: /* Undefined_inherited_method */17,
-                                    _0: met
-                                  }
-                                });
+                              MEL_EXN_ID: $$Error$7,
+                              _1: e.pexp_loc,
+                              _2: env,
+                              _3: {
+                                TAG: /* Undefined_inherited_method */17,
+                                _0: met
+                              }
+                            });
                       }
                       throw new Caml_js_exceptions.MelangeError(exn$5.MEL_EXN_ID, exn$5);
                     }
@@ -68247,13 +68247,13 @@ function type_expect_(in_function, env, sexp, ty_expected) {
                     const match$45 = desc$3.val_kind;
                     if (/* tag */typeof match$45 === "number" || typeof match$45 === "string") {
                       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                MEL_EXN_ID: "Assert_failure",
-                                _1: [
-                                  "jscomp/test/ocaml_typedtree_test.ml",
-                                  44747,
-                                  18
-                                ]
-                              });
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "jscomp/test/ocaml_typedtree_test.ml",
+                              44747,
+                              18
+                            ]
+                          });
                     }
                     if (match$45.TAG === /* Val_self */2) {
                       const match$46 = filter_self_method(env, met, /* Private */0, match$45._0, match$45._3);
@@ -68325,13 +68325,13 @@ function type_expect_(in_function, env, sexp, ty_expected) {
                       ];
                     } else {
                       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                MEL_EXN_ID: "Assert_failure",
-                                _1: [
-                                  "jscomp/test/ocaml_typedtree_test.ml",
-                                  44747,
-                                  18
-                                ]
-                              });
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "jscomp/test/ocaml_typedtree_test.ml",
+                              44747,
+                              18
+                            ]
+                          });
                     }
                     break;
                 default:
@@ -68361,13 +68361,13 @@ function type_expect_(in_function, env, sexp, ty_expected) {
           let typ$3;
           if (/* tag */typeof match$48 === "number" || typeof match$48 === "string") {
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "jscomp/test/ocaml_typedtree_test.ml",
-                        44773,
-                        14
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "jscomp/test/ocaml_typedtree_test.ml",
+                    44773,
+                    14
+                  ]
+                });
           }
           switch (match$48.TAG) {
             case /* Tvar */0 :
@@ -68396,41 +68396,41 @@ function type_expect_(in_function, env, sexp, ty_expected) {
                 break;
             default:
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          44773,
-                          14
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/ocaml_typedtree_test.ml",
+                      44773,
+                      14
+                    ]
+                  });
           }
           return rue({
-                      exp_desc: {
-                        TAG: /* Texp_send */18,
-                        _0: obj,
-                        _1: match$40[0],
-                        _2: match$40[1]
-                      },
-                      exp_loc: loc,
-                      exp_extra: /* [] */0,
-                      exp_type: typ$3,
-                      exp_env: env,
-                      exp_attributes: sexp.pexp_attributes
-                    });
+                exp_desc: {
+                  TAG: /* Texp_send */18,
+                  _0: obj,
+                  _1: match$40[0],
+                  _2: match$40[1]
+                },
+                exp_loc: loc,
+                exp_extra: /* [] */0,
+                exp_type: typ$3,
+                exp_env: env,
+                exp_attributes: sexp.pexp_attributes
+              });
         }
         catch (raw_exn$6){
           const exn$6 = Caml_js_exceptions.internalToOCamlException(raw_exn$6);
           if (exn$6.MEL_EXN_ID === Unify) {
             throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                      MEL_EXN_ID: $$Error$7,
-                      _1: e.pexp_loc,
-                      _2: env,
-                      _3: {
-                        TAG: /* Undefined_method */16,
-                        _0: obj.exp_type,
-                        _1: met
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$7,
+                  _1: e.pexp_loc,
+                  _2: env,
+                  _3: {
+                    TAG: /* Undefined_method */16,
+                    _0: obj.exp_type,
+                    _1: met
+                  }
+                });
           }
           throw new Caml_js_exceptions.MelangeError(exn$6.MEL_EXN_ID, exn$6);
         }
@@ -68442,28 +68442,28 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         const ty$8 = cl_decl.cty_new;
         if (ty$8 !== undefined) {
           return rue({
-                      exp_desc: {
-                        TAG: /* Texp_new */19,
-                        _0: match$49[0],
-                        _1: cl,
-                        _2: cl_decl
-                      },
-                      exp_loc: loc,
-                      exp_extra: /* [] */0,
-                      exp_type: instance_def(ty$8),
-                      exp_env: env,
-                      exp_attributes: sexp.pexp_attributes
-                    });
+                exp_desc: {
+                  TAG: /* Texp_new */19,
+                  _0: match$49[0],
+                  _1: cl,
+                  _2: cl_decl
+                },
+                exp_loc: loc,
+                exp_extra: /* [] */0,
+                exp_type: instance_def(ty$8),
+                exp_env: env,
+                exp_attributes: sexp.pexp_attributes
+              });
         }
         throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                  MEL_EXN_ID: $$Error$7,
-                  _1: loc,
-                  _2: env,
-                  _3: {
-                    TAG: /* Virtual_class */18,
-                    _0: cl.txt
-                  }
-                });
+              MEL_EXN_ID: $$Error$7,
+              _1: loc,
+              _2: env,
+              _3: {
+                TAG: /* Virtual_class */18,
+                _0: cl.txt
+              }
+            });
     case /* Pexp_setinstvar */23 :
         const lab = lid._0;
         try {
@@ -68480,15 +68480,15 @@ function type_expect_(in_function, env, sexp, ty_expected) {
             if (match$51.TAG === /* Val_ivar */1) {
               if (match$51._0 === /* Immutable */0) {
                 throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                          MEL_EXN_ID: $$Error$7,
-                          _1: loc,
-                          _2: env,
-                          _3: {
-                            TAG: /* Instance_variable_not_mutable */22,
-                            _0: true,
-                            _1: lab.txt
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$7,
+                      _1: loc,
+                      _2: env,
+                      _3: {
+                        TAG: /* Instance_variable_not_mutable */22,
+                        _0: true,
+                        _1: lab.txt
+                      }
+                    });
               }
               const newval = type_expect(undefined, env, lid._1, instance(undefined, env, desc$4.val_type));
               const match$52 = lookup_value$1({
@@ -68496,33 +68496,33 @@ function type_expect_(in_function, env, sexp, ty_expected) {
                     _0: "self-" + match$51._1
                   }, env);
               return rue({
-                          exp_desc: {
-                            TAG: /* Texp_setinstvar */21,
-                            _0: match$52[0],
-                            _1: match$50[0],
-                            _2: lab,
-                            _3: newval
-                          },
-                          exp_loc: loc,
-                          exp_extra: /* [] */0,
-                          exp_type: instance_def(type_unit),
-                          exp_env: env,
-                          exp_attributes: sexp.pexp_attributes
-                        });
+                    exp_desc: {
+                      TAG: /* Texp_setinstvar */21,
+                      _0: match$52[0],
+                      _1: match$50[0],
+                      _2: lab,
+                      _3: newval
+                    },
+                    exp_loc: loc,
+                    exp_extra: /* [] */0,
+                    exp_type: instance_def(type_unit),
+                    exp_env: env,
+                    exp_attributes: sexp.pexp_attributes
+                  });
             }
             exit$4 = 1;
           }
           if (exit$4 === 1) {
             throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                      MEL_EXN_ID: $$Error$7,
-                      _1: loc,
-                      _2: env,
-                      _3: {
-                        TAG: /* Instance_variable_not_mutable */22,
-                        _0: false,
-                        _1: lab.txt
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$7,
+                  _1: loc,
+                  _2: env,
+                  _3: {
+                    TAG: /* Instance_variable_not_mutable */22,
+                    _0: false,
+                    _1: lab.txt
+                  }
+                });
           }
           
         }
@@ -68530,14 +68530,14 @@ function type_expect_(in_function, env, sexp, ty_expected) {
           const exn$7 = Caml_js_exceptions.internalToOCamlException(raw_exn$7);
           if (exn$7.MEL_EXN_ID === Stdlib.Not_found) {
             throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                      MEL_EXN_ID: $$Error$7,
-                      _1: loc,
-                      _2: env,
-                      _3: {
-                        TAG: /* Unbound_instance_variable */21,
-                        _0: lab.txt
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$7,
+                  _1: loc,
+                  _2: env,
+                  _3: {
+                    TAG: /* Unbound_instance_variable */21,
+                    _0: lab.txt
+                  }
+                });
           }
           throw new Caml_js_exceptions.MelangeError(exn$7.MEL_EXN_ID, exn$7);
         }
@@ -68550,19 +68550,19 @@ function type_expect_(in_function, env, sexp, ty_expected) {
                           return l.txt === lab.txt;
                         }), l)) {
                   throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                            MEL_EXN_ID: $$Error$7,
-                            _1: loc,
-                            _2: env,
-                            _3: {
-                              TAG: /* Value_multiply_overridden */24,
-                              _0: lab.txt
-                            }
-                          });
+                        MEL_EXN_ID: $$Error$7,
+                        _1: loc,
+                        _2: env,
+                        _3: {
+                          TAG: /* Value_multiply_overridden */24,
+                          _0: lab.txt
+                        }
+                      });
                 }
                 return {
-                        hd: lab,
-                        tl: l
-                      };
+                  hd: lab,
+                  tl: l
+                };
               }), lst, /* [] */0);
         let match$53;
         try {
@@ -68581,11 +68581,11 @@ function type_expect_(in_function, env, sexp, ty_expected) {
           const exn$8 = Caml_js_exceptions.internalToOCamlException(raw_exn$8);
           if (exn$8.MEL_EXN_ID === Stdlib.Not_found) {
             throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                      MEL_EXN_ID: $$Error$7,
-                      _1: loc,
-                      _2: env,
-                      _3: /* Outside_class */0
-                    });
+                  MEL_EXN_ID: $$Error$7,
+                  _1: loc,
+                  _2: env,
+                  _3: /* Outside_class */0
+                });
           }
           throw new Caml_js_exceptions.MelangeError(exn$8.MEL_EXN_ID, exn$8);
         }
@@ -68593,13 +68593,13 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         const match$55 = match$54.val_kind;
         if (/* tag */typeof match$55 === "number" || typeof match$55 === "string") {
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      44857,
-                      10
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  44857,
+                  10
+                ]
+              });
         }
         if (match$55.TAG === /* Val_self */2) {
           const vars = match$55._1;
@@ -68608,52 +68608,52 @@ function type_expect_(in_function, env, sexp, ty_expected) {
             try {
               const match = Curry._2(Meths.find, lab.txt, vars.contents);
               return [
-                      {
-                        TAG: /* Pident */0,
-                        _0: match[0]
-                      },
-                      lab,
-                      type_expect(undefined, env, param[1], instance(undefined, env, match[3]))
-                    ];
+                {
+                  TAG: /* Pident */0,
+                  _0: match[0]
+                },
+                lab,
+                type_expect(undefined, env, param[1], instance(undefined, env, match[3]))
+              ];
             }
             catch (raw_exn){
               const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
               if (exn.MEL_EXN_ID === Stdlib.Not_found) {
                 throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                          MEL_EXN_ID: $$Error$7,
-                          _1: loc,
-                          _2: env,
-                          _3: {
-                            TAG: /* Unbound_instance_variable */21,
-                            _0: lab.txt
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$7,
+                      _1: loc,
+                      _2: env,
+                      _3: {
+                        TAG: /* Unbound_instance_variable */21,
+                        _0: lab.txt
+                      }
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
             }
           };
           const modifs = Stdlib__List.map(type_override, lst);
           return rue({
-                      exp_desc: {
-                        TAG: /* Texp_override */22,
-                        _0: match$53[1][0],
-                        _1: modifs
-                      },
-                      exp_loc: loc,
-                      exp_extra: /* [] */0,
-                      exp_type: match$54.val_type,
-                      exp_env: env,
-                      exp_attributes: sexp.pexp_attributes
-                    });
+                exp_desc: {
+                  TAG: /* Texp_override */22,
+                  _0: match$53[1][0],
+                  _1: modifs
+                },
+                exp_loc: loc,
+                exp_extra: /* [] */0,
+                exp_type: match$54.val_type,
+                exp_env: env,
+                exp_attributes: sexp.pexp_attributes
+              });
         }
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/ocaml_typedtree_test.ml",
-                    44857,
-                    10
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/ocaml_typedtree_test.ml",
+                44857,
+                10
+              ]
+            });
     case /* Pexp_letmodule */25 :
         const name$2 = lid._0;
         const ty$9 = newvar(undefined, undefined);
@@ -68674,48 +68674,48 @@ function type_expect_(in_function, env, sexp, ty_expected) {
           const exn$9 = Caml_js_exceptions.internalToOCamlException(raw_exn$9);
           if (exn$9.MEL_EXN_ID === Unify) {
             throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                      MEL_EXN_ID: $$Error$7,
-                      _1: loc,
-                      _2: env,
-                      _3: {
-                        TAG: /* Scoping_let_module */28,
-                        _0: name$2.txt,
-                        _1: body$4.exp_type
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$7,
+                  _1: loc,
+                  _2: env,
+                  _3: {
+                    TAG: /* Scoping_let_module */28,
+                    _0: name$2.txt,
+                    _1: body$4.exp_type
+                  }
+                });
           }
           throw new Caml_js_exceptions.MelangeError(exn$9.MEL_EXN_ID, exn$9);
         }
         return re({
-                    exp_desc: {
-                      TAG: /* Texp_letmodule */23,
-                      _0: match$56[0],
-                      _1: name$2,
-                      _2: modl,
-                      _3: body$4
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: ty$9,
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_letmodule */23,
+                _0: match$56[0],
+                _1: name$2,
+                _2: modl,
+                _3: body$4
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: ty$9,
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_assert */26 :
         const cond$2 = type_expect(undefined, env, lid._0, type_bool);
         const match$57 = cond$2.exp_desc;
         let exp_type;
         exp_type = match$57.TAG === /* Texp_construct */8 && match$57._1.cstr_name === "false" ? instance(undefined, env, ty_expected) : instance_def(type_unit);
         return rue({
-                    exp_desc: {
-                      TAG: /* Texp_assert */24,
-                      _0: cond$2
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: exp_type,
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_assert */24,
+                _0: cond$2
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: exp_type,
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_lazy */27 :
         const ty$10 = newty2(100000000, {
               TAG: /* Tvar */0,
@@ -68725,16 +68725,16 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         unify_exp_types(loc, env, to_unify$2, ty_expected);
         const arg$6 = type_expect(undefined, env, lid._0, ty$10);
         return re({
-                    exp_desc: {
-                      TAG: /* Texp_lazy */25,
-                      _0: arg$6
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: instance(undefined, env, ty_expected),
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_lazy */25,
+                _0: arg$6
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: instance(undefined, env, ty_expected),
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_poly */28 :
         const sty$1 = lid._1;
         const sbody$1 = lid._0;
@@ -68767,13 +68767,13 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         let exp$2;
         if (/* tag */typeof match$59 === "number" || typeof match$59 === "string") {
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      44963,
-                      15
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  44963,
+                  15
+                ]
+              });
         }
         switch (match$59.TAG) {
           case /* Tvar */0 :
@@ -68837,46 +68837,46 @@ function type_expect_(in_function, env, sexp, ty_expected) {
               break;
           default:
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "jscomp/test/ocaml_typedtree_test.ml",
-                        44963,
-                        15
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "jscomp/test/ocaml_typedtree_test.ml",
+                    44963,
+                    15
+                  ]
+                });
         }
         return re({
-                    exp_desc: exp$2.exp_desc,
-                    exp_loc: exp$2.exp_loc,
-                    exp_extra: {
-                      hd: [
-                        {
-                          TAG: /* Texp_poly */3,
-                          _0: match$58[1]
-                        },
-                        loc,
-                        sexp.pexp_attributes
-                      ],
-                      tl: exp$2.exp_extra
-                    },
-                    exp_type: exp$2.exp_type,
-                    exp_env: exp$2.exp_env,
-                    exp_attributes: exp$2.exp_attributes
-                  });
+              exp_desc: exp$2.exp_desc,
+              exp_loc: exp$2.exp_loc,
+              exp_extra: {
+                hd: [
+                  {
+                    TAG: /* Texp_poly */3,
+                    _0: match$58[1]
+                  },
+                  loc,
+                  sexp.pexp_attributes
+                ],
+                tl: exp$2.exp_extra
+              },
+              exp_type: exp$2.exp_type,
+              exp_env: exp$2.exp_env,
+              exp_attributes: exp$2.exp_attributes
+            });
     case /* Pexp_object */29 :
         const match$61 = Curry._3(type_object.contents, env, loc, lid._0);
         return rue({
-                    exp_desc: {
-                      TAG: /* Texp_object */26,
-                      _0: match$61[0],
-                      _1: match$61[2]
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: match$61[1].csig_self,
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_object */26,
+                _0: match$61[0],
+                _1: match$61[2]
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: match$61[1].csig_self,
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_newtype */30 :
         const name$3 = lid._0;
         const ty$12 = newvar(undefined, undefined);
@@ -68933,46 +68933,46 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         replace(ety);
         end_def(undefined);
         return rue({
-                    exp_desc: body$5.exp_desc,
-                    exp_loc: loc,
-                    exp_extra: {
-                      hd: [
-                        {
-                          TAG: /* Texp_newtype */4,
-                          _0: name$3
-                        },
-                        loc,
-                        sexp.pexp_attributes
-                      ],
-                      tl: body$5.exp_extra
-                    },
-                    exp_type: ety,
-                    exp_env: body$5.exp_env,
-                    exp_attributes: body$5.exp_attributes
-                  });
+              exp_desc: body$5.exp_desc,
+              exp_loc: loc,
+              exp_extra: {
+                hd: [
+                  {
+                    TAG: /* Texp_newtype */4,
+                    _0: name$3
+                  },
+                  loc,
+                  sexp.pexp_attributes
+                ],
+                tl: body$5.exp_extra
+              },
+              exp_type: ety,
+              exp_env: body$5.exp_env,
+              exp_attributes: body$5.exp_attributes
+            });
     case /* Pexp_pack */31 :
         const match$63 = expand_head(env, instance(undefined, env, ty_expected));
         const match$64 = match$63.desc;
         let match$65;
         if (/* tag */typeof match$64 === "number" || typeof match$64 === "string") {
           throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                    MEL_EXN_ID: $$Error$7,
-                    _1: loc,
-                    _2: env,
-                    _3: {
-                      TAG: /* Not_a_packed_module */32,
-                      _0: ty_expected
-                    }
-                  });
+                MEL_EXN_ID: $$Error$7,
+                _1: loc,
+                _2: env,
+                _3: {
+                  TAG: /* Not_a_packed_module */32,
+                  _0: ty_expected
+                }
+              });
         }
         switch (match$64.TAG) {
           case /* Tvar */0 :
               throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                        MEL_EXN_ID: $$Error$7,
-                        _1: loc,
-                        _2: env,
-                        _3: /* Cannot_infer_signature */3
-                      });
+                    MEL_EXN_ID: $$Error$7,
+                    _1: loc,
+                    _2: env,
+                    _3: /* Cannot_infer_signature */3
+                  });
           case /* Tpackage */11 :
               if (principal.contents && expand_head(env, ty_expected).level < 100000000) {
                 prerr_warning(loc, {
@@ -68988,34 +68988,34 @@ function type_expect_(in_function, env, sexp, ty_expected) {
               break;
           default:
             throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                      MEL_EXN_ID: $$Error$7,
-                      _1: loc,
-                      _2: env,
-                      _3: {
-                        TAG: /* Not_a_packed_module */32,
-                        _0: ty_expected
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$7,
+                  _1: loc,
+                  _2: env,
+                  _3: {
+                    TAG: /* Not_a_packed_module */32,
+                    _0: ty_expected
+                  }
+                });
         }
         const nl = match$65[1];
         const p = match$65[0];
         const match$66 = Curry._5(type_package.contents, env, lid._0, p, nl, match$65[2]);
         return rue({
-                    exp_desc: {
-                      TAG: /* Texp_pack */27,
-                      _0: match$66[0]
-                    },
-                    exp_loc: loc,
-                    exp_extra: /* [] */0,
-                    exp_type: newty2(current_level.contents, {
-                          TAG: /* Tpackage */11,
-                          _0: p,
-                          _1: nl,
-                          _2: match$66[1]
-                        }),
-                    exp_env: env,
-                    exp_attributes: sexp.pexp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_pack */27,
+                _0: match$66[0]
+              },
+              exp_loc: loc,
+              exp_extra: /* [] */0,
+              exp_type: newty2(current_level.contents, {
+                    TAG: /* Tpackage */11,
+                    _0: p,
+                    _1: nl,
+                    _2: match$66[1]
+                  }),
+              exp_env: env,
+              exp_attributes: sexp.pexp_attributes
+            });
     case /* Pexp_open */32 :
         const lid$6 = lid._1;
         const ovf = lid._0;
@@ -69023,31 +69023,31 @@ function type_expect_(in_function, env, sexp, ty_expected) {
         const newenv = match$67[1];
         const exp$7 = type_expect(undefined, newenv, lid._2, ty_expected);
         return {
-                exp_desc: exp$7.exp_desc,
-                exp_loc: exp$7.exp_loc,
-                exp_extra: {
-                  hd: [
-                    {
-                      TAG: /* Texp_open */2,
-                      _0: ovf,
-                      _1: match$67[0],
-                      _2: lid$6,
-                      _3: newenv
-                    },
-                    loc,
-                    sexp.pexp_attributes
-                  ],
-                  tl: exp$7.exp_extra
-                },
-                exp_type: exp$7.exp_type,
-                exp_env: exp$7.exp_env,
-                exp_attributes: exp$7.exp_attributes
-              };
+          exp_desc: exp$7.exp_desc,
+          exp_loc: exp$7.exp_loc,
+          exp_extra: {
+            hd: [
+              {
+                TAG: /* Texp_open */2,
+                _0: ovf,
+                _1: match$67[0],
+                _2: lid$6,
+                _3: newenv
+              },
+              loc,
+              sexp.pexp_attributes
+            ],
+            tl: exp$7.exp_extra
+          },
+          exp_type: exp$7.exp_type,
+          exp_env: exp$7.exp_env,
+          exp_attributes: exp$7.exp_attributes
+        };
     case /* Pexp_extension */33 :
         throw new Caml_js_exceptions.MelangeError(Error_forward$1, {
-                  MEL_EXN_ID: Error_forward$1,
-                  _1: error_of_extension(lid._0)
-                });
+              MEL_EXN_ID: Error_forward$1,
+              _1: error_of_extension(lid._0)
+            });
     
   }
 }
@@ -69078,29 +69078,29 @@ function type_function(in_function, loc, attrs, env, ty_expected, l, caselist) {
       } else {
         if (match$2.TAG === /* Tarrow */1) {
           throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                    MEL_EXN_ID: $$Error$7,
-                    _1: loc,
-                    _2: env,
-                    _3: {
-                      TAG: /* Abstract_wrong_label */27,
-                      _0: l,
-                      _1: ty
-                    }
-                  });
+                MEL_EXN_ID: $$Error$7,
+                _1: loc,
+                _2: env,
+                _3: {
+                  TAG: /* Abstract_wrong_label */27,
+                  _0: l,
+                  _1: ty
+                }
+              });
         }
         exit = 1;
       }
       if (exit === 1) {
         throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                  MEL_EXN_ID: $$Error$7,
-                  _1: loc_fun,
-                  _2: env,
-                  _3: {
-                    TAG: /* Too_many_arguments */26,
-                    _0: in_function !== undefined,
-                    _1: ty_fun
-                  }
-                });
+              MEL_EXN_ID: $$Error$7,
+              _1: loc_fun,
+              _2: env,
+              _3: {
+                TAG: /* Too_many_arguments */26,
+                _0: in_function !== undefined,
+                _1: ty_fun
+              }
+            });
       }
       
     } else {
@@ -69119,13 +69119,13 @@ function type_function(in_function, loc, attrs, env, ty_expected, l, caselist) {
       const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
       if (exn$1.MEL_EXN_ID === Unify) {
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/ocaml_typedtree_test.ml",
-                    45069,
-                    24
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/ocaml_typedtree_test.ml",
+                45069,
+                24
+              ]
+            });
       }
       throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
     }
@@ -69155,24 +69155,24 @@ function type_function(in_function, loc, attrs, env, ty_expected, l, caselist) {
     prerr_warning(Stdlib__List.hd(cases).c_lhs.pat_loc, /* Unerasable_optional_argument */8);
   }
   return re({
-              exp_desc: {
-                TAG: /* Texp_function */3,
-                _0: l,
-                _1: cases,
-                _2: match$3[1]
-              },
-              exp_loc: loc,
-              exp_extra: /* [] */0,
-              exp_type: instance(undefined, env, newty2(100000000, {
-                        TAG: /* Tarrow */1,
-                        _0: l,
-                        _1: ty_arg$1,
-                        _2: ty_res,
-                        _3: /* Cok */0
-                      })),
-              exp_env: env,
-              exp_attributes: attrs
-            });
+        exp_desc: {
+          TAG: /* Texp_function */3,
+          _0: l,
+          _1: cases,
+          _2: match$3[1]
+        },
+        exp_loc: loc,
+        exp_extra: /* [] */0,
+        exp_type: instance(undefined, env, newty2(100000000, {
+                  TAG: /* Tarrow */1,
+                  _0: l,
+                  _1: ty_arg$1,
+                  _2: ty_res,
+                  _3: /* Cok */0
+                })),
+        exp_env: env,
+        exp_attributes: attrs
+      });
 }
 
 function type_label_access(env, loc, srecord, lid) {
@@ -69207,21 +69207,21 @@ function type_label_access(env, loc, srecord, lid) {
           return disambiguate(undefined, undefined, undefined, lid, env, opath, param);
         }), labels);
   return [
-          record,
-          label,
-          opath
-        ];
+    record,
+    label,
+    opath
+  ];
 }
 
 function type_format(loc, str, env) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              45122,
-              1
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          45122,
+          1
+        ]
+      });
 }
 
 function type_label_exp(create, env, loc, ty_expected, param) {
@@ -69250,15 +69250,15 @@ function type_label_exp(create, env, loc, ty_expected, param) {
     const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
     if (trace.MEL_EXN_ID === Unify) {
       throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                MEL_EXN_ID: $$Error$7,
-                _1: lid.loc,
-                _2: env,
-                _3: {
-                  TAG: /* Label_mismatch */2,
-                  _0: lid.txt,
-                  _1: trace._1
-                }
-              });
+            MEL_EXN_ID: $$Error$7,
+            _1: lid.loc,
+            _2: env,
+            _3: {
+              TAG: /* Label_mismatch */2,
+              _0: lid.txt,
+              _1: trace._1
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
   }
@@ -69270,25 +69270,25 @@ function type_label_exp(create, env, loc, ty_expected, param) {
   if (label.lbl_private === /* Private */0) {
     if (create) {
       throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                MEL_EXN_ID: $$Error$7,
-                _1: loc,
-                _2: env,
-                _3: {
-                  TAG: /* Private_type */19,
-                  _0: ty_expected
-                }
-              });
+            MEL_EXN_ID: $$Error$7,
+            _1: loc,
+            _2: env,
+            _3: {
+              TAG: /* Private_type */19,
+              _0: ty_expected
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError($$Error$7, {
-              MEL_EXN_ID: $$Error$7,
-              _1: lid.loc,
-              _2: env,
-              _3: {
-                TAG: /* Private_label */20,
-                _0: lid.txt,
-                _1: ty_expected
-              }
-            });
+          MEL_EXN_ID: $$Error$7,
+          _1: lid.loc,
+          _2: env,
+          _3: {
+            TAG: /* Private_label */20,
+            _0: lid.txt,
+            _1: ty_expected
+          }
+        });
   }
   const snap = Caml_obj.caml_equal(vars, /* [] */0) ? undefined : Caml_option.some(snapshot(undefined));
   const arg = type_argument(env, sarg, ty_arg$1, instance(undefined, env, ty_arg$1));
@@ -69329,17 +69329,17 @@ function type_label_exp(create, env, loc, ty_expected, param) {
     }
   }
   return [
-          lid,
-          label,
-          {
-            exp_desc: arg$1.exp_desc,
-            exp_loc: arg$1.exp_loc,
-            exp_extra: arg$1.exp_extra,
-            exp_type: instance(undefined, env, arg$1.exp_type),
-            exp_env: arg$1.exp_env,
-            exp_attributes: arg$1.exp_attributes
-          }
-        ];
+    lid,
+    label,
+    {
+      exp_desc: arg$1.exp_desc,
+      exp_loc: arg$1.exp_loc,
+      exp_extra: arg$1.exp_extra,
+      exp_type: instance(undefined, env, arg$1.exp_type),
+      exp_env: arg$1.exp_env,
+      exp_attributes: arg$1.exp_attributes
+    }
+  ];
 }
 
 function type_argument(env, sarg, ty_expected$p, ty_expected) {
@@ -69349,8 +69349,8 @@ function type_argument(env, sarg, ty_expected$p, ty_expected) {
       return false;
     } else {
       return Stdlib__List.for_all((function (param) {
-                    return "" === param;
-                  }), match[0]);
+              return "" === param;
+            }), match[0]);
     }
   };
   const is_inferred = function (_sexp) {
@@ -69410,10 +69410,10 @@ function type_argument(env, sarg, ty_expected$p, ty_expected) {
             switch (match.TAG) {
               case /* Tvar */0 :
                   return [
-                          Stdlib__List.rev(args),
-                          ty_fun,
-                          false
-                        ];
+                    Stdlib__List.rev(args),
+                    ty_fun,
+                    false
+                  ];
               case /* Tarrow */1 :
                   const l = match._0;
                   if (is_optional(l)) {
@@ -69431,10 +69431,10 @@ function type_argument(env, sarg, ty_expected$p, ty_expected) {
                   }
                   if (l === "" || classic.contents) {
                     return [
-                            Stdlib__List.rev(args),
-                            ty_fun,
-                            no_labels(match._2)
-                          ];
+                      Stdlib__List.rev(args),
+                      ty_fun,
+                      no_labels(match._2)
+                    ];
                   }
                   break;
               default:
@@ -69442,10 +69442,10 @@ function type_argument(env, sarg, ty_expected$p, ty_expected) {
             }
           }
           return [
-                  /* [] */0,
-                  texp.exp_type,
-                  false
-                ];
+            /* [] */0,
+            texp.exp_type,
+            false
+          ];
         };
       };
       const match$2 = make_args(/* [] */0, texp.exp_type);
@@ -69482,49 +69482,49 @@ function type_argument(env, sarg, ty_expected$p, ty_expected) {
         const var_pair = function (name, ty) {
           const id = create(name);
           return [
-                  {
-                    pat_desc: {
-                      TAG: /* Tpat_var */0,
-                      _0: id,
-                      _1: {
-                        txt: name,
-                        loc: none
-                      }
-                    },
-                    pat_loc: none,
-                    pat_extra: /* [] */0,
-                    pat_type: ty,
-                    pat_env: env,
-                    pat_attributes: /* [] */0
+            {
+              pat_desc: {
+                TAG: /* Tpat_var */0,
+                _0: id,
+                _1: {
+                  txt: name,
+                  loc: none
+                }
+              },
+              pat_loc: none,
+              pat_extra: /* [] */0,
+              pat_type: ty,
+              pat_env: env,
+              pat_attributes: /* [] */0
+            },
+            {
+              exp_desc: {
+                TAG: /* Texp_ident */0,
+                _0: {
+                  TAG: /* Pident */0,
+                  _0: id
+                },
+                _1: {
+                  txt: {
+                    TAG: /* Lident */0,
+                    _0: name
                   },
-                  {
-                    exp_desc: {
-                      TAG: /* Texp_ident */0,
-                      _0: {
-                        TAG: /* Pident */0,
-                        _0: id
-                      },
-                      _1: {
-                        txt: {
-                          TAG: /* Lident */0,
-                          _0: name
-                        },
-                        loc: none
-                      },
-                      _2: {
-                        val_type: ty,
-                        val_kind: /* Val_reg */0,
-                        val_loc: none,
-                        val_attributes: /* [] */0
-                      }
-                    },
-                    exp_loc: none,
-                    exp_extra: /* [] */0,
-                    exp_type: ty,
-                    exp_env: env,
-                    exp_attributes: /* [] */0
-                  }
-                ];
+                  loc: none
+                },
+                _2: {
+                  val_type: ty,
+                  val_kind: /* Val_reg */0,
+                  val_loc: none,
+                  val_attributes: /* [] */0
+                }
+              },
+              exp_loc: none,
+              exp_extra: /* [] */0,
+              exp_type: ty,
+              exp_env: env,
+              exp_attributes: /* [] */0
+            }
+          ];
         };
         const match$3 = var_pair("eta", match$1._1);
         const eta_var = match$3[1];
@@ -69555,25 +69555,25 @@ function type_argument(env, sarg, ty_expected$p, ty_expected) {
             exp_attributes: e_exp_attributes
           };
           return {
-                  exp_desc: {
-                    TAG: /* Texp_function */3,
-                    _0: "",
-                    _1: {
-                      hd: {
-                        c_lhs: eta_pat,
-                        c_guard: undefined,
-                        c_rhs: e
-                      },
-                      tl: /* [] */0
-                    },
-                    _2: /* Total */1
-                  },
-                  exp_loc: texp.exp_loc,
-                  exp_extra: texp.exp_extra,
-                  exp_type: ty_fun,
-                  exp_env: texp.exp_env,
-                  exp_attributes: texp.exp_attributes
-                };
+            exp_desc: {
+              TAG: /* Texp_function */3,
+              _0: "",
+              _1: {
+                hd: {
+                  c_lhs: eta_pat,
+                  c_guard: undefined,
+                  c_rhs: e
+                },
+                tl: /* [] */0
+              },
+              _2: /* Total */1
+            },
+            exp_loc: texp.exp_loc,
+            exp_extra: texp.exp_extra,
+            exp_type: ty_fun,
+            exp_env: texp.exp_env,
+            exp_attributes: texp.exp_attributes
+          };
         };
         prerr_warning(texp_exp_loc, {
               TAG: /* Eliminated_optional_arguments */31,
@@ -69592,26 +69592,26 @@ function type_argument(env, sarg, ty_expected$p, ty_expected) {
         }
         const match$4 = var_pair("arg", texp_exp_type);
         return re({
-                    exp_desc: {
-                      TAG: /* Texp_let */2,
-                      _0: /* Nonrecursive */0,
-                      _1: {
-                        hd: {
-                          vb_pat: match$4[0],
-                          vb_expr: texp$1,
-                          vb_attributes: /* [] */0,
-                          vb_loc: none
-                        },
-                        tl: /* [] */0
-                      },
-                      _2: func(match$4[1])
-                    },
-                    exp_loc: texp_exp_loc,
-                    exp_extra: texp_exp_extra,
-                    exp_type: ty_fun,
-                    exp_env: texp_exp_env,
-                    exp_attributes: texp_exp_attributes
-                  });
+              exp_desc: {
+                TAG: /* Texp_let */2,
+                _0: /* Nonrecursive */0,
+                _1: {
+                  hd: {
+                    vb_pat: match$4[0],
+                    vb_expr: texp$1,
+                    vb_attributes: /* [] */0,
+                    vb_loc: none
+                  },
+                  tl: /* [] */0
+                },
+                _2: func(match$4[1])
+              },
+              exp_loc: texp_exp_loc,
+              exp_extra: texp_exp_extra,
+              exp_type: ty_fun,
+              exp_env: texp_exp_env,
+              exp_attributes: texp_exp_attributes
+            });
       }
       unify_exp(env, texp$1, ty_expected);
       return texp$1;
@@ -69626,14 +69626,14 @@ function type_argument(env, sarg, ty_expected$p, ty_expected) {
 function type_application(env, funct, sargs) {
   const result_type = function (omitted, ty_fun) {
     return Stdlib__List.fold_left((function (ty_fun, param) {
-                  return newty2(param[2], {
-                              TAG: /* Tarrow */1,
-                              _0: param[0],
-                              _1: param[1],
-                              _2: ty_fun,
-                              _3: /* Cok */0
-                            });
-                }), ty_fun, omitted);
+            return newty2(param[2], {
+                  TAG: /* Tarrow */1,
+                  _0: param[0],
+                  _1: param[1],
+                  _2: ty_fun,
+                  _3: /* Cok */0
+                });
+          }), ty_fun, omitted);
   };
   const has_label = function (l, ty_fun) {
     const match = list_labels(env, ty_fun);
@@ -69705,15 +69705,15 @@ function type_application(env, funct, sargs) {
               if (sargs) {
                 const match$5 = sargs.hd;
                 throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                          MEL_EXN_ID: $$Error$7,
-                          _1: match$5[1].pexp_loc,
-                          _2: env,
-                          _3: {
-                            TAG: /* Apply_wrong_label */9,
-                            _0: match$5[0],
-                            _1: ty_old
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$7,
+                      _1: match$5[1].pexp_loc,
+                      _2: env,
+                      _3: {
+                        TAG: /* Apply_wrong_label */9,
+                        _0: match$5[0],
+                        _1: ty_old
+                      }
+                    });
               }
               if (more_sargs) {
                 const match$6 = more_sargs.hd;
@@ -69721,15 +69721,15 @@ function type_application(env, funct, sargs) {
                 const l$p = match$6[0];
                 if (l !== l$p && l$p !== "") {
                   throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                            MEL_EXN_ID: $$Error$7,
-                            _1: sarg0.pexp_loc,
-                            _2: env,
-                            _3: {
-                              TAG: /* Apply_wrong_label */9,
-                              _0: l$p,
-                              _1: match
-                            }
-                          });
+                        MEL_EXN_ID: $$Error$7,
+                        _1: sarg0.pexp_loc,
+                        _2: env,
+                        _3: {
+                          TAG: /* Apply_wrong_label */9,
+                          _0: l$p,
+                          _1: match
+                        }
+                      });
                 }
                 match$4 = [
                   /* [] */0,
@@ -69740,13 +69740,13 @@ function type_application(env, funct, sargs) {
                 ];
               } else {
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            45373,
-                            16
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        45373,
+                        16
+                      ]
+                    });
               }
             } else {
               try {
@@ -69842,13 +69842,13 @@ function type_application(env, funct, sargs) {
             const arg = match$4[2];
             const sargs$1 = match$4[0];
             const omitted$1 = arg === undefined ? ({
-                  hd: [
-                    l,
-                    ty,
-                    lv
-                  ],
-                  tl: omitted
-                }) : omitted;
+                hd: [
+                  l,
+                  ty,
+                  lv
+                ],
+                tl: omitted
+              }) : omitted;
             const ty_old$1 = Caml_obj.caml_equal(sargs$1, /* [] */0) ? ty_fun$1 : ty_old;
             _more_sargs = match$4[1];
             _sargs = sargs$1;
@@ -69875,15 +69875,15 @@ function type_application(env, funct, sargs) {
           if (ignore_labels) {
             const match$10 = sargs.hd;
             throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                      MEL_EXN_ID: $$Error$7,
-                      _1: match$10[1].pexp_loc,
-                      _2: env,
-                      _3: {
-                        TAG: /* Apply_wrong_label */9,
-                        _0: match$10[0],
-                        _1: ty_old
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$7,
+                  _1: match$10[1].pexp_loc,
+                  _2: env,
+                  _3: {
+                    TAG: /* Apply_wrong_label */9,
+                    _0: match$10[0],
+                    _1: ty_old
+                  }
+                });
           }
           exit$1 = 2;
         } else {
@@ -69899,25 +69899,25 @@ function type_application(env, funct, sargs) {
             const args$1 = _args$1;
             if (!param) {
               return [
-                      Stdlib__List.map((function (param) {
-                              const f = param[1];
-                              const l = param[0];
-                              if (f !== undefined) {
-                                return [
-                                        l,
-                                        Curry._1(f, undefined),
-                                        param[2]
-                                      ];
-                              } else {
-                                return [
-                                        l,
-                                        undefined,
-                                        param[2]
-                                      ];
-                              }
-                            }), Stdlib__List.rev(args$1)),
-                      instance(undefined, env, result_type(omitted, ty_fun$2))
-                    ];
+                Stdlib__List.map((function (param) {
+                        const f = param[1];
+                        const l = param[0];
+                        if (f !== undefined) {
+                          return [
+                            l,
+                            Curry._1(f, undefined),
+                            param[2]
+                          ];
+                        } else {
+                          return [
+                            l,
+                            undefined,
+                            param[2]
+                          ];
+                        }
+                      }), Stdlib__List.rev(args$1)),
+                instance(undefined, env, result_type(omitted, ty_fun$2))
+              ];
             }
             const match$11 = param.hd;
             const sarg1 = match$11[1];
@@ -69991,35 +69991,35 @@ function type_application(env, funct, sargs) {
                 if (match$13.TAG === /* Tarrow */1) {
                   if (classic.contents || !has_label(l1, ty_fun$4)) {
                     throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                              MEL_EXN_ID: $$Error$7,
-                              _1: sarg1.pexp_loc,
-                              _2: env,
-                              _3: {
-                                TAG: /* Apply_wrong_label */9,
-                                _0: l1,
-                                _1: ty_res
-                              }
-                            });
+                          MEL_EXN_ID: $$Error$7,
+                          _1: sarg1.pexp_loc,
+                          _2: env,
+                          _3: {
+                            TAG: /* Apply_wrong_label */9,
+                            _0: l1,
+                            _1: ty_res
+                          }
+                        });
                   }
                   throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                            MEL_EXN_ID: $$Error$7,
-                            _1: funct.exp_loc,
-                            _2: env,
-                            _3: /* Incoherent_label_order */1
-                          });
+                        MEL_EXN_ID: $$Error$7,
+                        _1: funct.exp_loc,
+                        _2: env,
+                        _3: /* Incoherent_label_order */1
+                      });
                 }
                 exit$3 = 2;
               }
               if (exit$3 === 2) {
                 throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                          MEL_EXN_ID: $$Error$7,
-                          _1: funct.exp_loc,
-                          _2: env,
-                          _3: {
-                            TAG: /* Apply_non_function */8,
-                            _0: expand_head(env, funct.exp_type)
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$7,
+                      _1: funct.exp_loc,
+                      _2: env,
+                      _3: {
+                        TAG: /* Apply_non_function */8,
+                        _0: expand_head(env, funct.exp_type)
+                      }
+                    });
               }
               
             }
@@ -70074,16 +70074,16 @@ function type_application(env, funct, sargs) {
           }
         }
         return [
-                {
-                  hd: [
-                    "",
-                    exp,
-                    /* Required */0
-                  ],
-                  tl: /* [] */0
-                },
-                match$4[1]
-              ];
+          {
+            hd: [
+              "",
+              exp,
+              /* Required */0
+            ],
+            tl: /* [] */0
+          },
+          match$4[1]
+        ];
       }
       
     }
@@ -70219,12 +70219,12 @@ function type_cases(in_function, env, ty_arg, ty_res, partial_flag, loc, caselis
                 pat_attributes: pat.pat_attributes
               }) : pat;
           return [
-                  pat$1,
-                  [
-                    match[1],
-                    match[3]
-                  ]
-                ];
+            pat$1,
+            [
+              match[1],
+              match[3]
+            ]
+          ];
         }), caselist);
   const patl = Stdlib__List.map((function (prim) {
           return prim[0];
@@ -70243,8 +70243,8 @@ function type_cases(in_function, env, ty_arg, ty_res, partial_flag, loc, caselis
         }), pattern_force.contents);
   Stdlib__List.iter((function (param) {
           return iter_pattern((function (param) {
-                        unify_var(env$2, param.pat_type, newvar(undefined, undefined));
-                      }), param);
+                  unify_var(env$2, param.pat_type, newvar(undefined, undefined));
+                }), param);
         }), patl);
   Stdlib__List.iter((function (pat) {
           unify_pat(env$2, pat, instance(undefined, env$2, ty_arg$1));
@@ -70252,10 +70252,10 @@ function type_cases(in_function, env, ty_arg, ty_res, partial_flag, loc, caselis
   end_def(undefined);
   Stdlib__List.iter((function (param) {
           return iter_pattern((function (param) {
-                        iter_generalize$1({
-                              contents: /* [] */0
-                            }, param.pat_type);
-                      }), param);
+                  iter_generalize$1({
+                        contents: /* [] */0
+                      }, param.pat_type);
+                }), param);
         }), patl);
   const in_function$1 = Stdlib__List.length(caselist) === 1 ? in_function : undefined;
   const cases = Stdlib__List.map2((function (param, param$1) {
@@ -70277,17 +70277,17 @@ function type_cases(in_function, env, ty_arg, ty_res, partial_flag, loc, caselis
           const guard = pc_guard !== undefined ? type_expect(undefined, ext_env, wrap_unpacks(pc_guard, unpacks), type_bool) : undefined;
           const exp = type_expect(in_function$1, ext_env, sexp, ty_res$p);
           return {
-                  c_lhs: param[0],
-                  c_guard: guard,
-                  c_rhs: {
-                    exp_desc: exp.exp_desc,
-                    exp_loc: exp.exp_loc,
-                    exp_extra: exp.exp_extra,
-                    exp_type: instance(undefined, env$2, ty_res$p),
-                    exp_env: exp.exp_env,
-                    exp_attributes: exp.exp_attributes
-                  }
-                };
+            c_lhs: param[0],
+            c_guard: guard,
+            c_rhs: {
+              exp_desc: exp.exp_desc,
+              exp_loc: exp.exp_loc,
+              exp_extra: exp.exp_extra,
+              exp_type: instance(undefined, env$2, ty_res$p),
+              exp_env: exp.exp_env,
+              exp_attributes: exp.exp_attributes
+            }
+          };
         }), pat_env_list, caselist);
   if (principal.contents || has_gadts) {
     const ty_res$p = instance(undefined, env$2, ty_res$1);
@@ -70348,13 +70348,13 @@ function type_cases(in_function, env, ty_arg, ty_res, partial_flag, loc, caselis
             }
             if (exit === 1) {
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          40982,
-                          48
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/ocaml_typedtree_test.ml",
+                      40982,
+                      48
+                    ]
+                  });
             }
             
           }
@@ -70378,23 +70378,23 @@ function type_cases(in_function, env, ty_arg, ty_res, partial_flag, loc, caselis
     unify_exp_types(loc, env$2, instance(undefined, env$2, ty_res$1), newvar(undefined, undefined));
   }
   return [
-          cases,
-          partial
-        ];
+    cases,
+    partial
+  ];
 }
 
 function type_let(checkOpt, check_strictOpt, env, rec_flag, spat_sexp_list, scope, allow) {
   const check = checkOpt !== undefined ? checkOpt : (function (s) {
         return {
-                TAG: /* Unused_var */12,
-                _0: s
-              };
+          TAG: /* Unused_var */12,
+          _0: s
+        };
       });
   const check_strict = check_strictOpt !== undefined ? check_strictOpt : (function (s) {
         return {
-                TAG: /* Unused_var_strict */13,
-                _0: s
-              };
+          TAG: /* Unused_var_strict */13,
+          _0: s
+        };
       });
   begin_def(undefined);
   if (principal.contents) {
@@ -70453,10 +70453,10 @@ function type_let(checkOpt, check_strictOpt, env, rec_flag, spat_sexp_list, scop
           }
           const init = spat.ppat_loc;
           return constraint_({
-                      loc_start: init.loc_start,
-                      loc_end: init.loc_end,
-                      loc_ghost: true
-                    }, undefined, spat, sty);
+                loc_start: init.loc_start,
+                loc_end: init.loc_end,
+                loc_ghost: true
+              }, undefined, spat, sty);
         }), spat_sexp_list);
   const nvs = Stdlib__List.map((function (param) {
           return newvar(undefined, undefined);
@@ -70471,13 +70471,13 @@ function type_let(checkOpt, check_strictOpt, env, rec_flag, spat_sexp_list, scop
             const match = pat.pat_type.desc;
             let pat$1;
             pat$1 = /* tag */typeof match === "number" || typeof match === "string" || match.TAG !== /* Tpoly */10 ? pat : ({
-                  pat_desc: pat.pat_desc,
-                  pat_loc: pat.pat_loc,
-                  pat_extra: pat.pat_extra,
-                  pat_type: instance_poly(true, false, match._1, match._0)[1],
-                  pat_env: pat.pat_env,
-                  pat_attributes: pat.pat_attributes
-                });
+                pat_desc: pat.pat_desc,
+                pat_loc: pat.pat_loc,
+                pat_extra: pat.pat_extra,
+                pat_type: instance_poly(true, false, match._1, match._0)[1],
+                pat_env: pat.pat_env,
+                pat_attributes: pat.pat_attributes
+              });
             unify_pat(env, pat$1, type_approx(env, binding.pvb_expr));
           }), pat_list, spat_sexp_list);
   }
@@ -70496,13 +70496,13 @@ function type_let(checkOpt, check_strictOpt, env, rec_flag, spat_sexp_list, scop
                       generalize_structure$1(current_level.contents, pat.pat_type);
                     }), pat);
               return {
-                      pat_desc: pat.pat_desc,
-                      pat_loc: pat.pat_loc,
-                      pat_extra: pat.pat_extra,
-                      pat_type: instance(undefined, env, pat.pat_type),
-                      pat_env: pat.pat_env,
-                      pat_attributes: pat.pat_attributes
-                    };
+                pat_desc: pat.pat_desc,
+                pat_loc: pat.pat_loc,
+                pat_extra: pat.pat_extra,
+                pat_type: instance(undefined, env, pat.pat_type),
+                pat_env: pat.pat_env,
+                pat_attributes: pat.pat_attributes
+              };
             }), pat_list)) : pat_list;
   Stdlib__List.iter((function (f) {
           Curry._1(f, undefined);
@@ -70518,9 +70518,9 @@ function type_let(checkOpt, check_strictOpt, env, rec_flag, spat_sexp_list, scop
   const pat_slot_list = Stdlib__List.map((function (pat) {
           if (!warn_unused) {
             return [
-                    pat,
-                    undefined
-                  ];
+              pat,
+              undefined
+            ];
           }
           const some_used = {
             contents: false
@@ -70573,9 +70573,9 @@ function type_let(checkOpt, check_strictOpt, env, rec_flag, spat_sexp_list, scop
                   try {
                     const old = Stdlib__Hashtbl.find(value_declarations, key);
                     return Stdlib__Hashtbl.replace(value_declarations, key, (function (param) {
-                                  Curry._1(old, undefined);
-                                  Curry._1(callback, undefined);
-                                }));
+                            Curry._1(old, undefined);
+                            Curry._1(callback, undefined);
+                          }));
                   }
                   catch (raw_exn){
                     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -70586,9 +70586,9 @@ function type_let(checkOpt, check_strictOpt, env, rec_flag, spat_sexp_list, scop
                   }
                 }), pat_bound_idents(pat));
           return [
-                  pat,
-                  slot
-                ];
+            pat,
+            slot
+          ];
         }), pat_list$1);
   const exp_list = Stdlib__List.map2((function (param, param$1) {
           const pat = param$1[0];
@@ -70618,13 +70618,13 @@ function type_let(checkOpt, check_strictOpt, env, rec_flag, spat_sexp_list, scop
           end_def(undefined);
           check_univars(env, true, "definition", exp, pat.pat_type, match$1[0]);
           return {
-                  exp_desc: exp.exp_desc,
-                  exp_loc: exp.exp_loc,
-                  exp_extra: exp.exp_extra,
-                  exp_type: instance(undefined, env, exp.exp_type),
-                  exp_env: exp.exp_env,
-                  exp_attributes: exp.exp_attributes
-                };
+            exp_desc: exp.exp_desc,
+            exp_loc: exp.exp_loc,
+            exp_extra: exp.exp_extra,
+            exp_type: instance(undefined, env, exp.exp_type),
+            exp_env: exp.exp_env,
+            exp_attributes: exp.exp_attributes
+          };
         }), spat_sexp_list, pat_slot_list);
   current_slot.contents = undefined;
   if (is_recursive && !rec_needed.contents && is_active(/* Unused_rec_flag */15)) {
@@ -70644,8 +70644,8 @@ function type_let(checkOpt, check_strictOpt, env, rec_flag, spat_sexp_list, scop
   Stdlib__List.iter2((function (pat, exp) {
           if (!is_nonexpansive(exp)) {
             return iter_pattern((function (pat) {
-                          generalize_expansive$1(env, pat.pat_type);
-                        }), pat);
+                    generalize_expansive$1(env, pat.pat_type);
+                  }), pat);
           }
           
         }), pat_list$1, exp_list);
@@ -70659,44 +70659,44 @@ function type_let(checkOpt, check_strictOpt, env, rec_flag, spat_sexp_list, scop
   const l = Stdlib__List.combine(pat_list$1, exp_list);
   const l$1 = Stdlib__List.map2((function (param, pvb) {
           return {
-                  vb_pat: param[0],
-                  vb_expr: param[1],
-                  vb_attributes: pvb.pvb_attributes,
-                  vb_loc: pvb.pvb_loc
-                };
+            vb_pat: param[0],
+            vb_expr: param[1],
+            vb_attributes: pvb.pvb_attributes,
+            vb_loc: pvb.pvb_loc
+          };
         }), l, spat_sexp_list);
   return [
-          l$1,
-          new_env,
-          unpacks
-        ];
+    l$1,
+    new_env,
+    unpacks
+  ];
 }
 
 function type_binding(env, rec_flag, spat_sexp_list, scope) {
   reset_type_variables(undefined);
   const match = type_let((function (s) {
           return {
-                  TAG: /* Unused_value_declaration */16,
-                  _0: s
-                };
+            TAG: /* Unused_value_declaration */16,
+            _0: s
+          };
         }), (function (s) {
           return {
-                  TAG: /* Unused_value_declaration */16,
-                  _0: s
-                };
+            TAG: /* Unused_value_declaration */16,
+            _0: s
+          };
         }), env, rec_flag, spat_sexp_list, scope, false);
   return [
-          match[0],
-          match[1]
-        ];
+    match[0],
+    match[1]
+  ];
 }
 
 function type_let$1(env, rec_flag, spat_sexp_list, scope) {
   const match = type_let(undefined, undefined, env, rec_flag, spat_sexp_list, scope, false);
   return [
-          match[0],
-          match[1]
-        ];
+    match[0],
+    match[1]
+  ];
 }
 
 function type_expression(env, sexp) {
@@ -70717,13 +70717,13 @@ function type_expression(env, sexp) {
   }
   const match = lookup_value$1(lid._0.txt, env);
   return {
-          exp_desc: exp.exp_desc,
-          exp_loc: exp.exp_loc,
-          exp_extra: exp.exp_extra,
-          exp_type: match[1].val_type,
-          exp_env: exp.exp_env,
-          exp_attributes: exp.exp_attributes
-        };
+    exp_desc: exp.exp_desc,
+    exp_loc: exp.exp_loc,
+    exp_extra: exp.exp_extra,
+    exp_type: match[1].val_type,
+    exp_env: exp.exp_env,
+    exp_attributes: exp.exp_attributes
+  };
 }
 
 register_error_of_exn(function (err) {
@@ -70736,1250 +70736,1100 @@ register_error_of_exn(function (err) {
       }
       const env = err._2;
       return error_of_printer(err._1, (function (param, param$1) {
-                    return wrap_printing_env(env, (function (param$2) {
-                                  if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
-                                    switch (param$1) {
-                                      case /* Outside_class */0 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "This object duplication occurs outside a method definition",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "This object duplication occurs outside a method definition"
-                                                    });
-                                      case /* Incoherent_label_order */1 :
-                                          Stdlib__Format.fprintf(param)({
-                                                TAG: /* Format */0,
-                                                _0: {
-                                                  TAG: /* String_literal */11,
-                                                  _0: "This function is applied to arguments",
+              return wrap_printing_env(env, (function (param$2) {
+                      if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
+                        switch (param$1) {
+                          case /* Outside_class */0 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "This object duplication occurs outside a method definition",
+                                      _1: /* End_of_format */0
+                                    },
+                                    _1: "This object duplication occurs outside a method definition"
+                                  });
+                          case /* Incoherent_label_order */1 :
+                              Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "This function is applied to arguments",
+                                      _1: {
+                                        TAG: /* Formatting_lit */17,
+                                        _0: {
+                                          TAG: /* Break */0,
+                                          _0: "@ ",
+                                          _1: 1,
+                                          _2: 0
+                                        },
+                                        _1: /* End_of_format */0
+                                      }
+                                    },
+                                    _1: "This function is applied to arguments@ "
+                                  });
+                              Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "in an order different from other calls.",
+                                      _1: {
+                                        TAG: /* Formatting_lit */17,
+                                        _0: {
+                                          TAG: /* Break */0,
+                                          _0: "@ ",
+                                          _1: 1,
+                                          _2: 0
+                                        },
+                                        _1: /* End_of_format */0
+                                      }
+                                    },
+                                    _1: "in an order different from other calls.@ "
+                                  });
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "This is only allowed when the real type is known.",
+                                      _1: /* End_of_format */0
+                                    },
+                                    _1: "This is only allowed when the real type is known."
+                                  });
+                          case /* Modules_not_allowed */2 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "Modules are not allowed in this pattern.",
+                                      _1: /* End_of_format */0
+                                    },
+                                    _1: "Modules are not allowed in this pattern."
+                                  });
+                          case /* Cannot_infer_signature */3 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "The signature for this packaged module couldn't be inferred.",
+                                      _1: /* End_of_format */0
+                                    },
+                                    _1: "The signature for this packaged module couldn't be inferred."
+                                  });
+                          case /* Unexpected_existential */4 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "Unexpected existential",
+                                      _1: /* End_of_format */0
+                                    },
+                                    _1: "Unexpected existential"
+                                  });
+                          case /* Invalid_interval */5 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* Formatting_gen */18,
+                                      _0: {
+                                        TAG: /* Open_box */1,
+                                        _0: {
+                                          TAG: /* Format */0,
+                                          _0: /* End_of_format */0,
+                                          _1: ""
+                                        }
+                                      },
+                                      _1: {
+                                        TAG: /* String_literal */11,
+                                        _0: "Only character intervals are supported in patterns.",
+                                        _1: {
+                                          TAG: /* Formatting_lit */17,
+                                          _0: /* Close_box */0,
+                                          _1: /* End_of_format */0
+                                        }
+                                      }
+                                    },
+                                    _1: "@[Only character intervals are supported in patterns.@]"
+                                  });
+                          case /* Invalid_for_loop_index */6 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* Formatting_gen */18,
+                                      _0: {
+                                        TAG: /* Open_box */1,
+                                        _0: {
+                                          TAG: /* Format */0,
+                                          _0: /* End_of_format */0,
+                                          _1: ""
+                                        }
+                                      },
+                                      _1: {
+                                        TAG: /* String_literal */11,
+                                        _0: "Invalid for-loop index: only variables and _ are allowed.",
+                                        _1: {
+                                          TAG: /* Formatting_lit */17,
+                                          _0: /* Close_box */0,
+                                          _1: /* End_of_format */0
+                                        }
+                                      }
+                                    },
+                                    _1: "@[Invalid for-loop index: only variables and _ are allowed.@]"
+                                  });
+                          case /* No_value_clauses */7 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "None of the patterns in this 'match' expression match values.",
+                                      _1: /* End_of_format */0
+                                    },
+                                    _1: "None of the patterns in this 'match' expression match values."
+                                  });
+                          case /* Exception_pattern_below_toplevel */8 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* Formatting_gen */18,
+                                      _0: {
+                                        TAG: /* Open_box */1,
+                                        _0: {
+                                          TAG: /* Format */0,
+                                          _0: /* End_of_format */0,
+                                          _1: ""
+                                        }
+                                      },
+                                      _1: {
+                                        TAG: /* String_literal */11,
+                                        _0: "Exception patterns must be at the top level of a match case.",
+                                        _1: {
+                                          TAG: /* Formatting_lit */17,
+                                          _0: /* Close_box */0,
+                                          _1: /* End_of_format */0
+                                        }
+                                      }
+                                    },
+                                    _1: "@[Exception patterns must be at the top level of a match case.@]"
+                                  });
+                          
+                        }
+                      } else {
+                        switch (param$1.TAG) {
+                          case /* Polymorphic_label */0 :
+                              return Curry._3(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "The record field ",
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: " is polymorphic.",
+                                                _1: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: {
+                                                    TAG: /* Break */0,
+                                                    _0: "@ ",
+                                                    _1: 1,
+                                                    _2: 0
+                                                  },
                                                   _1: {
-                                                    TAG: /* Formatting_lit */17,
-                                                    _0: {
-                                                      TAG: /* Break */0,
-                                                      _0: "@ ",
-                                                      _1: 1,
-                                                      _2: 0
-                                                    },
-                                                    _1: /* End_of_format */0
+                                                    TAG: /* String */2,
+                                                    _0: /* No_padding */0,
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: /* Close_box */0,
+                                                      _1: /* End_of_format */0
+                                                    }
                                                   }
-                                                },
-                                                _1: "This function is applied to arguments@ "
-                                              });
-                                          Stdlib__Format.fprintf(param)({
-                                                TAG: /* Format */0,
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[The record field %a is polymorphic.@ %s@]"
+                                      }), longident, param$1._0, "You cannot instantiate it in a pattern.");
+                          case /* Constructor_arity_mismatch */1 :
+                              return Curry._4(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "The constructor ",
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: {
+                                                TAG: /* Formatting_lit */17,
                                                 _0: {
+                                                  TAG: /* Break */0,
+                                                  _0: "@ ",
+                                                  _1: 1,
+                                                  _2: 0
+                                                },
+                                                _1: {
                                                   TAG: /* String_literal */11,
-                                                  _0: "in an order different from other calls.",
+                                                  _0: "expects ",
                                                   _1: {
-                                                    TAG: /* Formatting_lit */17,
-                                                    _0: {
-                                                      TAG: /* Break */0,
-                                                      _0: "@ ",
-                                                      _1: 1,
-                                                      _2: 0
-                                                    },
-                                                    _1: /* End_of_format */0
-                                                  }
-                                                },
-                                                _1: "in an order different from other calls.@ "
-                                              });
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "This is only allowed when the real type is known.",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "This is only allowed when the real type is known."
-                                                    });
-                                      case /* Modules_not_allowed */2 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "Modules are not allowed in this pattern.",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "Modules are not allowed in this pattern."
-                                                    });
-                                      case /* Cannot_infer_signature */3 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "The signature for this packaged module couldn't be inferred.",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "The signature for this packaged module couldn't be inferred."
-                                                    });
-                                      case /* Unexpected_existential */4 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "Unexpected existential",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "Unexpected existential"
-                                                    });
-                                      case /* Invalid_interval */5 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* Formatting_gen */18,
-                                                        _0: {
-                                                          TAG: /* Open_box */1,
-                                                          _0: {
-                                                            TAG: /* Format */0,
-                                                            _0: /* End_of_format */0,
-                                                            _1: ""
-                                                          }
-                                                        },
-                                                        _1: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "Only character intervals are supported in patterns.",
-                                                          _1: {
-                                                            TAG: /* Formatting_lit */17,
-                                                            _0: /* Close_box */0,
-                                                            _1: /* End_of_format */0
-                                                          }
-                                                        }
-                                                      },
-                                                      _1: "@[Only character intervals are supported in patterns.@]"
-                                                    });
-                                      case /* Invalid_for_loop_index */6 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* Formatting_gen */18,
-                                                        _0: {
-                                                          TAG: /* Open_box */1,
-                                                          _0: {
-                                                            TAG: /* Format */0,
-                                                            _0: /* End_of_format */0,
-                                                            _1: ""
-                                                          }
-                                                        },
-                                                        _1: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "Invalid for-loop index: only variables and _ are allowed.",
-                                                          _1: {
-                                                            TAG: /* Formatting_lit */17,
-                                                            _0: /* Close_box */0,
-                                                            _1: /* End_of_format */0
-                                                          }
-                                                        }
-                                                      },
-                                                      _1: "@[Invalid for-loop index: only variables and _ are allowed.@]"
-                                                    });
-                                      case /* No_value_clauses */7 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "None of the patterns in this 'match' expression match values.",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "None of the patterns in this 'match' expression match values."
-                                                    });
-                                      case /* Exception_pattern_below_toplevel */8 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* Formatting_gen */18,
+                                                    TAG: /* Int */4,
+                                                    _0: /* Int_i */3,
+                                                    _1: /* No_padding */0,
+                                                    _2: /* No_precision */0,
+                                                    _3: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: " argument(s),",
+                                                      _1: {
+                                                        TAG: /* Formatting_lit */17,
                                                         _0: {
-                                                          TAG: /* Open_box */1,
-                                                          _0: {
-                                                            TAG: /* Format */0,
-                                                            _0: /* End_of_format */0,
-                                                            _1: ""
-                                                          }
+                                                          TAG: /* Break */0,
+                                                          _0: "@ ",
+                                                          _1: 1,
+                                                          _2: 0
                                                         },
                                                         _1: {
                                                           TAG: /* String_literal */11,
-                                                          _0: "Exception patterns must be at the top level of a match case.",
+                                                          _0: "but is applied here to ",
                                                           _1: {
-                                                            TAG: /* Formatting_lit */17,
-                                                            _0: /* Close_box */0,
-                                                            _1: /* End_of_format */0
-                                                          }
-                                                        }
-                                                      },
-                                                      _1: "@[Exception patterns must be at the top level of a match case.@]"
-                                                    });
-                                      
-                                    }
-                                  } else {
-                                    switch (param$1.TAG) {
-                                      case /* Polymorphic_label */0 :
-                                          return Curry._3(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "The record field ",
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: " is polymorphic.",
-                                                                  _1: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: {
-                                                                      TAG: /* Break */0,
-                                                                      _0: "@ ",
-                                                                      _1: 1,
-                                                                      _2: 0
-                                                                    },
-                                                                    _1: {
-                                                                      TAG: /* String */2,
-                                                                      _0: /* No_padding */0,
-                                                                      _1: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: /* Close_box */0,
-                                                                        _1: /* End_of_format */0
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[The record field %a is polymorphic.@ %s@]"
-                                                        }), longident, param$1._0, "You cannot instantiate it in a pattern.");
-                                      case /* Constructor_arity_mismatch */1 :
-                                          return Curry._4(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
+                                                            TAG: /* Int */4,
+                                                            _0: /* Int_i */3,
+                                                            _1: /* No_padding */0,
+                                                            _2: /* No_precision */0,
+                                                            _3: {
                                                               TAG: /* String_literal */11,
-                                                              _0: "The constructor ",
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: {
-                                                                    TAG: /* Break */0,
-                                                                    _0: "@ ",
-                                                                    _1: 1,
-                                                                    _2: 0
-                                                                  },
-                                                                  _1: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: "expects ",
-                                                                    _1: {
-                                                                      TAG: /* Int */4,
-                                                                      _0: /* Int_i */3,
-                                                                      _1: /* No_padding */0,
-                                                                      _2: /* No_precision */0,
-                                                                      _3: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: " argument(s),",
-                                                                        _1: {
-                                                                          TAG: /* Formatting_lit */17,
-                                                                          _0: {
-                                                                            TAG: /* Break */0,
-                                                                            _0: "@ ",
-                                                                            _1: 1,
-                                                                            _2: 0
-                                                                          },
-                                                                          _1: {
-                                                                            TAG: /* String_literal */11,
-                                                                            _0: "but is applied here to ",
-                                                                            _1: {
-                                                                              TAG: /* Int */4,
-                                                                              _0: /* Int_i */3,
-                                                                              _1: /* No_padding */0,
-                                                                              _2: /* No_precision */0,
-                                                                              _3: {
-                                                                                TAG: /* String_literal */11,
-                                                                                _0: " argument(s)",
-                                                                                _1: {
-                                                                                  TAG: /* Formatting_lit */17,
-                                                                                  _0: /* Close_box */0,
-                                                                                  _1: /* End_of_format */0
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[The constructor %a@ expects %i argument(s),@ but is applied here to %i argument(s)@]"
-                                                        }), longident, param$1._0, param$1._1, param$1._2);
-                                      case /* Label_mismatch */2 :
-                                          const lid = param$1._0;
-                                          return report_unification_error(param, env, undefined, param$1._1, (function (ppf) {
-                                                        Curry._2(Stdlib__Format.fprintf(ppf)({
-                                                                  TAG: /* Format */0,
-                                                                  _0: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: "The record field ",
-                                                                    _1: {
-                                                                      TAG: /* Alpha */15,
-                                                                      _0: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: {
-                                                                          TAG: /* Break */0,
-                                                                          _0: "@ ",
-                                                                          _1: 1,
-                                                                          _2: 0
-                                                                        },
-                                                                        _1: {
-                                                                          TAG: /* String_literal */11,
-                                                                          _0: "belongs to the type",
-                                                                          _1: /* End_of_format */0
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  },
-                                                                  _1: "The record field %a@ belongs to the type"
-                                                                }), longident, lid);
-                                                      }), (function (ppf) {
-                                                        Stdlib__Format.fprintf(ppf)({
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "but is mixed here with fields of type",
-                                                                _1: /* End_of_format */0
-                                                              },
-                                                              _1: "but is mixed here with fields of type"
-                                                            });
-                                                      }));
-                                      case /* Pattern_type_clash */3 :
-                                          return report_unification_error(param, env, undefined, param$1._0, (function (ppf) {
-                                                        Stdlib__Format.fprintf(ppf)({
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "This pattern matches values of type",
-                                                                _1: /* End_of_format */0
-                                                              },
-                                                              _1: "This pattern matches values of type"
-                                                            });
-                                                      }), (function (ppf) {
-                                                        Stdlib__Format.fprintf(ppf)({
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "but a pattern was expected which matches values of type",
-                                                                _1: /* End_of_format */0
-                                                              },
-                                                              _1: "but a pattern was expected which matches values of type"
-                                                            });
-                                                      }));
-                                      case /* Or_pattern_type_clash */4 :
-                                          const id = param$1._0;
-                                          return report_unification_error(param, env, undefined, param$1._1, (function (ppf) {
-                                                        Curry._1(Stdlib__Format.fprintf(ppf)({
-                                                                  TAG: /* Format */0,
-                                                                  _0: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: "The variable ",
-                                                                    _1: {
-                                                                      TAG: /* String */2,
-                                                                      _0: /* No_padding */0,
-                                                                      _1: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: " on the left-hand side of this or-pattern has type",
-                                                                        _1: /* End_of_format */0
-                                                                      }
-                                                                    }
-                                                                  },
-                                                                  _1: "The variable %s on the left-hand side of this or-pattern has type"
-                                                                }), id.name);
-                                                      }), (function (ppf) {
-                                                        Stdlib__Format.fprintf(ppf)({
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "but on the right-hand side it has type",
-                                                                _1: /* End_of_format */0
-                                                              },
-                                                              _1: "but on the right-hand side it has type"
-                                                            });
-                                                      }));
-                                      case /* Multiply_bound_variable */5 :
-                                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "Variable ",
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " is bound several times in this matching",
-                                                                _1: /* End_of_format */0
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "Variable %s is bound several times in this matching"
-                                                        }), param$1._0);
-                                      case /* Orpat_vars */6 :
-                                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "Variable ",
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
+                                                              _0: " argument(s)",
                                                               _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " must occur on both sides of this | pattern",
-                                                                _1: /* End_of_format */0
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "Variable %s must occur on both sides of this | pattern"
-                                                        }), param$1._0.name);
-                                      case /* Expr_type_clash */7 :
-                                          return report_unification_error(param, env, undefined, param$1._0, (function (ppf) {
-                                                        Stdlib__Format.fprintf(ppf)({
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "This expression has type",
-                                                                _1: /* End_of_format */0
-                                                              },
-                                                              _1: "This expression has type"
-                                                            });
-                                                      }), (function (ppf) {
-                                                        Stdlib__Format.fprintf(ppf)({
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "but an expression was expected of type",
-                                                                _1: /* End_of_format */0
-                                                              },
-                                                              _1: "but an expression was expected of type"
-                                                            });
-                                                      }));
-                                      case /* Apply_non_function */8 :
-                                          const typ = param$1._0;
-                                          reset(undefined);
-                                          mark_loops(typ);
-                                          const match = repr(typ).desc;
-                                          if (!/* tag */(typeof match === "number" || typeof match === "string") && match.TAG === /* Tarrow */1) {
-                                            Curry._2(Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* Formatting_gen */18,
-                                                        _0: {
-                                                          TAG: /* Open_box */1,
-                                                          _0: {
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "<v>",
-                                                              _1: /* End_of_format */0
-                                                            },
-                                                            _1: "<v>"
-                                                          }
-                                                        },
-                                                        _1: {
-                                                          TAG: /* Formatting_gen */18,
-                                                          _0: {
-                                                            TAG: /* Open_box */1,
-                                                            _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "<2>",
+                                                                TAG: /* Formatting_lit */17,
+                                                                _0: /* Close_box */0,
                                                                 _1: /* End_of_format */0
-                                                              },
-                                                              _1: "<2>"
-                                                            }
-                                                          },
-                                                          _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "This function has type",
-                                                            _1: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: /* Close_box */0,
-                                                                  _1: /* End_of_format */0
-                                                                }
                                                               }
                                                             }
                                                           }
                                                         }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[The constructor %a@ expects %i argument(s),@ but is applied here to %i argument(s)@]"
+                                      }), longident, param$1._0, param$1._1, param$1._2);
+                          case /* Label_mismatch */2 :
+                              const lid = param$1._0;
+                              return report_unification_error(param, env, undefined, param$1._1, (function (ppf) {
+                                      Curry._2(Stdlib__Format.fprintf(ppf)({
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "The record field ",
+                                                  _1: {
+                                                    TAG: /* Alpha */15,
+                                                    _0: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: {
+                                                        TAG: /* Break */0,
+                                                        _0: "@ ",
+                                                        _1: 1,
+                                                        _2: 0
                                                       },
-                                                      _1: "@[<v>@[<2>This function has type@ %a@]"
-                                                    }), type_expr$1, typ);
-                                            return Curry._1(Stdlib__Format.fprintf(param)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* Formatting_gen */18,
-                                                                _0: {
-                                                                  TAG: /* Open_box */1,
-                                                                  _0: {
-                                                                    TAG: /* Format */0,
-                                                                    _0: /* End_of_format */0,
-                                                                    _1: ""
-                                                                  }
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "It is applied to too many arguments;",
-                                                                  _1: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: {
-                                                                      TAG: /* Break */0,
-                                                                      _0: "@ ",
-                                                                      _1: 1,
-                                                                      _2: 0
-                                                                    },
-                                                                    _1: {
-                                                                      TAG: /* String */2,
-                                                                      _0: /* No_padding */0,
-                                                                      _1: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: /* Close_box */0,
-                                                                        _1: {
-                                                                          TAG: /* Formatting_lit */17,
-                                                                          _0: /* Close_box */0,
-                                                                          _1: /* End_of_format */0
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            },
-                                                            _1: "@ @[It is applied to too many arguments;@ %s@]@]"
-                                                          }), "maybe you forgot a `;'.");
+                                                      _1: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: "belongs to the type",
+                                                        _1: /* End_of_format */0
+                                                      }
+                                                    }
+                                                  }
+                                                },
+                                                _1: "The record field %a@ belongs to the type"
+                                              }), longident, lid);
+                                    }), (function (ppf) {
+                                      Stdlib__Format.fprintf(ppf)({
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: "but is mixed here with fields of type",
+                                              _1: /* End_of_format */0
+                                            },
+                                            _1: "but is mixed here with fields of type"
+                                          });
+                                    }));
+                          case /* Pattern_type_clash */3 :
+                              return report_unification_error(param, env, undefined, param$1._0, (function (ppf) {
+                                      Stdlib__Format.fprintf(ppf)({
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: "This pattern matches values of type",
+                                              _1: /* End_of_format */0
+                                            },
+                                            _1: "This pattern matches values of type"
+                                          });
+                                    }), (function (ppf) {
+                                      Stdlib__Format.fprintf(ppf)({
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: "but a pattern was expected which matches values of type",
+                                              _1: /* End_of_format */0
+                                            },
+                                            _1: "but a pattern was expected which matches values of type"
+                                          });
+                                    }));
+                          case /* Or_pattern_type_clash */4 :
+                              const id = param$1._0;
+                              return report_unification_error(param, env, undefined, param$1._1, (function (ppf) {
+                                      Curry._1(Stdlib__Format.fprintf(ppf)({
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "The variable ",
+                                                  _1: {
+                                                    TAG: /* String */2,
+                                                    _0: /* No_padding */0,
+                                                    _1: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: " on the left-hand side of this or-pattern has type",
+                                                      _1: /* End_of_format */0
+                                                    }
+                                                  }
+                                                },
+                                                _1: "The variable %s on the left-hand side of this or-pattern has type"
+                                              }), id.name);
+                                    }), (function (ppf) {
+                                      Stdlib__Format.fprintf(ppf)({
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: "but on the right-hand side it has type",
+                                              _1: /* End_of_format */0
+                                            },
+                                            _1: "but on the right-hand side it has type"
+                                          });
+                                    }));
+                          case /* Multiply_bound_variable */5 :
+                              return Curry._1(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "Variable ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: " is bound several times in this matching",
+                                              _1: /* End_of_format */0
+                                            }
                                           }
-                                          return Curry._3(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "<v>",
-                                                                  _1: /* End_of_format */0
-                                                                },
-                                                                _1: "<v>"
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* Formatting_gen */18,
-                                                              _0: {
-                                                                TAG: /* Open_box */1,
-                                                                _0: {
-                                                                  TAG: /* Format */0,
-                                                                  _0: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: "<2>",
-                                                                    _1: /* End_of_format */0
-                                                                  },
-                                                                  _1: "<2>"
-                                                                }
-                                                              },
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "This expression has type",
-                                                                _1: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: {
-                                                                    TAG: /* Break */0,
-                                                                    _0: "@ ",
-                                                                    _1: 1,
-                                                                    _2: 0
-                                                                  },
-                                                                  _1: {
-                                                                    TAG: /* Alpha */15,
-                                                                    _0: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: /* Close_box */0,
-                                                                      _1: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: {
-                                                                          TAG: /* Break */0,
-                                                                          _0: "@ ",
-                                                                          _1: 1,
-                                                                          _2: 0
-                                                                        },
-                                                                        _1: {
-                                                                          TAG: /* String */2,
-                                                                          _0: /* No_padding */0,
-                                                                          _1: {
-                                                                            TAG: /* Formatting_lit */17,
-                                                                            _0: /* Close_box */0,
-                                                                            _1: /* End_of_format */0
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[<v>@[<2>This expression has type@ %a@]@ %s@]"
-                                                        }), type_expr$1, typ, "This is not a function; it cannot be applied.");
-                                      case /* Apply_wrong_label */9 :
-                                          const ty = param$1._1;
-                                          const print_label = function (ppf, l) {
-                                            if (l === "") {
-                                              return Stdlib__Format.fprintf(ppf)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "without label",
-                                                            _1: /* End_of_format */0
-                                                          },
-                                                          _1: "without label"
-                                                        });
-                                            } else {
-                                              return Curry._1(Stdlib__Format.fprintf(ppf)({
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "with label ",
-                                                                _1: {
-                                                                  TAG: /* String */2,
-                                                                  _0: /* No_padding */0,
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              },
-                                                              _1: "with label %s"
-                                                            }), prefixed_label_name(l));
+                                        },
+                                        _1: "Variable %s is bound several times in this matching"
+                                      }), param$1._0);
+                          case /* Orpat_vars */6 :
+                              return Curry._1(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "Variable ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: " must occur on both sides of this | pattern",
+                                              _1: /* End_of_format */0
                                             }
-                                          };
-                                          reset(undefined);
-                                          mark_loops(ty);
-                                          return Curry._4(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "<v>",
-                                                                  _1: /* End_of_format */0
-                                                                },
-                                                                _1: "<v>"
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* Formatting_gen */18,
-                                                              _0: {
-                                                                TAG: /* Open_box */1,
-                                                                _0: {
-                                                                  TAG: /* Format */0,
-                                                                  _0: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: "<2>",
-                                                                    _1: /* End_of_format */0
-                                                                  },
-                                                                  _1: "<2>"
-                                                                }
-                                                              },
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "The function applied to this argument has type",
-                                                                _1: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: {
-                                                                    TAG: /* Break */0,
-                                                                    _0: "@ ",
-                                                                    _1: 1,
-                                                                    _2: 0
-                                                                  },
-                                                                  _1: {
-                                                                    TAG: /* Alpha */15,
-                                                                    _0: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: /* Close_box */0,
-                                                                      _1: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: /* Flush_newline */4,
-                                                                        _1: {
-                                                                          TAG: /* String_literal */11,
-                                                                          _0: "This argument cannot be applied ",
-                                                                          _1: {
-                                                                            TAG: /* Alpha */15,
-                                                                            _0: {
-                                                                              TAG: /* Formatting_lit */17,
-                                                                              _0: /* Close_box */0,
-                                                                              _1: /* End_of_format */0
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[<v>@[<2>The function applied to this argument has type@ %a@]@.This argument cannot be applied %a@]"
-                                                        }), type_expr$1, ty, print_label, param$1._0);
-                                      case /* Label_multiply_defined */10 :
-                                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The record field label ",
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " is defined several times",
-                                                                _1: /* End_of_format */0
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "The record field label %s is defined several times"
-                                                        }), param$1._0);
-                                      case /* Label_missing */11 :
-                                          const print_labels = function (ppf) {
-                                            return function (param) {
-                                              return Stdlib__List.iter((function (lbl) {
-                                                            Curry._1(Stdlib__Format.fprintf(ppf)({
-                                                                      TAG: /* Format */0,
-                                                                      _0: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: {
-                                                                          TAG: /* Break */0,
-                                                                          _0: "@ ",
-                                                                          _1: 1,
-                                                                          _2: 0
-                                                                        },
-                                                                        _1: {
-                                                                          TAG: /* String */2,
-                                                                          _0: /* No_padding */0,
-                                                                          _1: /* End_of_format */0
-                                                                        }
-                                                                      },
-                                                                      _1: "@ %s"
-                                                                    }), lbl.name);
-                                                          }), param);
-                                            };
-                                          };
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "<hov>",
-                                                                  _1: /* End_of_format */0
-                                                                },
-                                                                _1: "<hov>"
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "Some record fields are undefined:",
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: /* Close_box */0,
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[<hov>Some record fields are undefined:%a@]"
-                                                        }), print_labels, param$1._0);
-                                      case /* Label_not_mutable */12 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The record field ",
-                                                            _1: {
-                                                              TAG: /* Alpha */15,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " is not mutable",
-                                                                _1: /* End_of_format */0
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "The record field %a is not mutable"
-                                                        }), longident, param$1._0);
-                                      case /* Wrong_name */13 :
-                                          const lid$1 = param$1._4;
-                                          const p = param$1._3;
-                                          const kind = param$1._2;
-                                          const ty$1 = param$1._1;
-                                          reset(undefined);
-                                          mark_loops(ty$1);
-                                          Curry._3(Stdlib__Format.fprintf(param)({
-                                                    TAG: /* Format */0,
+                                          }
+                                        },
+                                        _1: "Variable %s must occur on both sides of this | pattern"
+                                      }), param$1._0.name);
+                          case /* Expr_type_clash */7 :
+                              return report_unification_error(param, env, undefined, param$1._0, (function (ppf) {
+                                      Stdlib__Format.fprintf(ppf)({
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: "This expression has type",
+                                              _1: /* End_of_format */0
+                                            },
+                                            _1: "This expression has type"
+                                          });
+                                    }), (function (ppf) {
+                                      Stdlib__Format.fprintf(ppf)({
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: "but an expression was expected of type",
+                                              _1: /* End_of_format */0
+                                            },
+                                            _1: "but an expression was expected of type"
+                                          });
+                                    }));
+                          case /* Apply_non_function */8 :
+                              const typ = param$1._0;
+                              reset(undefined);
+                              mark_loops(typ);
+                              const match = repr(typ).desc;
+                              if (!/* tag */(typeof match === "number" || typeof match === "string") && match.TAG === /* Tarrow */1) {
+                                Curry._2(Stdlib__Format.fprintf(param)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* Formatting_gen */18,
+                                            _0: {
+                                              TAG: /* Open_box */1,
+                                              _0: {
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "<v>",
+                                                  _1: /* End_of_format */0
+                                                },
+                                                _1: "<v>"
+                                              }
+                                            },
+                                            _1: {
+                                              TAG: /* Formatting_gen */18,
+                                              _0: {
+                                                TAG: /* Open_box */1,
+                                                _0: {
+                                                  TAG: /* Format */0,
+                                                  _0: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: "<2>",
+                                                    _1: /* End_of_format */0
+                                                  },
+                                                  _1: "<2>"
+                                                }
+                                              },
+                                              _1: {
+                                                TAG: /* String_literal */11,
+                                                _0: "This function has type",
+                                                _1: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: {
+                                                    TAG: /* Break */0,
+                                                    _0: "@ ",
+                                                    _1: 1,
+                                                    _2: 0
+                                                  },
+                                                  _1: {
+                                                    TAG: /* Alpha */15,
                                                     _0: {
-                                                      TAG: /* Formatting_gen */18,
-                                                      _0: {
-                                                        TAG: /* Open_box */1,
-                                                        _0: {
-                                                          TAG: /* Format */0,
-                                                          _0: /* End_of_format */0,
-                                                          _1: ""
-                                                        }
-                                                      },
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: /* Close_box */0,
+                                                      _1: /* End_of_format */0
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          },
+                                          _1: "@[<v>@[<2>This function has type@ %a@]"
+                                        }), type_expr$1, typ);
+                                return Curry._1(Stdlib__Format.fprintf(param)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* Formatting_gen */18,
+                                              _0: {
+                                                TAG: /* Open_box */1,
+                                                _0: {
+                                                  TAG: /* Format */0,
+                                                  _0: /* End_of_format */0,
+                                                  _1: ""
+                                                }
+                                              },
+                                              _1: {
+                                                TAG: /* String_literal */11,
+                                                _0: "It is applied to too many arguments;",
+                                                _1: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: {
+                                                    TAG: /* Break */0,
+                                                    _0: "@ ",
+                                                    _1: 1,
+                                                    _2: 0
+                                                  },
+                                                  _1: {
+                                                    TAG: /* String */2,
+                                                    _0: /* No_padding */0,
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: /* Close_box */0,
                                                       _1: {
-                                                        TAG: /* Formatting_gen */18,
-                                                        _0: {
-                                                          TAG: /* Open_box */1,
-                                                          _0: {
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "<2>",
-                                                              _1: /* End_of_format */0
-                                                            },
-                                                            _1: "<2>"
-                                                          }
-                                                        },
-                                                        _1: {
-                                                          TAG: /* String */2,
-                                                          _0: /* No_padding */0,
-                                                          _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: " type",
-                                                            _1: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: /* Close_box */0,
-                                                                  _1: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: {
-                                                                      TAG: /* Break */0,
-                                                                      _0: "@ ",
-                                                                      _1: 1,
-                                                                      _2: 0
-                                                                    },
-                                                                    _1: /* End_of_format */0
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
+                                                        TAG: /* Formatting_lit */17,
+                                                        _0: /* Close_box */0,
+                                                        _1: /* End_of_format */0
                                                       }
-                                                    },
-                                                    _1: "@[@[<2>%s type@ %a@]@ "
-                                                  }), param$1._0, type_expr$1, ty$1);
-                                          Curry._5(Stdlib__Format.fprintf(param)({
-                                                    TAG: /* Format */0,
-                                                    _0: {
-                                                      TAG: /* String_literal */11,
-                                                      _0: "The ",
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          },
+                                          _1: "@ @[It is applied to too many arguments;@ %s@]@]"
+                                        }), "maybe you forgot a `;'.");
+                              }
+                              return Curry._3(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: "<v>",
+                                                _1: /* End_of_format */0
+                                              },
+                                              _1: "<v>"
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* Formatting_gen */18,
+                                            _0: {
+                                              TAG: /* Open_box */1,
+                                              _0: {
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "<2>",
+                                                  _1: /* End_of_format */0
+                                                },
+                                                _1: "<2>"
+                                              }
+                                            },
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: "This expression has type",
+                                              _1: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: {
+                                                  TAG: /* Break */0,
+                                                  _0: "@ ",
+                                                  _1: 1,
+                                                  _2: 0
+                                                },
+                                                _1: {
+                                                  TAG: /* Alpha */15,
+                                                  _0: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: /* Close_box */0,
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: {
+                                                        TAG: /* Break */0,
+                                                        _0: "@ ",
+                                                        _1: 1,
+                                                        _2: 0
+                                                      },
                                                       _1: {
                                                         TAG: /* String */2,
                                                         _0: /* No_padding */0,
                                                         _1: {
-                                                          TAG: /* Char_literal */12,
-                                                          _0: /* ' ' */32,
-                                                          _1: {
-                                                            TAG: /* Alpha */15,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: " does not belong to type ",
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: /* Close_box */0,
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            }
-                                                          }
+                                                          TAG: /* Formatting_lit */17,
+                                                          _0: /* Close_box */0,
+                                                          _1: /* End_of_format */0
                                                         }
                                                       }
-                                                    },
-                                                    _1: "The %s %a does not belong to type %a@]"
-                                                  }), kind === "record" ? "field" : "constructor", longident, lid$1, path, p);
-                                          if (kind === "record") {
-                                            return spellcheck_simple(param, fold_labels, (function (d) {
-                                                            if (compare_type_path(env, p, get_type_path$1(env, d))) {
-                                                              return d.lbl_name;
-                                                            } else {
-                                                              return "";
-                                                            }
-                                                          }))(env, lid$1);
-                                          } else {
-                                            return spellcheck_simple(param, fold_constructors, (function (d) {
-                                                            if (compare_type_path(env, p, get_type_path$2(env, d))) {
-                                                              return d.cstr_name;
-                                                            } else {
-                                                              return "";
-                                                            }
-                                                          }))(env, lid$1);
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
                                           }
-                                      case /* Name_type_mismatch */14 :
-                                          const lid$2 = param$1._1;
-                                          const kind$1 = param$1._0;
-                                          const name = kind$1 === "record" ? "field" : "constructor";
-                                          let param$3 = param$1._2;
-                                          let tpl = param$1._3;
-                                          const txt1 = function (ppf) {
-                                            Curry._4(Stdlib__Format.fprintf(ppf)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "The ",
-                                                        _1: {
-                                                          TAG: /* String */2,
-                                                          _0: /* No_padding */0,
-                                                          _1: {
-                                                            TAG: /* Char_literal */12,
-                                                            _0: /* ' ' */32,
-                                                            _1: {
-                                                              TAG: /* Alpha */15,
-                                                              _0: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "belongs to the ",
-                                                                  _1: {
-                                                                    TAG: /* String */2,
-                                                                    _0: /* No_padding */0,
-                                                                    _1: {
-                                                                      TAG: /* String_literal */11,
-                                                                      _0: " type",
-                                                                      _1: /* End_of_format */0
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      },
-                                                      _1: "The %s %a@ belongs to the %s type"
-                                                    }), name, longident, lid$2, kind$1);
-                                          };
-                                          const txt2 = function (ppf) {
-                                            Curry._4(Stdlib__Format.fprintf(ppf)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "The ",
-                                                        _1: {
-                                                          TAG: /* String */2,
-                                                          _0: /* No_padding */0,
-                                                          _1: {
-                                                            TAG: /* Char_literal */12,
-                                                            _0: /* ' ' */32,
-                                                            _1: {
-                                                              TAG: /* Alpha */15,
-                                                              _0: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "belongs to one of the following ",
-                                                                  _1: {
-                                                                    TAG: /* String */2,
-                                                                    _0: /* No_padding */0,
-                                                                    _1: {
-                                                                      TAG: /* String_literal */11,
-                                                                      _0: " types:",
-                                                                      _1: /* End_of_format */0
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      },
-                                                      _1: "The %s %a@ belongs to one of the following %s types:"
-                                                    }), name, longident, lid$2, kind$1);
-                                          };
-                                          const txt3 = function (ppf) {
-                                            Curry._2(Stdlib__Format.fprintf(ppf)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
+                                        },
+                                        _1: "@[<v>@[<2>This expression has type@ %a@]@ %s@]"
+                                      }), type_expr$1, typ, "This is not a function; it cannot be applied.");
+                          case /* Apply_wrong_label */9 :
+                              const ty = param$1._1;
+                              const print_label = function (ppf, l) {
+                                if (l === "") {
+                                  return Stdlib__Format.fprintf(ppf)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "without label",
+                                          _1: /* End_of_format */0
+                                        },
+                                        _1: "without label"
+                                      });
+                                } else {
+                                  return Curry._1(Stdlib__Format.fprintf(ppf)({
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: "with label ",
+                                              _1: {
+                                                TAG: /* String */2,
+                                                _0: /* No_padding */0,
+                                                _1: /* End_of_format */0
+                                              }
+                                            },
+                                            _1: "with label %s"
+                                          }), prefixed_label_name(l));
+                                }
+                              };
+                              reset(undefined);
+                              mark_loops(ty);
+                              return Curry._4(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: "<v>",
+                                                _1: /* End_of_format */0
+                                              },
+                                              _1: "<v>"
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* Formatting_gen */18,
+                                            _0: {
+                                              TAG: /* Open_box */1,
+                                              _0: {
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "<2>",
+                                                  _1: /* End_of_format */0
+                                                },
+                                                _1: "<2>"
+                                              }
+                                            },
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: "The function applied to this argument has type",
+                                              _1: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: {
+                                                  TAG: /* Break */0,
+                                                  _0: "@ ",
+                                                  _1: 1,
+                                                  _2: 0
+                                                },
+                                                _1: {
+                                                  TAG: /* Alpha */15,
+                                                  _0: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: /* Close_box */0,
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: /* Flush_newline */4,
+                                                      _1: {
                                                         TAG: /* String_literal */11,
-                                                        _0: "but a ",
+                                                        _0: "This argument cannot be applied ",
                                                         _1: {
-                                                          TAG: /* String */2,
-                                                          _0: /* No_padding */0,
-                                                          _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: " was expected belonging to the ",
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " type",
-                                                                _1: /* End_of_format */0
-                                                              }
-                                                            }
+                                                          TAG: /* Alpha */15,
+                                                          _0: {
+                                                            TAG: /* Formatting_lit */17,
+                                                            _0: /* Close_box */0,
+                                                            _1: /* End_of_format */0
                                                           }
                                                         }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[<v>@[<2>The function applied to this argument has type@ %a@]@.This argument cannot be applied %a@]"
+                                      }), type_expr$1, ty, print_label, param$1._0);
+                          case /* Label_multiply_defined */10 :
+                              return Curry._1(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The record field label ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: " is defined several times",
+                                              _1: /* End_of_format */0
+                                            }
+                                          }
+                                        },
+                                        _1: "The record field label %s is defined several times"
+                                      }), param$1._0);
+                          case /* Label_missing */11 :
+                              const print_labels = function (ppf) {
+                                return function (param) {
+                                  return Stdlib__List.iter((function (lbl) {
+                                          Curry._1(Stdlib__Format.fprintf(ppf)({
+                                                    TAG: /* Format */0,
+                                                    _0: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: {
+                                                        TAG: /* Break */0,
+                                                        _0: "@ ",
+                                                        _1: 1,
+                                                        _2: 0
                                                       },
-                                                      _1: "but a %s was expected belonging to the %s type"
-                                                    }), name, kind$1);
-                                          };
-                                          const tp0$p = param$3[1];
-                                          const tp0 = param$3[0];
-                                          return wrap_printing_env(env, (function (param$4) {
-                                                        reset(undefined);
-                                                        Stdlib__List.iter((function (param) {
-                                                                path_same_name(tp0, param[0]);
-                                                                path_same_name(tp0$p, param[1]);
-                                                              }), tpl);
-                                                        if (tpl) {
-                                                          if (tpl.tl) {
-                                                            return Curry._6(Stdlib__Format.fprintf(param)({
-                                                                            TAG: /* Format */0,
-                                                                            _0: {
-                                                                              TAG: /* Formatting_gen */18,
-                                                                              _0: {
-                                                                                TAG: /* Open_box */1,
-                                                                                _0: {
-                                                                                  TAG: /* Format */0,
-                                                                                  _0: /* End_of_format */0,
-                                                                                  _1: ""
-                                                                                }
-                                                                              },
-                                                                              _1: {
-                                                                                TAG: /* Theta */16,
-                                                                                _0: {
-                                                                                  TAG: /* Formatting_lit */17,
-                                                                                  _0: {
-                                                                                    TAG: /* Break */0,
-                                                                                    _0: "@;<1 2>",
-                                                                                    _1: 1,
-                                                                                    _2: 2
-                                                                                  },
-                                                                                  _1: {
-                                                                                    TAG: /* Formatting_gen */18,
-                                                                                    _0: {
-                                                                                      TAG: /* Open_box */1,
-                                                                                      _0: {
-                                                                                        TAG: /* Format */0,
-                                                                                        _0: {
-                                                                                          TAG: /* String_literal */11,
-                                                                                          _0: "<hv>",
-                                                                                          _1: /* End_of_format */0
-                                                                                        },
-                                                                                        _1: "<hv>"
-                                                                                      }
-                                                                                    },
-                                                                                    _1: {
-                                                                                      TAG: /* Alpha */15,
-                                                                                      _0: {
-                                                                                        TAG: /* Formatting_lit */17,
-                                                                                        _0: /* Close_box */0,
-                                                                                        _1: {
-                                                                                          TAG: /* Formatting_lit */17,
-                                                                                          _0: {
-                                                                                            TAG: /* Break */0,
-                                                                                            _0: "@ ",
-                                                                                            _1: 1,
-                                                                                            _2: 0
-                                                                                          },
-                                                                                          _1: {
-                                                                                            TAG: /* Theta */16,
-                                                                                            _0: {
-                                                                                              TAG: /* Formatting_lit */17,
-                                                                                              _0: {
-                                                                                                TAG: /* Break */0,
-                                                                                                _0: "@;<1 2>",
-                                                                                                _1: 1,
-                                                                                                _2: 2
-                                                                                              },
-                                                                                              _1: {
-                                                                                                TAG: /* Alpha */15,
-                                                                                                _0: {
-                                                                                                  TAG: /* Formatting_lit */17,
-                                                                                                  _0: /* Close_box */0,
-                                                                                                  _1: /* End_of_format */0
-                                                                                                }
-                                                                                              }
-                                                                                            }
-                                                                                          }
-                                                                                        }
-                                                                                      }
-                                                                                    }
-                                                                                  }
-                                                                                }
-                                                                              }
-                                                                            },
-                                                                            _1: "@[%t@;<1 2>@[<hv>%a@]@ %t@;<1 2>%a@]"
-                                                                          }), txt2, type_path_list, tpl, txt3, (function (param, param$1) {
-                                                                          return type_path_expansion(tp0, param, param$1);
-                                                                        }), tp0$p);
-                                                          }
-                                                          const match = tpl.hd;
-                                                          const tp = match[0];
-                                                          return Curry._6(Stdlib__Format.fprintf(param)({
-                                                                          TAG: /* Format */0,
-                                                                          _0: {
-                                                                            TAG: /* Formatting_gen */18,
-                                                                            _0: {
-                                                                              TAG: /* Open_box */1,
-                                                                              _0: {
-                                                                                TAG: /* Format */0,
-                                                                                _0: /* End_of_format */0,
-                                                                                _1: ""
-                                                                              }
-                                                                            },
-                                                                            _1: {
-                                                                              TAG: /* Theta */16,
-                                                                              _0: {
-                                                                                TAG: /* Formatting_lit */17,
-                                                                                _0: {
-                                                                                  TAG: /* Break */0,
-                                                                                  _0: "@;<1 2>",
-                                                                                  _1: 1,
-                                                                                  _2: 2
-                                                                                },
-                                                                                _1: {
-                                                                                  TAG: /* Alpha */15,
-                                                                                  _0: {
-                                                                                    TAG: /* Formatting_lit */17,
-                                                                                    _0: {
-                                                                                      TAG: /* Break */0,
-                                                                                      _0: "@ ",
-                                                                                      _1: 1,
-                                                                                      _2: 0
-                                                                                    },
-                                                                                    _1: {
-                                                                                      TAG: /* Theta */16,
-                                                                                      _0: {
-                                                                                        TAG: /* Formatting_lit */17,
-                                                                                        _0: {
-                                                                                          TAG: /* Break */0,
-                                                                                          _0: "@;<1 2>",
-                                                                                          _1: 1,
-                                                                                          _2: 2
-                                                                                        },
-                                                                                        _1: {
-                                                                                          TAG: /* Alpha */15,
-                                                                                          _0: {
-                                                                                            TAG: /* Formatting_lit */17,
-                                                                                            _0: /* Close_box */0,
-                                                                                            _1: /* End_of_format */0
-                                                                                          }
-                                                                                        }
-                                                                                      }
-                                                                                    }
-                                                                                  }
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          },
-                                                                          _1: "@[%t@;<1 2>%a@ %t@;<1 2>%a@]"
-                                                                        }), txt1, (function (param, param$1) {
-                                                                        return type_path_expansion(tp, param, param$1);
-                                                                      }), match[1], txt3, (function (param, param$1) {
-                                                                        return type_path_expansion(tp0, param, param$1);
-                                                                      }), tp0$p);
+                                                      _1: {
+                                                        TAG: /* String */2,
+                                                        _0: /* No_padding */0,
+                                                        _1: /* End_of_format */0
+                                                      }
+                                                    },
+                                                    _1: "@ %s"
+                                                  }), lbl.name);
+                                        }), param);
+                                };
+                              };
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: "<hov>",
+                                                _1: /* End_of_format */0
+                                              },
+                                              _1: "<hov>"
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "Some record fields are undefined:",
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: /* Close_box */0,
+                                                _1: /* End_of_format */0
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[<hov>Some record fields are undefined:%a@]"
+                                      }), print_labels, param$1._0);
+                          case /* Label_not_mutable */12 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The record field ",
+                                          _1: {
+                                            TAG: /* Alpha */15,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: " is not mutable",
+                                              _1: /* End_of_format */0
+                                            }
+                                          }
+                                        },
+                                        _1: "The record field %a is not mutable"
+                                      }), longident, param$1._0);
+                          case /* Wrong_name */13 :
+                              const lid$1 = param$1._4;
+                              const p = param$1._3;
+                              const kind = param$1._2;
+                              const ty$1 = param$1._1;
+                              reset(undefined);
+                              mark_loops(ty$1);
+                              Curry._3(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* Formatting_gen */18,
+                                            _0: {
+                                              TAG: /* Open_box */1,
+                                              _0: {
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "<2>",
+                                                  _1: /* End_of_format */0
+                                                },
+                                                _1: "<2>"
+                                              }
+                                            },
+                                            _1: {
+                                              TAG: /* String */2,
+                                              _0: /* No_padding */0,
+                                              _1: {
+                                                TAG: /* String_literal */11,
+                                                _0: " type",
+                                                _1: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: {
+                                                    TAG: /* Break */0,
+                                                    _0: "@ ",
+                                                    _1: 1,
+                                                    _2: 0
+                                                  },
+                                                  _1: {
+                                                    TAG: /* Alpha */15,
+                                                    _0: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: /* Close_box */0,
+                                                      _1: {
+                                                        TAG: /* Formatting_lit */17,
+                                                        _0: {
+                                                          TAG: /* Break */0,
+                                                          _0: "@ ",
+                                                          _1: 1,
+                                                          _2: 0
+                                                        },
+                                                        _1: /* End_of_format */0
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[@[<2>%s type@ %a@]@ "
+                                      }), param$1._0, type_expr$1, ty$1);
+                              Curry._5(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* Char_literal */12,
+                                              _0: /* ' ' */32,
+                                              _1: {
+                                                TAG: /* Alpha */15,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: " does not belong to type ",
+                                                  _1: {
+                                                    TAG: /* Alpha */15,
+                                                    _0: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: /* Close_box */0,
+                                                      _1: /* End_of_format */0
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "The %s %a does not belong to type %a@]"
+                                      }), kind === "record" ? "field" : "constructor", longident, lid$1, path, p);
+                              if (kind === "record") {
+                                return spellcheck_simple(param, fold_labels, (function (d) {
+                                          if (compare_type_path(env, p, get_type_path$1(env, d))) {
+                                            return d.lbl_name;
+                                          } else {
+                                            return "";
+                                          }
+                                        }))(env, lid$1);
+                              } else {
+                                return spellcheck_simple(param, fold_constructors, (function (d) {
+                                          if (compare_type_path(env, p, get_type_path$2(env, d))) {
+                                            return d.cstr_name;
+                                          } else {
+                                            return "";
+                                          }
+                                        }))(env, lid$1);
+                              }
+                          case /* Name_type_mismatch */14 :
+                              const lid$2 = param$1._1;
+                              const kind$1 = param$1._0;
+                              const name = kind$1 === "record" ? "field" : "constructor";
+                              let param$3 = param$1._2;
+                              let tpl = param$1._3;
+                              const txt1 = function (ppf) {
+                                Curry._4(Stdlib__Format.fprintf(ppf)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "The ",
+                                            _1: {
+                                              TAG: /* String */2,
+                                              _0: /* No_padding */0,
+                                              _1: {
+                                                TAG: /* Char_literal */12,
+                                                _0: /* ' ' */32,
+                                                _1: {
+                                                  TAG: /* Alpha */15,
+                                                  _0: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: {
+                                                      TAG: /* Break */0,
+                                                      _0: "@ ",
+                                                      _1: 1,
+                                                      _2: 0
+                                                    },
+                                                    _1: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: "belongs to the ",
+                                                      _1: {
+                                                        TAG: /* String */2,
+                                                        _0: /* No_padding */0,
+                                                        _1: {
+                                                          TAG: /* String_literal */11,
+                                                          _0: " type",
+                                                          _1: /* End_of_format */0
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          },
+                                          _1: "The %s %a@ belongs to the %s type"
+                                        }), name, longident, lid$2, kind$1);
+                              };
+                              const txt2 = function (ppf) {
+                                Curry._4(Stdlib__Format.fprintf(ppf)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "The ",
+                                            _1: {
+                                              TAG: /* String */2,
+                                              _0: /* No_padding */0,
+                                              _1: {
+                                                TAG: /* Char_literal */12,
+                                                _0: /* ' ' */32,
+                                                _1: {
+                                                  TAG: /* Alpha */15,
+                                                  _0: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: {
+                                                      TAG: /* Break */0,
+                                                      _0: "@ ",
+                                                      _1: 1,
+                                                      _2: 0
+                                                    },
+                                                    _1: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: "belongs to one of the following ",
+                                                      _1: {
+                                                        TAG: /* String */2,
+                                                        _0: /* No_padding */0,
+                                                        _1: {
+                                                          TAG: /* String_literal */11,
+                                                          _0: " types:",
+                                                          _1: /* End_of_format */0
                                                         }
-                                                        throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                                                  MEL_EXN_ID: "Assert_failure",
-                                                                  _1: [
-                                                                    "jscomp/test/ocaml_typedtree_test.ml",
-                                                                    37069,
-                                                                    12
-                                                                  ]
-                                                                });
-                                                      }));
-                                      case /* Invalid_format */15 :
-                                          return Curry._1(Stdlib__Format.fprintf(param)({
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          },
+                                          _1: "The %s %a@ belongs to one of the following %s types:"
+                                        }), name, longident, lid$2, kind$1);
+                              };
+                              const txt3 = function (ppf) {
+                                Curry._2(Stdlib__Format.fprintf(ppf)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "but a ",
+                                            _1: {
+                                              TAG: /* String */2,
+                                              _0: /* No_padding */0,
+                                              _1: {
+                                                TAG: /* String_literal */11,
+                                                _0: " was expected belonging to the ",
+                                                _1: {
+                                                  TAG: /* String */2,
+                                                  _0: /* No_padding */0,
+                                                  _1: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: " type",
+                                                    _1: /* End_of_format */0
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          },
+                                          _1: "but a %s was expected belonging to the %s type"
+                                        }), name, kind$1);
+                              };
+                              const tp0$p = param$3[1];
+                              const tp0 = param$3[0];
+                              return wrap_printing_env(env, (function (param$4) {
+                                      reset(undefined);
+                                      Stdlib__List.iter((function (param) {
+                                              path_same_name(tp0, param[0]);
+                                              path_same_name(tp0$p, param[1]);
+                                            }), tpl);
+                                      if (tpl) {
+                                        if (tpl.tl) {
+                                          return Curry._6(Stdlib__Format.fprintf(param)({
+                                                    TAG: /* Format */0,
+                                                    _0: {
+                                                      TAG: /* Formatting_gen */18,
+                                                      _0: {
+                                                        TAG: /* Open_box */1,
+                                                        _0: {
                                                           TAG: /* Format */0,
+                                                          _0: /* End_of_format */0,
+                                                          _1: ""
+                                                        }
+                                                      },
+                                                      _1: {
+                                                        TAG: /* Theta */16,
+                                                        _0: {
+                                                          TAG: /* Formatting_lit */17,
                                                           _0: {
-                                                            TAG: /* String */2,
-                                                            _0: /* No_padding */0,
-                                                            _1: /* End_of_format */0
+                                                            TAG: /* Break */0,
+                                                            _0: "@;<1 2>",
+                                                            _1: 1,
+                                                            _2: 2
                                                           },
-                                                          _1: "%s"
-                                                        }), param$1._0);
-                                      case /* Undefined_method */16 :
-                                          const ty$2 = param$1._0;
-                                          reset(undefined);
-                                          mark_loops(ty$2);
-                                          return Curry._3(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
+                                                          _1: {
                                                             TAG: /* Formatting_gen */18,
                                                             _0: {
                                                               TAG: /* Open_box */1,
@@ -71987,58 +71837,41 @@ register_error_of_exn(function (err) {
                                                                 TAG: /* Format */0,
                                                                 _0: {
                                                                   TAG: /* String_literal */11,
-                                                                  _0: "<v>",
+                                                                  _0: "<hv>",
                                                                   _1: /* End_of_format */0
                                                                 },
-                                                                _1: "<v>"
+                                                                _1: "<hv>"
                                                               }
                                                             },
                                                             _1: {
-                                                              TAG: /* Formatting_gen */18,
+                                                              TAG: /* Alpha */15,
                                                               _0: {
-                                                                TAG: /* Open_box */1,
-                                                                _0: {
-                                                                  TAG: /* Format */0,
-                                                                  _0: /* End_of_format */0,
-                                                                  _1: ""
-                                                                }
-                                                              },
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "This expression has type",
+                                                                TAG: /* Formatting_lit */17,
+                                                                _0: /* Close_box */0,
                                                                 _1: {
                                                                   TAG: /* Formatting_lit */17,
                                                                   _0: {
                                                                     TAG: /* Break */0,
-                                                                    _0: "@;<1 2>",
+                                                                    _0: "@ ",
                                                                     _1: 1,
-                                                                    _2: 2
+                                                                    _2: 0
                                                                   },
                                                                   _1: {
-                                                                    TAG: /* Alpha */15,
+                                                                    TAG: /* Theta */16,
                                                                     _0: {
                                                                       TAG: /* Formatting_lit */17,
-                                                                      _0: /* Close_box */0,
+                                                                      _0: {
+                                                                        TAG: /* Break */0,
+                                                                        _0: "@;<1 2>",
+                                                                        _1: 1,
+                                                                        _2: 2
+                                                                      },
                                                                       _1: {
-                                                                        TAG: /* Formatting_lit */17,
+                                                                        TAG: /* Alpha */15,
                                                                         _0: {
-                                                                          TAG: /* Break */0,
-                                                                          _0: "@,",
-                                                                          _1: 0,
-                                                                          _2: 0
-                                                                        },
-                                                                        _1: {
-                                                                          TAG: /* String_literal */11,
-                                                                          _0: "It has no method ",
-                                                                          _1: {
-                                                                            TAG: /* String */2,
-                                                                            _0: /* No_padding */0,
-                                                                            _1: {
-                                                                              TAG: /* Formatting_lit */17,
-                                                                              _0: /* Close_box */0,
-                                                                              _1: /* End_of_format */0
-                                                                            }
-                                                                          }
+                                                                          TAG: /* Formatting_lit */17,
+                                                                          _0: /* Close_box */0,
+                                                                          _1: /* End_of_format */0
                                                                         }
                                                                       }
                                                                     }
@@ -72046,736 +71879,903 @@ register_error_of_exn(function (err) {
                                                                 }
                                                               }
                                                             }
-                                                          },
-                                                          _1: "@[<v>@[This expression has type@;<1 2>%a@]@,It has no method %s@]"
-                                                        }), type_expr$1, ty$2, param$1._1);
-                                      case /* Undefined_inherited_method */17 :
-                                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "This expression has no method ",
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: /* End_of_format */0
-                                                            }
-                                                          },
-                                                          _1: "This expression has no method %s"
-                                                        }), param$1._0);
-                                      case /* Virtual_class */18 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "Cannot instantiate the virtual class ",
-                                                            _1: {
-                                                              TAG: /* Alpha */15,
-                                                              _0: /* End_of_format */0
-                                                            }
-                                                          },
-                                                          _1: "Cannot instantiate the virtual class %a"
-                                                        }), longident, param$1._0);
-                                      case /* Private_type */19 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "Cannot create values of the private type ",
-                                                            _1: {
-                                                              TAG: /* Alpha */15,
-                                                              _0: /* End_of_format */0
-                                                            }
-                                                          },
-                                                          _1: "Cannot create values of the private type %a"
-                                                        }), type_expr$1, param$1._0);
-                                      case /* Private_label */20 :
-                                          return Curry._4(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
+                                                          }
+                                                        }
+                                                      }
+                                                    },
+                                                    _1: "@[%t@;<1 2>@[<hv>%a@]@ %t@;<1 2>%a@]"
+                                                  }), txt2, type_path_list, tpl, txt3, (function (param, param$1) {
+                                                  return type_path_expansion(tp0, param, param$1);
+                                                }), tp0$p);
+                                        }
+                                        const match = tpl.hd;
+                                        const tp = match[0];
+                                        return Curry._6(Stdlib__Format.fprintf(param)({
+                                                  TAG: /* Format */0,
+                                                  _0: {
+                                                    TAG: /* Formatting_gen */18,
+                                                    _0: {
+                                                      TAG: /* Open_box */1,
+                                                      _0: {
+                                                        TAG: /* Format */0,
+                                                        _0: /* End_of_format */0,
+                                                        _1: ""
+                                                      }
+                                                    },
+                                                    _1: {
+                                                      TAG: /* Theta */16,
+                                                      _0: {
+                                                        TAG: /* Formatting_lit */17,
+                                                        _0: {
+                                                          TAG: /* Break */0,
+                                                          _0: "@;<1 2>",
+                                                          _1: 1,
+                                                          _2: 2
+                                                        },
+                                                        _1: {
+                                                          TAG: /* Alpha */15,
                                                           _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "Cannot assign field ",
+                                                            TAG: /* Formatting_lit */17,
+                                                            _0: {
+                                                              TAG: /* Break */0,
+                                                              _0: "@ ",
+                                                              _1: 1,
+                                                              _2: 0
+                                                            },
                                                             _1: {
-                                                              TAG: /* Alpha */15,
+                                                              TAG: /* Theta */16,
                                                               _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " of the private type ",
+                                                                TAG: /* Formatting_lit */17,
+                                                                _0: {
+                                                                  TAG: /* Break */0,
+                                                                  _0: "@;<1 2>",
+                                                                  _1: 1,
+                                                                  _2: 2
+                                                                },
                                                                 _1: {
                                                                   TAG: /* Alpha */15,
-                                                                  _0: /* End_of_format */0
+                                                                  _0: {
+                                                                    TAG: /* Formatting_lit */17,
+                                                                    _0: /* Close_box */0,
+                                                                    _1: /* End_of_format */0
+                                                                  }
                                                                 }
                                                               }
                                                             }
-                                                          },
-                                                          _1: "Cannot assign field %a of the private type %a"
-                                                        }), longident, param$1._0, type_expr$1, param$1._1);
-                                      case /* Unbound_instance_variable */21 :
-                                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "Unbound instance variable ",
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: /* End_of_format */0
-                                                            }
-                                                          },
-                                                          _1: "Unbound instance variable %s"
-                                                        }), param$1._0);
-                                      case /* Instance_variable_not_mutable */22 :
-                                          const v = param$1._1;
-                                          if (param$1._0) {
-                                            return Curry._1(Stdlib__Format.fprintf(param)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "The instance variable ",
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: " is not mutable",
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            },
-                                                            _1: "The instance variable %s is not mutable"
-                                                          }), v);
-                                          } else {
-                                            return Curry._1(Stdlib__Format.fprintf(param)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "The value ",
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: " is not an instance variable",
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            },
-                                                            _1: "The value %s is not an instance variable"
-                                                          }), v);
-                                          }
-                                      case /* Not_subtype */23 :
-                                          let tr1 = param$1._0;
-                                          let txt1$1 = "is not a subtype of";
-                                          let tr2 = param$1._1;
-                                          return wrap_printing_env(env, (function (param$4) {
-                                                        reset(undefined);
-                                                        const tr1$1 = Stdlib__List.map(prepare_expansion, tr1);
-                                                        const tr2$1 = Stdlib__List.map(prepare_expansion, tr2);
-                                                        const partial_arg = Caml_obj.caml_equal(tr2$1, /* [] */0);
-                                                        Curry._2(Stdlib__Format.fprintf(param)({
-                                                                  TAG: /* Format */0,
-                                                                  _0: {
-                                                                    TAG: /* Formatting_gen */18,
-                                                                    _0: {
-                                                                      TAG: /* Open_box */1,
-                                                                      _0: {
-                                                                        TAG: /* Format */0,
-                                                                        _0: {
-                                                                          TAG: /* String_literal */11,
-                                                                          _0: "<v>",
-                                                                          _1: /* End_of_format */0
-                                                                        },
-                                                                        _1: "<v>"
-                                                                      }
-                                                                    },
-                                                                    _1: {
-                                                                      TAG: /* Alpha */15,
-                                                                      _0: /* End_of_format */0
-                                                                    }
-                                                                  },
-                                                                  _1: "@[<v>%a"
-                                                                }), (function (param, param$1) {
-                                                                return trace$1(true, partial_arg, txt1$1, param, param$1);
-                                                              }), tr1$1);
-                                                        if (Caml_obj.caml_equal(tr2$1, /* [] */0)) {
-                                                          return Stdlib__Format.fprintf(param)({
-                                                                      TAG: /* Format */0,
-                                                                      _0: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: /* Close_box */0,
-                                                                        _1: /* End_of_format */0
-                                                                      },
-                                                                      _1: "@]"
-                                                                    });
+                                                          }
                                                         }
-                                                        const mis = mismatch(true, tr2$1);
-                                                        const partial_arg$1 = mis === undefined;
-                                                        Curry._3(Stdlib__Format.fprintf(param)({
-                                                                  TAG: /* Format */0,
-                                                                  _0: {
-                                                                    TAG: /* Alpha */15,
-                                                                    _0: {
-                                                                      TAG: /* Theta */16,
-                                                                      _0: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: /* Close_box */0,
-                                                                        _1: /* End_of_format */0
-                                                                      }
-                                                                    }
-                                                                  },
-                                                                  _1: "%a%t@]"
-                                                                }), (function (param, param$1) {
-                                                                return trace$1(false, partial_arg$1, "is not compatible with type", param, param$1);
-                                                              }), tr2$1, (function (param) {
-                                                                return explanation(true, mis, param);
-                                                              }));
-                                                      }));
-                                      case /* Value_multiply_overridden */24 :
-                                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The instance variable ",
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " is overridden several times",
-                                                                _1: /* End_of_format */0
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "The instance variable %s is overridden several times"
-                                                        }), param$1._0);
-                                      case /* Coercion_failure */25 :
-                                          const ty$p = param$1._1;
-                                          const ty$3 = param$1._0;
-                                          report_unification_error(param, env, undefined, param$1._2, (function (ppf) {
-                                                  const match = prepare_expansion([
-                                                        ty$3,
-                                                        ty$p
-                                                      ]);
-                                                  const ty$4 = match[0];
-                                                  Curry._2(Stdlib__Format.fprintf(ppf)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "This expression cannot be coerced to type",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@;<1 2>",
-                                                                  _1: 1,
-                                                                  _2: 2
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Alpha */15,
-                                                                  _0: {
-                                                                    TAG: /* Char_literal */12,
-                                                                    _0: /* ';' */59,
-                                                                    _1: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: {
-                                                                        TAG: /* Break */0,
-                                                                        _0: "@ ",
-                                                                        _1: 1,
-                                                                        _2: 0
-                                                                      },
-                                                                      _1: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: "it has type",
-                                                                        _1: /* End_of_format */0
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            },
-                                                            _1: "This expression cannot be coerced to type@;<1 2>%a;@ it has type"
-                                                          }), (function (param, param$1) {
-                                                          return type_expansion(ty$4, param, param$1);
-                                                        }), match[1]);
-                                                }), (function (ppf) {
-                                                  Stdlib__Format.fprintf(ppf)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "but is here used with type",
-                                                          _1: /* End_of_format */0
-                                                        },
-                                                        _1: "but is here used with type"
-                                                      });
-                                                }));
-                                          if (param$1._3) {
-                                            return Curry._2(Stdlib__Format.fprintf(param)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* Char_literal */12,
-                                                              _0: /* '.' */46,
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: /* Flush_newline */4,
-                                                                _1: {
-                                                                  TAG: /* Formatting_gen */18,
-                                                                  _0: {
-                                                                    TAG: /* Open_box */1,
-                                                                    _0: {
-                                                                      TAG: /* Format */0,
-                                                                      _0: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: "<hov>",
-                                                                        _1: /* End_of_format */0
-                                                                      },
-                                                                      _1: "<hov>"
-                                                                    }
-                                                                  },
-                                                                  _1: {
-                                                                    TAG: /* String */2,
-                                                                    _0: /* No_padding */0,
-                                                                    _1: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: {
-                                                                        TAG: /* Break */0,
-                                                                        _0: "@ ",
-                                                                        _1: 1,
-                                                                        _2: 0
-                                                                      },
-                                                                      _1: {
-                                                                        TAG: /* String */2,
-                                                                        _0: /* No_padding */0,
-                                                                        _1: {
-                                                                          TAG: /* Formatting_lit */17,
-                                                                          _0: /* Close_box */0,
-                                                                          _1: /* End_of_format */0
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            },
-                                                            _1: ".@.@[<hov>%s@ %s@]"
-                                                          }), "This simple coercion was not fully general.", "Consider using a double coercion.");
-                                          } else {
-                                            return ;
-                                          }
-                                      case /* Too_many_arguments */26 :
-                                          const ty$4 = param$1._1;
-                                          reset(undefined);
-                                          mark_loops(ty$4);
-                                          if (param$1._0) {
-                                            Stdlib__Format.fprintf(param)({
-                                                  TAG: /* Format */0,
+                                                      }
+                                                    }
+                                                  },
+                                                  _1: "@[%t@;<1 2>%a@ %t@;<1 2>%a@]"
+                                                }), txt1, (function (param, param$1) {
+                                                return type_path_expansion(tp, param, param$1);
+                                              }), match[1], txt3, (function (param, param$1) {
+                                                return type_path_expansion(tp0, param, param$1);
+                                              }), tp0$p);
+                                      }
+                                      throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                                            MEL_EXN_ID: "Assert_failure",
+                                            _1: [
+                                              "jscomp/test/ocaml_typedtree_test.ml",
+                                              37069,
+                                              12
+                                            ]
+                                          });
+                                    }));
+                          case /* Invalid_format */15 :
+                              return Curry._1(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String */2,
+                                          _0: /* No_padding */0,
+                                          _1: /* End_of_format */0
+                                        },
+                                        _1: "%s"
+                                      }), param$1._0);
+                          case /* Undefined_method */16 :
+                              const ty$2 = param$1._0;
+                              reset(undefined);
+                              mark_loops(ty$2);
+                              return Curry._3(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: "<v>",
+                                                _1: /* End_of_format */0
+                                              },
+                                              _1: "<v>"
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* Formatting_gen */18,
+                                            _0: {
+                                              TAG: /* Open_box */1,
+                                              _0: {
+                                                TAG: /* Format */0,
+                                                _0: /* End_of_format */0,
+                                                _1: ""
+                                              }
+                                            },
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: "This expression has type",
+                                              _1: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: {
+                                                  TAG: /* Break */0,
+                                                  _0: "@;<1 2>",
+                                                  _1: 1,
+                                                  _2: 2
+                                                },
+                                                _1: {
+                                                  TAG: /* Alpha */15,
                                                   _0: {
-                                                    TAG: /* String_literal */11,
-                                                    _0: "This function expects too many arguments,",
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: /* Close_box */0,
                                                     _1: {
                                                       TAG: /* Formatting_lit */17,
                                                       _0: {
                                                         TAG: /* Break */0,
-                                                        _0: "@ ",
-                                                        _1: 1,
+                                                        _0: "@,",
+                                                        _1: 0,
                                                         _2: 0
                                                       },
-                                                      _1: /* End_of_format */0
+                                                      _1: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: "It has no method ",
+                                                        _1: {
+                                                          TAG: /* String */2,
+                                                          _0: /* No_padding */0,
+                                                          _1: {
+                                                            TAG: /* Formatting_lit */17,
+                                                            _0: /* Close_box */0,
+                                                            _1: /* End_of_format */0
+                                                          }
+                                                        }
+                                                      }
                                                     }
-                                                  },
-                                                  _1: "This function expects too many arguments,@ "
-                                                });
-                                            return Curry._2(Stdlib__Format.fprintf(param)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "it should have type",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Alpha */15,
-                                                                  _0: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            },
-                                                            _1: "it should have type@ %a"
-                                                          }), type_expr$1, ty$4);
-                                          } else {
-                                            Stdlib__Format.fprintf(param)({
-                                                  TAG: /* Format */0,
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[<v>@[This expression has type@;<1 2>%a@]@,It has no method %s@]"
+                                      }), type_expr$1, ty$2, param$1._1);
+                          case /* Undefined_inherited_method */17 :
+                              return Curry._1(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "This expression has no method ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: /* End_of_format */0
+                                          }
+                                        },
+                                        _1: "This expression has no method %s"
+                                      }), param$1._0);
+                          case /* Virtual_class */18 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "Cannot instantiate the virtual class ",
+                                          _1: {
+                                            TAG: /* Alpha */15,
+                                            _0: /* End_of_format */0
+                                          }
+                                        },
+                                        _1: "Cannot instantiate the virtual class %a"
+                                      }), longident, param$1._0);
+                          case /* Private_type */19 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "Cannot create values of the private type ",
+                                          _1: {
+                                            TAG: /* Alpha */15,
+                                            _0: /* End_of_format */0
+                                          }
+                                        },
+                                        _1: "Cannot create values of the private type %a"
+                                      }), type_expr$1, param$1._0);
+                          case /* Private_label */20 :
+                              return Curry._4(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "Cannot assign field ",
+                                          _1: {
+                                            TAG: /* Alpha */15,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: " of the private type ",
+                                              _1: {
+                                                TAG: /* Alpha */15,
+                                                _0: /* End_of_format */0
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "Cannot assign field %a of the private type %a"
+                                      }), longident, param$1._0, type_expr$1, param$1._1);
+                          case /* Unbound_instance_variable */21 :
+                              return Curry._1(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "Unbound instance variable ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: /* End_of_format */0
+                                          }
+                                        },
+                                        _1: "Unbound instance variable %s"
+                                      }), param$1._0);
+                          case /* Instance_variable_not_mutable */22 :
+                              const v = param$1._1;
+                              if (param$1._0) {
+                                return Curry._1(Stdlib__Format.fprintf(param)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "The instance variable ",
+                                            _1: {
+                                              TAG: /* String */2,
+                                              _0: /* No_padding */0,
+                                              _1: {
+                                                TAG: /* String_literal */11,
+                                                _0: " is not mutable",
+                                                _1: /* End_of_format */0
+                                              }
+                                            }
+                                          },
+                                          _1: "The instance variable %s is not mutable"
+                                        }), v);
+                              } else {
+                                return Curry._1(Stdlib__Format.fprintf(param)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "The value ",
+                                            _1: {
+                                              TAG: /* String */2,
+                                              _0: /* No_padding */0,
+                                              _1: {
+                                                TAG: /* String_literal */11,
+                                                _0: " is not an instance variable",
+                                                _1: /* End_of_format */0
+                                              }
+                                            }
+                                          },
+                                          _1: "The value %s is not an instance variable"
+                                        }), v);
+                              }
+                          case /* Not_subtype */23 :
+                              let tr1 = param$1._0;
+                              let txt1$1 = "is not a subtype of";
+                              let tr2 = param$1._1;
+                              return wrap_printing_env(env, (function (param$4) {
+                                      reset(undefined);
+                                      const tr1$1 = Stdlib__List.map(prepare_expansion, tr1);
+                                      const tr2$1 = Stdlib__List.map(prepare_expansion, tr2);
+                                      const partial_arg = Caml_obj.caml_equal(tr2$1, /* [] */0);
+                                      Curry._2(Stdlib__Format.fprintf(param)({
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* Formatting_gen */18,
                                                   _0: {
-                                                    TAG: /* String_literal */11,
-                                                    _0: "This expression should not be a function,",
-                                                    _1: {
-                                                      TAG: /* Formatting_lit */17,
+                                                    TAG: /* Open_box */1,
+                                                    _0: {
+                                                      TAG: /* Format */0,
                                                       _0: {
-                                                        TAG: /* Break */0,
-                                                        _0: "@ ",
-                                                        _1: 1,
-                                                        _2: 0
+                                                        TAG: /* String_literal */11,
+                                                        _0: "<v>",
+                                                        _1: /* End_of_format */0
                                                       },
-                                                      _1: /* End_of_format */0
+                                                      _1: "<v>"
                                                     }
                                                   },
-                                                  _1: "This expression should not be a function,@ "
-                                                });
-                                            return Curry._2(Stdlib__Format.fprintf(param)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "the expected type is",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Alpha */15,
-                                                                  _0: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            },
-                                                            _1: "the expected type is@ %a"
-                                                          }), type_expr$1, ty$4);
-                                          }
-                                      case /* Abstract_wrong_label */27 :
-                                          const ty$5 = param$1._1;
-                                          const label_mark = function (l) {
-                                            if (l === "") {
-                                              return "but its first argument is not labelled";
-                                            } else {
-                                              return Curry._1(Stdlib__Format.sprintf({
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "but its first argument is labelled ",
-                                                                _1: {
-                                                                  TAG: /* String */2,
-                                                                  _0: /* No_padding */0,
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              },
-                                                              _1: "but its first argument is labelled %s"
-                                                            }), prefixed_label_name(l));
+                                                  _1: {
+                                                    TAG: /* Alpha */15,
+                                                    _0: /* End_of_format */0
+                                                  }
+                                                },
+                                                _1: "@[<v>%a"
+                                              }), (function (param, param$1) {
+                                              return trace$1(true, partial_arg, txt1$1, param, param$1);
+                                            }), tr1$1);
+                                      if (Caml_obj.caml_equal(tr2$1, /* [] */0)) {
+                                        return Stdlib__Format.fprintf(param)({
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: /* Close_box */0,
+                                                _1: /* End_of_format */0
+                                              },
+                                              _1: "@]"
+                                            });
+                                      }
+                                      const mis = mismatch(true, tr2$1);
+                                      const partial_arg$1 = mis === undefined;
+                                      Curry._3(Stdlib__Format.fprintf(param)({
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* Alpha */15,
+                                                  _0: {
+                                                    TAG: /* Theta */16,
+                                                    _0: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: /* Close_box */0,
+                                                      _1: /* End_of_format */0
+                                                    }
+                                                  }
+                                                },
+                                                _1: "%a%t@]"
+                                              }), (function (param, param$1) {
+                                              return trace$1(false, partial_arg$1, "is not compatible with type", param, param$1);
+                                            }), tr2$1, (function (param) {
+                                              return explanation(true, mis, param);
+                                            }));
+                                    }));
+                          case /* Value_multiply_overridden */24 :
+                              return Curry._1(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The instance variable ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: " is overridden several times",
+                                              _1: /* End_of_format */0
                                             }
-                                          };
-                                          reset(undefined);
-                                          mark_loops(ty$5);
-                                          return Curry._3(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "<v>",
-                                                                  _1: /* End_of_format */0
-                                                                },
-                                                                _1: "<v>"
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* Formatting_gen */18,
-                                                              _0: {
-                                                                TAG: /* Open_box */1,
-                                                                _0: {
-                                                                  TAG: /* Format */0,
-                                                                  _0: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: "<2>",
-                                                                    _1: /* End_of_format */0
-                                                                  },
-                                                                  _1: "<2>"
-                                                                }
-                                                              },
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "This function should have type",
-                                                                _1: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: {
-                                                                    TAG: /* Break */0,
-                                                                    _0: "@ ",
-                                                                    _1: 1,
-                                                                    _2: 0
-                                                                  },
-                                                                  _1: {
-                                                                    TAG: /* Alpha */15,
-                                                                    _0: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: /* Close_box */0,
-                                                                      _1: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: {
-                                                                          TAG: /* Break */0,
-                                                                          _0: "@,",
-                                                                          _1: 0,
-                                                                          _2: 0
-                                                                        },
-                                                                        _1: {
-                                                                          TAG: /* String */2,
-                                                                          _0: /* No_padding */0,
-                                                                          _1: {
-                                                                            TAG: /* Formatting_lit */17,
-                                                                            _0: /* Close_box */0,
-                                                                            _1: /* End_of_format */0
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[<v>@[<2>This function should have type@ %a@]@,%s@]"
-                                                        }), type_expr$1, ty$5, label_mark(param$1._0));
-                                      case /* Scoping_let_module */28 :
-                                          const ty$6 = param$1._1;
-                                          reset(undefined);
-                                          mark_loops(ty$6);
-                                          Curry._2(Stdlib__Format.fprintf(param)({
-                                                    TAG: /* Format */0,
+                                          }
+                                        },
+                                        _1: "The instance variable %s is overridden several times"
+                                      }), param$1._0);
+                          case /* Coercion_failure */25 :
+                              const ty$p = param$1._1;
+                              const ty$3 = param$1._0;
+                              report_unification_error(param, env, undefined, param$1._2, (function (ppf) {
+                                      const match = prepare_expansion([
+                                            ty$3,
+                                            ty$p
+                                          ]);
+                                      const ty$4 = match[0];
+                                      Curry._2(Stdlib__Format.fprintf(ppf)({
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "This expression cannot be coerced to type",
+                                                  _1: {
+                                                    TAG: /* Formatting_lit */17,
                                                     _0: {
-                                                      TAG: /* String_literal */11,
-                                                      _0: "This `let module' expression has type",
-                                                      _1: {
-                                                        TAG: /* Formatting_lit */17,
-                                                        _0: {
-                                                          TAG: /* Break */0,
-                                                          _0: "@ ",
-                                                          _1: 1,
-                                                          _2: 0
-                                                        },
+                                                      TAG: /* Break */0,
+                                                      _0: "@;<1 2>",
+                                                      _1: 1,
+                                                      _2: 2
+                                                    },
+                                                    _1: {
+                                                      TAG: /* Alpha */15,
+                                                      _0: {
+                                                        TAG: /* Char_literal */12,
+                                                        _0: /* ';' */59,
                                                         _1: {
-                                                          TAG: /* Alpha */15,
+                                                          TAG: /* Formatting_lit */17,
                                                           _0: {
-                                                            TAG: /* Formatting_lit */17,
-                                                            _0: {
-                                                              TAG: /* Break */0,
-                                                              _0: "@ ",
-                                                              _1: 1,
-                                                              _2: 0
-                                                            },
+                                                            TAG: /* Break */0,
+                                                            _0: "@ ",
+                                                            _1: 1,
+                                                            _2: 0
+                                                          },
+                                                          _1: {
+                                                            TAG: /* String_literal */11,
+                                                            _0: "it has type",
                                                             _1: /* End_of_format */0
                                                           }
                                                         }
                                                       }
+                                                    }
+                                                  }
+                                                },
+                                                _1: "This expression cannot be coerced to type@;<1 2>%a;@ it has type"
+                                              }), (function (param, param$1) {
+                                              return type_expansion(ty$4, param, param$1);
+                                            }), match[1]);
+                                    }), (function (ppf) {
+                                      Stdlib__Format.fprintf(ppf)({
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: "but is here used with type",
+                                              _1: /* End_of_format */0
+                                            },
+                                            _1: "but is here used with type"
+                                          });
+                                    }));
+                              if (param$1._3) {
+                                return Curry._2(Stdlib__Format.fprintf(param)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* Char_literal */12,
+                                            _0: /* '.' */46,
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: /* Flush_newline */4,
+                                              _1: {
+                                                TAG: /* Formatting_gen */18,
+                                                _0: {
+                                                  TAG: /* Open_box */1,
+                                                  _0: {
+                                                    TAG: /* Format */0,
+                                                    _0: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: "<hov>",
+                                                      _1: /* End_of_format */0
                                                     },
-                                                    _1: "This `let module' expression has type@ %a@ "
-                                                  }), type_expr$1, ty$6);
-                                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "In this type, the locally bound module name ",
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " escapes its scope",
-                                                                _1: /* End_of_format */0
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "In this type, the locally bound module name %s escapes its scope"
-                                                        }), param$1._0);
-                                      case /* Masked_instance_variable */29 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The instance variable ",
-                                                            _1: {
-                                                              TAG: /* Alpha */15,
-                                                              _0: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "cannot be accessed from the definition of another instance variable",
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "The instance variable %a@ cannot be accessed from the definition of another instance variable"
-                                                        }), longident, param$1._0);
-                                      case /* Not_a_variant_type */30 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The type ",
-                                                            _1: {
-                                                              TAG: /* Alpha */15,
-                                                              _0: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "is not a variant type",
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "The type %a@ is not a variant type"
-                                                        }), longident, param$1._0);
-                                      case /* Less_general */31 :
-                                          const kind$2 = param$1._0;
-                                          return report_unification_error(param, env, undefined, param$1._1, (function (ppf) {
-                                                        Curry._1(Stdlib__Format.fprintf(ppf)({
-                                                                  TAG: /* Format */0,
-                                                                  _0: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: "This ",
-                                                                    _1: {
-                                                                      TAG: /* String */2,
-                                                                      _0: /* No_padding */0,
-                                                                      _1: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: " has type",
-                                                                        _1: /* End_of_format */0
-                                                                      }
-                                                                    }
-                                                                  },
-                                                                  _1: "This %s has type"
-                                                                }), kind$2);
-                                                      }), (function (ppf) {
-                                                        Stdlib__Format.fprintf(ppf)({
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "which is less general than",
-                                                                _1: /* End_of_format */0
-                                                              },
-                                                              _1: "which is less general than"
-                                                            });
-                                                      }));
-                                      case /* Not_a_packed_module */32 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "This expression is packed module, but the expected type is",
-                                                            _1: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: /* End_of_format */0
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "This expression is packed module, but the expected type is@ %a"
-                                                        }), type_expr$1, param$1._0);
-                                      case /* Recursive_local_constraint */33 :
-                                          return report_unification_error(param, env, undefined, param$1._0, (function (ppf) {
-                                                        Stdlib__Format.fprintf(ppf)({
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "Recursive local constraint when unifying",
-                                                                _1: /* End_of_format */0
-                                                              },
-                                                              _1: "Recursive local constraint when unifying"
-                                                            });
-                                                      }), (function (ppf) {
-                                                        Stdlib__Format.fprintf(ppf)({
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "with",
-                                                                _1: /* End_of_format */0
-                                                              },
-                                                              _1: "with"
-                                                            });
-                                                      }));
-                                      case /* Unqualified_gadt_pattern */34 :
-                                          return Curry._4(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "The GADT constructor ",
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: " of type ",
-                                                                  _1: {
-                                                                    TAG: /* Alpha */15,
-                                                                    _0: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: {
-                                                                        TAG: /* Break */0,
-                                                                        _0: "@ ",
-                                                                        _1: 1,
-                                                                        _2: 0
-                                                                      },
-                                                                      _1: {
-                                                                        TAG: /* String */2,
-                                                                        _0: /* No_padding */0,
-                                                                        _1: {
-                                                                          TAG: /* Char_literal */12,
-                                                                          _0: /* '.' */46,
-                                                                          _1: {
-                                                                            TAG: /* Formatting_lit */17,
-                                                                            _0: /* Close_box */0,
-                                                                            _1: /* End_of_format */0
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[The GADT constructor %s of type %a@ %s.@]"
-                                                        }), param$1._1, path, param$1._0, "must be qualified in this pattern");
-                                      
-                                    }
-                                  }
-                                }));
-                  }), err._3);
+                                                    _1: "<hov>"
+                                                  }
+                                                },
+                                                _1: {
+                                                  TAG: /* String */2,
+                                                  _0: /* No_padding */0,
+                                                  _1: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: {
+                                                      TAG: /* Break */0,
+                                                      _0: "@ ",
+                                                      _1: 1,
+                                                      _2: 0
+                                                    },
+                                                    _1: {
+                                                      TAG: /* String */2,
+                                                      _0: /* No_padding */0,
+                                                      _1: {
+                                                        TAG: /* Formatting_lit */17,
+                                                        _0: /* Close_box */0,
+                                                        _1: /* End_of_format */0
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          },
+                                          _1: ".@.@[<hov>%s@ %s@]"
+                                        }), "This simple coercion was not fully general.", "Consider using a double coercion.");
+                              } else {
+                                return ;
+                              }
+                          case /* Too_many_arguments */26 :
+                              const ty$4 = param$1._1;
+                              reset(undefined);
+                              mark_loops(ty$4);
+                              if (param$1._0) {
+                                Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* String_literal */11,
+                                        _0: "This function expects too many arguments,",
+                                        _1: {
+                                          TAG: /* Formatting_lit */17,
+                                          _0: {
+                                            TAG: /* Break */0,
+                                            _0: "@ ",
+                                            _1: 1,
+                                            _2: 0
+                                          },
+                                          _1: /* End_of_format */0
+                                        }
+                                      },
+                                      _1: "This function expects too many arguments,@ "
+                                    });
+                                return Curry._2(Stdlib__Format.fprintf(param)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "it should have type",
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* Alpha */15,
+                                                _0: /* End_of_format */0
+                                              }
+                                            }
+                                          },
+                                          _1: "it should have type@ %a"
+                                        }), type_expr$1, ty$4);
+                              } else {
+                                Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* String_literal */11,
+                                        _0: "This expression should not be a function,",
+                                        _1: {
+                                          TAG: /* Formatting_lit */17,
+                                          _0: {
+                                            TAG: /* Break */0,
+                                            _0: "@ ",
+                                            _1: 1,
+                                            _2: 0
+                                          },
+                                          _1: /* End_of_format */0
+                                        }
+                                      },
+                                      _1: "This expression should not be a function,@ "
+                                    });
+                                return Curry._2(Stdlib__Format.fprintf(param)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "the expected type is",
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* Alpha */15,
+                                                _0: /* End_of_format */0
+                                              }
+                                            }
+                                          },
+                                          _1: "the expected type is@ %a"
+                                        }), type_expr$1, ty$4);
+                              }
+                          case /* Abstract_wrong_label */27 :
+                              const ty$5 = param$1._1;
+                              const label_mark = function (l) {
+                                if (l === "") {
+                                  return "but its first argument is not labelled";
+                                } else {
+                                  return Curry._1(Stdlib__Format.sprintf({
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: "but its first argument is labelled ",
+                                              _1: {
+                                                TAG: /* String */2,
+                                                _0: /* No_padding */0,
+                                                _1: /* End_of_format */0
+                                              }
+                                            },
+                                            _1: "but its first argument is labelled %s"
+                                          }), prefixed_label_name(l));
+                                }
+                              };
+                              reset(undefined);
+                              mark_loops(ty$5);
+                              return Curry._3(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: "<v>",
+                                                _1: /* End_of_format */0
+                                              },
+                                              _1: "<v>"
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* Formatting_gen */18,
+                                            _0: {
+                                              TAG: /* Open_box */1,
+                                              _0: {
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "<2>",
+                                                  _1: /* End_of_format */0
+                                                },
+                                                _1: "<2>"
+                                              }
+                                            },
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: "This function should have type",
+                                              _1: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: {
+                                                  TAG: /* Break */0,
+                                                  _0: "@ ",
+                                                  _1: 1,
+                                                  _2: 0
+                                                },
+                                                _1: {
+                                                  TAG: /* Alpha */15,
+                                                  _0: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: /* Close_box */0,
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: {
+                                                        TAG: /* Break */0,
+                                                        _0: "@,",
+                                                        _1: 0,
+                                                        _2: 0
+                                                      },
+                                                      _1: {
+                                                        TAG: /* String */2,
+                                                        _0: /* No_padding */0,
+                                                        _1: {
+                                                          TAG: /* Formatting_lit */17,
+                                                          _0: /* Close_box */0,
+                                                          _1: /* End_of_format */0
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[<v>@[<2>This function should have type@ %a@]@,%s@]"
+                                      }), type_expr$1, ty$5, label_mark(param$1._0));
+                          case /* Scoping_let_module */28 :
+                              const ty$6 = param$1._1;
+                              reset(undefined);
+                              mark_loops(ty$6);
+                              Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "This `let module' expression has type",
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: {
+                                                  TAG: /* Break */0,
+                                                  _0: "@ ",
+                                                  _1: 1,
+                                                  _2: 0
+                                                },
+                                                _1: /* End_of_format */0
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "This `let module' expression has type@ %a@ "
+                                      }), type_expr$1, ty$6);
+                              return Curry._1(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "In this type, the locally bound module name ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: " escapes its scope",
+                                              _1: /* End_of_format */0
+                                            }
+                                          }
+                                        },
+                                        _1: "In this type, the locally bound module name %s escapes its scope"
+                                      }), param$1._0);
+                          case /* Masked_instance_variable */29 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The instance variable ",
+                                          _1: {
+                                            TAG: /* Alpha */15,
+                                            _0: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* String_literal */11,
+                                                _0: "cannot be accessed from the definition of another instance variable",
+                                                _1: /* End_of_format */0
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "The instance variable %a@ cannot be accessed from the definition of another instance variable"
+                                      }), longident, param$1._0);
+                          case /* Not_a_variant_type */30 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The type ",
+                                          _1: {
+                                            TAG: /* Alpha */15,
+                                            _0: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* String_literal */11,
+                                                _0: "is not a variant type",
+                                                _1: /* End_of_format */0
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "The type %a@ is not a variant type"
+                                      }), longident, param$1._0);
+                          case /* Less_general */31 :
+                              const kind$2 = param$1._0;
+                              return report_unification_error(param, env, undefined, param$1._1, (function (ppf) {
+                                      Curry._1(Stdlib__Format.fprintf(ppf)({
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "This ",
+                                                  _1: {
+                                                    TAG: /* String */2,
+                                                    _0: /* No_padding */0,
+                                                    _1: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: " has type",
+                                                      _1: /* End_of_format */0
+                                                    }
+                                                  }
+                                                },
+                                                _1: "This %s has type"
+                                              }), kind$2);
+                                    }), (function (ppf) {
+                                      Stdlib__Format.fprintf(ppf)({
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: "which is less general than",
+                                              _1: /* End_of_format */0
+                                            },
+                                            _1: "which is less general than"
+                                          });
+                                    }));
+                          case /* Not_a_packed_module */32 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "This expression is packed module, but the expected type is",
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: /* End_of_format */0
+                                            }
+                                          }
+                                        },
+                                        _1: "This expression is packed module, but the expected type is@ %a"
+                                      }), type_expr$1, param$1._0);
+                          case /* Recursive_local_constraint */33 :
+                              return report_unification_error(param, env, undefined, param$1._0, (function (ppf) {
+                                      Stdlib__Format.fprintf(ppf)({
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: "Recursive local constraint when unifying",
+                                              _1: /* End_of_format */0
+                                            },
+                                            _1: "Recursive local constraint when unifying"
+                                          });
+                                    }), (function (ppf) {
+                                      Stdlib__Format.fprintf(ppf)({
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: "with",
+                                              _1: /* End_of_format */0
+                                            },
+                                            _1: "with"
+                                          });
+                                    }));
+                          case /* Unqualified_gadt_pattern */34 :
+                              return Curry._4(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "The GADT constructor ",
+                                            _1: {
+                                              TAG: /* String */2,
+                                              _0: /* No_padding */0,
+                                              _1: {
+                                                TAG: /* String_literal */11,
+                                                _0: " of type ",
+                                                _1: {
+                                                  TAG: /* Alpha */15,
+                                                  _0: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: {
+                                                      TAG: /* Break */0,
+                                                      _0: "@ ",
+                                                      _1: 1,
+                                                      _2: 0
+                                                    },
+                                                    _1: {
+                                                      TAG: /* String */2,
+                                                      _0: /* No_padding */0,
+                                                      _1: {
+                                                        TAG: /* Char_literal */12,
+                                                        _0: /* '.' */46,
+                                                        _1: {
+                                                          TAG: /* Formatting_lit */17,
+                                                          _0: /* Close_box */0,
+                                                          _1: /* End_of_format */0
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[The GADT constructor %s of type %a@ %s.@]"
+                                      }), param$1._1, path, param$1._0, "must be qualified in this pattern");
+                          
+                        }
+                      }
+                    }));
+            }), err._3);
     });
 
 add_delayed_check_forward.contents = add_delayed_check;
@@ -72786,9 +72786,9 @@ function enter_type$1(env, sdecl, id) {
   const match = sdecl.ptype_manifest;
   const decl_type_params = Stdlib__List.map((function (param) {
           return newty2(100000000, {
-                      TAG: /* Tvar */0,
-                      _0: undefined
-                    });
+                TAG: /* Tvar */0,
+                _0: undefined
+              });
         }), sdecl.ptype_params);
   const decl_type_arity = Stdlib__List.length(sdecl.ptype_params);
   const decl_type_private = sdecl.ptype_private;
@@ -72856,25 +72856,25 @@ function set_fixed_row(env, loc, p, decl) {
     tm = expand_head(env, t);
   } else {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                46327,
-                14
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            46327,
+            14
+          ]
+        });
   }
   const row = tm.desc;
   let rv;
   if (/* tag */typeof row === "number" || typeof row === "string") {
     throw new Caml_js_exceptions.MelangeError($$Error$8, {
-              MEL_EXN_ID: $$Error$8,
-              _1: loc,
-              _2: {
-                TAG: /* Bad_fixed_type */18,
-                _0: "is not an object or variant"
-              }
-            });
+          MEL_EXN_ID: $$Error$8,
+          _1: loc,
+          _2: {
+            TAG: /* Bad_fixed_type */18,
+            _0: "is not an object or variant"
+          }
+        });
   }
   switch (row.TAG) {
     case /* Tobject */4 :
@@ -72897,23 +72897,23 @@ function set_fixed_row(env, loc, p, decl) {
         break;
     default:
       throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                MEL_EXN_ID: $$Error$8,
-                _1: loc,
-                _2: {
-                  TAG: /* Bad_fixed_type */18,
-                  _0: "is not an object or variant"
-                }
-              });
+            MEL_EXN_ID: $$Error$8,
+            _1: loc,
+            _2: {
+              TAG: /* Bad_fixed_type */18,
+              _0: "is not an object or variant"
+            }
+          });
   }
   if (!is_Tvar(rv)) {
     throw new Caml_js_exceptions.MelangeError($$Error$8, {
-              MEL_EXN_ID: $$Error$8,
-              _1: loc,
-              _2: {
-                TAG: /* Bad_fixed_type */18,
-                _0: "has no row variable"
-              }
-            });
+          MEL_EXN_ID: $$Error$8,
+          _1: loc,
+          _2: {
+            TAG: /* Bad_fixed_type */18,
+            _0: "has no row variable"
+          }
+        });
   }
   rv.desc = {
     TAG: /* Tconstr */3,
@@ -72945,12 +72945,12 @@ function create$11(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r.h;
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$10(l, v, r) {
@@ -72961,9 +72961,9 @@ function bal$10(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const lr = l.r;
     const lv = l.v;
@@ -72975,24 +72975,24 @@ function bal$10(l, v, r) {
       return create$11(create$11(ll, lv, lr.l), lr.v, create$11(lr.r, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   const rr = r.r;
   const rv = r.v;
@@ -73004,20 +73004,20 @@ function bal$10(l, v, r) {
     return create$11(create$11(l, v, rl.l), rl.v, create$11(rl.r, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Set.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Set.bal"
+      });
 }
 
 function add$12(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = t.r;
   const v = t.v;
@@ -73062,18 +73062,18 @@ function make_params(env, params) {
     const sty = param[0];
     try {
       return [
-              transl_type_param(env, sty),
-              param[1]
-            ];
+        transl_type_param(env, sty),
+        param[1]
+      ];
     }
     catch (raw_exn){
       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
       if (exn.MEL_EXN_ID === Already_bound) {
         throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                  MEL_EXN_ID: $$Error$8,
-                  _1: sty.ptyp_loc,
-                  _2: /* Repeated_parameter */0
-                });
+              MEL_EXN_ID: $$Error$8,
+              _1: sty.ptyp_loc,
+              _2: /* Repeated_parameter */0
+            });
       }
       throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
     }
@@ -73100,22 +73100,22 @@ function make_constructor(env, type_path, type_params, sargs, sret_type) {
     }
     if (exit === 1) {
       throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                MEL_EXN_ID: $$Error$8,
-                _1: sret_type.ptyp_loc,
-                _2: {
-                  TAG: /* Constraint_failed */5,
-                  _0: ret_type,
-                  _1: newconstr(type_path, type_params)
-                }
-              });
+            MEL_EXN_ID: $$Error$8,
+            _1: sret_type.ptyp_loc,
+            _2: {
+              TAG: /* Constraint_failed */5,
+              _0: ret_type,
+              _1: newconstr(type_path, type_params)
+            }
+          });
     }
     widen(z);
     return [
-            targs,
-            tret_type,
-            args,
-            ret_type
-          ];
+      targs,
+      tret_type,
+      args,
+      ret_type
+    ];
   }
   const targs$1 = Stdlib__List.map((function (param) {
           return transl_simple_type(env, true, param);
@@ -73124,11 +73124,11 @@ function make_constructor(env, type_path, type_params, sargs, sret_type) {
           return cty.ctyp_type;
         }), targs$1);
   return [
-          targs$1,
-          undefined,
-          args$1,
-          undefined
-        ];
+    targs$1,
+    undefined,
+    args$1,
+    undefined
+  ];
 }
 
 function generalize_decl(decl) {
@@ -73151,8 +73151,8 @@ function generalize_decl(decl) {
   const ty = decl.type_manifest;
   if (ty !== undefined) {
     return iter_generalize$1({
-                contents: /* [] */0
-              }, ty);
+          contents: /* [] */0
+        }, ty);
   }
   
 }
@@ -73168,8 +73168,8 @@ function check_constraints_rec(env, loc, visited, _ty) {
     const match = ty$1.desc;
     if (/* tag */typeof match === "number" || typeof match === "string") {
       return iter_type_expr((function (param) {
-                    return check_constraints_rec(env, loc, visited, param);
-                  }), ty$1);
+              return check_constraints_rec(env, loc, visited, param);
+            }), ty$1);
     }
     switch (match.TAG) {
       case /* Tconstr */3 :
@@ -73186,48 +73186,48 @@ function check_constraints_rec(env, loc, visited, _ty) {
             const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn.MEL_EXN_ID === Unify) {
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          46574,
-                          28
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/ocaml_typedtree_test.ml",
+                      46574,
+                      28
+                    ]
+                  });
             }
             if (exn.MEL_EXN_ID === Stdlib.Not_found) {
               throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                        MEL_EXN_ID: $$Error$8,
-                        _1: loc,
-                        _2: {
-                          TAG: /* Unavailable_type_constructor */17,
-                          _0: path
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$8,
+                    _1: loc,
+                    _2: {
+                      TAG: /* Unavailable_type_constructor */17,
+                      _0: path
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
           }
           if (!matches(env, ty$1, ty$p)) {
             throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                      MEL_EXN_ID: $$Error$8,
-                      _1: loc,
-                      _2: {
-                        TAG: /* Constraint_failed */5,
-                        _0: ty$1,
-                        _1: ty$p
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$8,
+                  _1: loc,
+                  _2: {
+                    TAG: /* Constraint_failed */5,
+                    _0: ty$1,
+                    _1: ty$p
+                  }
+                });
           }
           return Stdlib__List.iter((function (param) {
-                        return check_constraints_rec(env, loc, visited, param);
-                      }), args);
+                  return check_constraints_rec(env, loc, visited, param);
+                }), args);
       case /* Tpoly */10 :
           const match$1 = instance_poly(undefined, false, match._1, match._0);
           _ty = match$1[1];
           continue ;
       default:
         return iter_type_expr((function (param) {
-                      return check_constraints_rec(env, loc, visited, param);
-                    }), ty$1);
+                return check_constraints_rec(env, loc, visited, param);
+              }), ty$1);
     }
   };
 }
@@ -73248,13 +73248,13 @@ function create$12(l, x, d, r) {
   const hl = height$11(l);
   const hr = height$11(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$11(l, x, d, r) {
@@ -73265,10 +73265,10 @@ function bal$11(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
-    }
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
+    }
     const lr = l.r;
     const ld = l.d;
     const lv = l.v;
@@ -73280,25 +73280,25 @@ function bal$11(l, x, d, r) {
       return create$12(create$12(ll, lv, ld, lr.l), lr.v, lr.d, create$12(lr.r, x, d, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -73311,21 +73311,21 @@ function bal$11(l, x, d, r) {
     return create$12(create$12(l, x, d, rl.l), rl.v, rl.d, create$12(rl.r, rv, rd, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add$13(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -73337,13 +73337,13 @@ function add$13(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -73367,8 +73367,8 @@ function find$6(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg$6.compare, x, param.v);
     if (c === 0) {
@@ -73391,14 +73391,14 @@ function check_coherence(env, loc, id, decl) {
   const match = repr(ty).desc;
   if (/* tag */typeof match === "number" || typeof match === "string") {
     throw new Caml_js_exceptions.MelangeError($$Error$8, {
-              MEL_EXN_ID: $$Error$8,
-              _1: loc,
-              _2: {
-                TAG: /* Definition_mismatch */4,
-                _0: ty,
-                _1: /* [] */0
-              }
-            });
+          MEL_EXN_ID: $$Error$8,
+          _1: loc,
+          _2: {
+            TAG: /* Definition_mismatch */4,
+            _0: ty,
+            _1: /* [] */0
+          }
+        });
   }
   if (match.TAG === /* Tconstr */3) {
     const args = match._1;
@@ -73406,51 +73406,51 @@ function check_coherence(env, loc, id, decl) {
     try {
       const decl$p = find_type_full(path, env)[0];
       const err = Stdlib__List.length(args) !== Stdlib__List.length(decl.type_params) ? ({
-            hd: /* Arity */0,
-            tl: /* [] */0
-          }) : (
+          hd: /* Arity */0,
+          tl: /* [] */0
+        }) : (
           equal$5(env, false, args, decl.type_params) ? type_declarations$1(true, env, last(path), decl$p, id, type_declaration(add_type(id, path, identity), decl)) : ({
-                hd: /* Constraint */3,
-                tl: /* [] */0
-              })
+              hd: /* Constraint */3,
+              tl: /* [] */0
+            })
         );
       if (!Caml_obj.caml_notequal(err, /* [] */0)) {
         return ;
       }
       throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                MEL_EXN_ID: $$Error$8,
-                _1: loc,
-                _2: {
-                  TAG: /* Definition_mismatch */4,
-                  _0: ty,
-                  _1: err
-                }
-              });
+            MEL_EXN_ID: $$Error$8,
+            _1: loc,
+            _2: {
+              TAG: /* Definition_mismatch */4,
+              _0: ty,
+              _1: err
+            }
+          });
     }
     catch (raw_exn){
       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
       if (exn.MEL_EXN_ID === Stdlib.Not_found) {
         throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                  MEL_EXN_ID: $$Error$8,
-                  _1: loc,
-                  _2: {
-                    TAG: /* Unavailable_type_constructor */17,
-                    _0: path
-                  }
-                });
-      }
-      throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
-    }
-  } else {
-    throw new Caml_js_exceptions.MelangeError($$Error$8, {
               MEL_EXN_ID: $$Error$8,
               _1: loc,
               _2: {
-                TAG: /* Definition_mismatch */4,
-                _0: ty,
-                _1: /* [] */0
+                TAG: /* Unavailable_type_constructor */17,
+                _0: path
               }
             });
+      }
+      throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
+    }
+  } else {
+    throw new Caml_js_exceptions.MelangeError($$Error$8, {
+          MEL_EXN_ID: $$Error$8,
+          _1: loc,
+          _2: {
+            TAG: /* Definition_mismatch */4,
+            _0: ty,
+            _1: /* [] */0
+          }
+        });
   }
 }
 
@@ -73466,23 +73466,23 @@ function check_well_founded(env, loc, path, to_check, ty) {
       tmp = /* tag */typeof match === "number" || typeof match === "string" || match.TAG !== /* Tconstr */3 ? false : same(match._0, path);
       if (tmp) {
         throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                  MEL_EXN_ID: $$Error$8,
-                  _1: loc,
-                  _2: {
-                    TAG: /* Recursive_abbrev */2,
-                    _0: name(undefined, path)
-                  }
-                });
+              MEL_EXN_ID: $$Error$8,
+              _1: loc,
+              _2: {
+                TAG: /* Recursive_abbrev */2,
+                _0: name(undefined, path)
+              }
+            });
       }
       throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                MEL_EXN_ID: $$Error$8,
-                _1: loc,
-                _2: {
-                  TAG: /* Cycle_in_def */3,
-                  _0: name(undefined, path),
-                  _1: ty0
-                }
-              });
+            MEL_EXN_ID: $$Error$8,
+            _1: loc,
+            _2: {
+              TAG: /* Cycle_in_def */3,
+              _0: name(undefined, path),
+              _1: ty0
+            }
+          });
     }
     let match$1;
     try {
@@ -73516,8 +73516,8 @@ function check_well_founded(env, loc, path, to_check, ty) {
       const match$2 = ty$1.desc;
       if (/* tag */typeof match$2 === "number" || typeof match$2 === "string") {
         throw new Caml_js_exceptions.MelangeError(Cannot_expand, {
-                  MEL_EXN_ID: Cannot_expand
-                });
+              MEL_EXN_ID: Cannot_expand
+            });
       }
       if (match$2.TAG === /* Tconstr */3) {
         if (!Curry._1(is_empty$2, exp_nodes$1) || Curry._1(to_check, match$2._0)) {
@@ -73526,12 +73526,12 @@ function check_well_founded(env, loc, path, to_check, ty) {
           return check(ty0$1, Curry._2(add$3, ty$1, exp_nodes$1), ty$p);
         }
         throw new Caml_js_exceptions.MelangeError(Cannot_expand, {
-                  MEL_EXN_ID: Cannot_expand
-                });
+              MEL_EXN_ID: Cannot_expand
+            });
       }
       throw new Caml_js_exceptions.MelangeError(Cannot_expand, {
-                MEL_EXN_ID: Cannot_expand
-              });
+            MEL_EXN_ID: Cannot_expand
+          });
     }
     catch (raw_exn$1){
       const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
@@ -73556,8 +73556,8 @@ function check_well_founded(env, loc, path, to_check, ty) {
         }
         const nodes = tmp$1 ? /* Empty */0 : exp_nodes$1;
         return iter_type_expr((function (param) {
-                      return check(ty0, nodes, param);
-                    }), ty$1);
+                return check(ty0, nodes, param);
+              }), ty$1);
       }
       if (exn$1.MEL_EXN_ID === Unify) {
         return backtrack(snap);
@@ -73617,8 +73617,8 @@ function check_recursion(env, loc, path, decl, to_check) {
       const match = ty$1.desc;
       if (/* tag */typeof match === "number" || typeof match === "string") {
         return iter_type_expr((function (param) {
-                      return check_regular(cpath, args, prev_exp, param);
-                    }), ty$1);
+                return check_regular(cpath, args, prev_exp, param);
+              }), ty$1);
       }
       switch (match.TAG) {
         case /* Tconstr */3 :
@@ -73627,15 +73627,15 @@ function check_recursion(env, loc, path, decl, to_check) {
             if (same(path, path$p)) {
               if (!equal$5(env, false, args, args$p)) {
                 throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                          MEL_EXN_ID: $$Error$8,
-                          _1: loc,
-                          _2: {
-                            TAG: /* Parameters_differ */8,
-                            _0: cpath,
-                            _1: ty$1,
-                            _2: newconstr(path, args)
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$8,
+                      _1: loc,
+                      _2: {
+                        TAG: /* Parameters_differ */8,
+                        _0: cpath,
+                        _1: ty$1,
+                        _2: newconstr(path, args)
+                      }
+                    });
               }
               
             } else if (Curry._1(to_check, path$p) && !Stdlib__List.mem(path$p, prev_exp)) {
@@ -73652,14 +73652,14 @@ function check_recursion(env, loc, path, decl, to_check) {
                   const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
                   if (exn.MEL_EXN_ID === Unify) {
                     throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                              MEL_EXN_ID: $$Error$8,
-                              _1: loc,
-                              _2: {
-                                TAG: /* Constraint_failed */5,
-                                _0: ty$1,
-                                _1: newconstr(path$p, params0)
-                              }
-                            });
+                          MEL_EXN_ID: $$Error$8,
+                          _1: loc,
+                          _2: {
+                            TAG: /* Constraint_failed */5,
+                            _0: ty$1,
+                            _1: newconstr(path$p, params0)
+                          }
+                        });
                   }
                   throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
                 }
@@ -73677,16 +73677,16 @@ function check_recursion(env, loc, path, decl, to_check) {
               }
             }
             return Stdlib__List.iter((function (param) {
-                          return check_regular(cpath, args, prev_exp, param);
-                        }), args$p);
+                    return check_regular(cpath, args, prev_exp, param);
+                  }), args$p);
         case /* Tpoly */10 :
             const match$3 = instance_poly(true, false, match._1, match._0);
             _ty = match$3[1];
             continue ;
         default:
           return iter_type_expr((function (param) {
-                        return check_regular(cpath, args, prev_exp, param);
-                      }), ty$1);
+                  return check_regular(cpath, args, prev_exp, param);
+                }), ty$1);
       }
     };
   };
@@ -73746,24 +73746,24 @@ function compute_variance(env, visited, vari, ty) {
             try {
               const decl = find_type_full(tl._0, env)[0];
               return Stdlib__List.iter2((function (ty, v) {
-                            const strict = Curry._2(Types_Variance.mem, /* Inv */6, vari$1) && Curry._2(Types_Variance.mem, /* Inj */3, v) || (Curry._2(Types_Variance.mem, /* Pos */4, vari$1) || Curry._2(Types_Variance.mem, /* Neg */5, vari$1)) && Curry._2(Types_Variance.mem, /* Inv */6, v);
-                            if (strict) {
-                              return compute_variance_rec(Types_Variance.full, ty);
-                            }
-                            const p1 = Curry._2(Types_Variance.inter, v, vari$1);
-                            const n1 = Curry._2(Types_Variance.inter, v, Curry._1(Types_Variance.conjugate, vari$1));
-                            const v1 = Curry._2(Types_Variance.union, Curry._2(Types_Variance.inter, Types_Variance.covariant, Curry._2(Types_Variance.union, p1, Curry._1(Types_Variance.conjugate, p1))), Curry._2(Types_Variance.inter, Curry._1(Types_Variance.conjugate, Types_Variance.covariant), Curry._2(Types_Variance.union, n1, Curry._1(Types_Variance.conjugate, n1))));
-                            const weak = Curry._2(Types_Variance.mem, /* May_weak */2, vari$1) && (Curry._2(Types_Variance.mem, /* May_pos */0, v) || Curry._2(Types_Variance.mem, /* May_neg */1, v)) || (Curry._2(Types_Variance.mem, /* May_pos */0, vari$1) || Curry._2(Types_Variance.mem, /* May_neg */1, vari$1)) && Curry._2(Types_Variance.mem, /* May_weak */2, v);
-                            const v2 = Curry._3(Types_Variance.set, /* May_weak */2, weak, v1);
-                            compute_variance_rec(v2, ty);
-                          }), tl$1, decl.type_variance);
+                      const strict = Curry._2(Types_Variance.mem, /* Inv */6, vari$1) && Curry._2(Types_Variance.mem, /* Inj */3, v) || (Curry._2(Types_Variance.mem, /* Pos */4, vari$1) || Curry._2(Types_Variance.mem, /* Neg */5, vari$1)) && Curry._2(Types_Variance.mem, /* Inv */6, v);
+                      if (strict) {
+                        return compute_variance_rec(Types_Variance.full, ty);
+                      }
+                      const p1 = Curry._2(Types_Variance.inter, v, vari$1);
+                      const n1 = Curry._2(Types_Variance.inter, v, Curry._1(Types_Variance.conjugate, vari$1));
+                      const v1 = Curry._2(Types_Variance.union, Curry._2(Types_Variance.inter, Types_Variance.covariant, Curry._2(Types_Variance.union, p1, Curry._1(Types_Variance.conjugate, p1))), Curry._2(Types_Variance.inter, Curry._1(Types_Variance.conjugate, Types_Variance.covariant), Curry._2(Types_Variance.union, n1, Curry._1(Types_Variance.conjugate, n1))));
+                      const weak = Curry._2(Types_Variance.mem, /* May_weak */2, vari$1) && (Curry._2(Types_Variance.mem, /* May_pos */0, v) || Curry._2(Types_Variance.mem, /* May_neg */1, v)) || (Curry._2(Types_Variance.mem, /* May_pos */0, vari$1) || Curry._2(Types_Variance.mem, /* May_neg */1, vari$1)) && Curry._2(Types_Variance.mem, /* May_weak */2, v);
+                      const v2 = Curry._3(Types_Variance.set, /* May_weak */2, weak, v1);
+                      compute_variance_rec(v2, ty);
+                    }), tl$1, decl.type_variance);
             }
             catch (raw_exn){
               const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
               if (exn.MEL_EXN_ID === Stdlib.Not_found) {
                 return Stdlib__List.iter((function (param) {
-                              return compute_variance_rec(Types_Variance.may_inv, param);
-                            }), tl$1);
+                        return compute_variance_rec(Types_Variance.may_inv, param);
+                      }), tl$1);
               }
               throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
             }
@@ -73816,8 +73816,8 @@ function compute_variance(env, visited, vari, ty) {
         case /* Tpackage */11 :
             const v$1 = Curry._2(Types_Variance.mem, /* Pos */4, vari$1) || Curry._2(Types_Variance.mem, /* Neg */5, vari$1) ? Types_Variance.full : Types_Variance.may_inv;
             return Stdlib__List.iter((function (param) {
-                          return compute_variance_rec(v$1, param);
-                        }), tl._2);
+                    return compute_variance_rec(v$1, param);
+                  }), tl._2);
         default:
           return ;
       }
@@ -73838,16 +73838,16 @@ function compute_variance_type(env, check, param, decl, tyl) {
           const c = param[0];
           if (c || n) {
             return [
-                    c,
-                    n,
-                    i
-                  ];
+              c,
+              n,
+              i
+            ];
           } else {
             return [
-                    true,
-                    true,
-                    i
-                  ];
+              true,
+              true,
+              i
+            ];
           }
         }), param[0]);
   const params = Stdlib__List.map(repr, decl.type_params);
@@ -73875,23 +73875,23 @@ function compute_variance_type(env, check, param, decl, tyl) {
               return ;
             }
             throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                      MEL_EXN_ID: $$Error$8,
-                      _1: loc,
-                      _2: {
-                        TAG: /* Bad_variance */16,
-                        _0: pos.contents,
-                        _1: [
-                          co,
-                          cn,
-                          ij
-                        ],
-                        _2: [
-                          c,
-                          n,
-                          i
-                        ]
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$8,
+                  _1: loc,
+                  _2: {
+                    TAG: /* Bad_variance */16,
+                    _0: pos.contents,
+                    _1: [
+                      co,
+                      cn,
+                      ij
+                    ],
+                    _2: [
+                      c,
+                      n,
+                      i
+                    ]
+                  }
+                });
           }), params, required);
     const args = newty2(100000000, {
           TAG: /* Ttuple */2,
@@ -73956,23 +73956,23 @@ function compute_variance_type(env, check, param, decl, tyl) {
             c2 || n2 ? -1 : -3
           ) : -2;
         throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                  MEL_EXN_ID: $$Error$8,
-                  _1: loc,
-                  _2: {
-                    TAG: /* Bad_variance */16,
-                    _0: code,
-                    _1: [
-                      c1,
-                      n1,
-                      false
-                    ],
-                    _2: [
-                      c2,
-                      n2,
-                      false
-                    ]
-                  }
-                });
+              MEL_EXN_ID: $$Error$8,
+              _1: loc,
+              _2: {
+                TAG: /* Bad_variance */16,
+                _0: code,
+                _1: [
+                  c1,
+                  n1,
+                  false
+                ],
+                _2: [
+                  c2,
+                  n2,
+                  false
+                ]
+              }
+            });
       };
       Stdlib__List.iter((function (param) {
               check$1(param[1]);
@@ -73981,42 +73981,42 @@ function compute_variance_type(env, check, param, decl, tyl) {
     
   }
   return Stdlib__List.map2((function (ty, param) {
-                const v = get_variance(ty, tvl);
-                const tr = decl.type_private;
-                const concr = Caml_obj.caml_notequal(decl.type_kind, /* Type_abstract */0);
-                const match = tr === /* Private */0 || !is_Tvar(ty) ? [
-                    param[0],
-                    param[1]
-                  ] : [
-                    false,
-                    false
-                  ];
-                const n = match[1];
-                const p = match[0];
-                const i = concr || param[2] && tr === /* Private */0;
-                const v$1 = Curry._2(Types_Variance.union, v, make(p, n, i));
-                const v$2 = concr ? (
-                    Curry._2(Types_Variance.mem, /* Pos */4, v$1) && Curry._2(Types_Variance.mem, /* Neg */5, v$1) ? Types_Variance.full : (
-                        is_Tvar(ty) ? v$1 : Curry._2(Types_Variance.union, v$1, p ? (
-                                  n ? Types_Variance.full : Types_Variance.covariant
-                                ) : Curry._1(Types_Variance.conjugate, Types_Variance.covariant))
-                      )
-                  ) : v$1;
-                if (Caml_obj.caml_equal(decl.type_kind, /* Type_abstract */0) && tr === /* Public */1) {
-                  return v$2;
-                } else {
-                  return Curry._3(Types_Variance.set, /* May_weak */2, Curry._2(Types_Variance.mem, /* May_neg */1, v$2), v$2);
-                }
-              }), params, required);
+          const v = get_variance(ty, tvl);
+          const tr = decl.type_private;
+          const concr = Caml_obj.caml_notequal(decl.type_kind, /* Type_abstract */0);
+          const match = tr === /* Private */0 || !is_Tvar(ty) ? [
+              param[0],
+              param[1]
+            ] : [
+              false,
+              false
+            ];
+          const n = match[1];
+          const p = match[0];
+          const i = concr || param[2] && tr === /* Private */0;
+          const v$1 = Curry._2(Types_Variance.union, v, make(p, n, i));
+          const v$2 = concr ? (
+              Curry._2(Types_Variance.mem, /* Pos */4, v$1) && Curry._2(Types_Variance.mem, /* Neg */5, v$1) ? Types_Variance.full : (
+                  is_Tvar(ty) ? v$1 : Curry._2(Types_Variance.union, v$1, p ? (
+                            n ? Types_Variance.full : Types_Variance.covariant
+                          ) : Curry._1(Types_Variance.conjugate, Types_Variance.covariant))
+                )
+            ) : v$1;
+          if (Caml_obj.caml_equal(decl.type_kind, /* Type_abstract */0) && tr === /* Public */1) {
+            return v$2;
+          } else {
+            return Curry._3(Types_Variance.set, /* May_weak */2, Curry._2(Types_Variance.mem, /* May_neg */1, v$2), v$2);
+          }
+        }), params, required);
 }
 
 function add_false(param) {
   return Stdlib__List.map((function (ty) {
-                return [
-                        false,
-                        ty
-                      ];
-              }), param);
+          return [
+            false,
+            ty
+          ];
+        }), param);
 }
 
 function constrained(env, vars, ty) {
@@ -74025,8 +74025,8 @@ function constrained(env, vars, ty) {
     return true;
   } else {
     return Stdlib__List.exists((function (tl) {
-                  return Stdlib__List.memq(ty, tl);
-                }), vars);
+            return Stdlib__List.memq(ty, tl);
+          }), vars);
   }
 }
 
@@ -74036,28 +74036,28 @@ function compute_variance_gadt(env, check, rloc, decl, param) {
   const loc = rloc[1];
   if (ret_type_opt === undefined) {
     return compute_variance_type(env, check, rloc, {
-                type_params: decl.type_params,
-                type_arity: decl.type_arity,
-                type_kind: decl.type_kind,
-                type_private: /* Private */0,
-                type_manifest: decl.type_manifest,
-                type_variance: decl.type_variance,
-                type_newtype_level: decl.type_newtype_level,
-                type_loc: decl.type_loc,
-                type_attributes: decl.type_attributes
-              }, add_false(tl));
+          type_params: decl.type_params,
+          type_arity: decl.type_arity,
+          type_kind: decl.type_kind,
+          type_private: /* Private */0,
+          type_manifest: decl.type_manifest,
+          type_variance: decl.type_variance,
+          type_newtype_level: decl.type_newtype_level,
+          type_loc: decl.type_loc,
+          type_attributes: decl.type_attributes
+        }, add_false(tl));
   }
   const match = repr(ret_type_opt);
   const match$1 = match.desc;
   if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/ocaml_typedtree_test.ml",
-                47023,
-                13
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/ocaml_typedtree_test.ml",
+            47023,
+            13
+          ]
+        });
   }
   if (match$1.TAG === /* Tconstr */3) {
     const tyl = Stdlib__List.map(repr, match$1._1);
@@ -74071,118 +74071,118 @@ function compute_variance_gadt(env, check, rloc, decl, param) {
               const fv1 = param[0];
               if ((param$1[0] || param$1[1]) && constrained(env, Stdlib.$at(fv1, fv2$1), ty)) {
                 throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                          MEL_EXN_ID: $$Error$8,
-                          _1: loc,
-                          _2: /* Varying_anonymous */4
-                        });
+                      MEL_EXN_ID: $$Error$8,
+                      _1: loc,
+                      _2: /* Varying_anonymous */4
+                    });
               }
               return [
-                      {
-                        hd: fv2.hd,
-                        tl: fv1
-                      },
-                      fv2$1
-                    ];
+                {
+                  hd: fv2.hd,
+                  tl: fv1
+                },
+                fv2$1
+              ];
             }
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "jscomp/test/ocaml_typedtree_test.ml",
-                        47012,
-                        37
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "jscomp/test/ocaml_typedtree_test.ml",
+                    47012,
+                    37
+                  ]
+                });
           }), [
           /* [] */0,
           fvl
         ], tyl, rloc[0]);
     return compute_variance_type(env, check, rloc, {
-                type_params: tyl,
-                type_arity: decl.type_arity,
-                type_kind: decl.type_kind,
-                type_private: /* Private */0,
-                type_manifest: decl.type_manifest,
-                type_variance: decl.type_variance,
-                type_newtype_level: decl.type_newtype_level,
-                type_loc: decl.type_loc,
-                type_attributes: decl.type_attributes
-              }, add_false(tl));
+          type_params: tyl,
+          type_arity: decl.type_arity,
+          type_kind: decl.type_kind,
+          type_private: /* Private */0,
+          type_manifest: decl.type_manifest,
+          type_variance: decl.type_variance,
+          type_newtype_level: decl.type_newtype_level,
+          type_loc: decl.type_loc,
+          type_attributes: decl.type_attributes
+        }, add_false(tl));
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              47023,
-              13
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          47023,
+          13
+        ]
+      });
 }
 
 function compute_variance_extension(env, check, decl, ext, rloc) {
   return compute_variance_gadt(env, check, rloc, {
-              type_params: ext.ext_type_params,
-              type_arity: decl.type_arity,
-              type_kind: decl.type_kind,
-              type_private: decl.type_private,
-              type_manifest: decl.type_manifest,
-              type_variance: decl.type_variance,
-              type_newtype_level: decl.type_newtype_level,
-              type_loc: decl.type_loc,
-              type_attributes: decl.type_attributes
-            }, [
-              ext.ext_args,
-              ext.ext_ret_type
-            ]);
+        type_params: ext.ext_type_params,
+        type_arity: decl.type_arity,
+        type_kind: decl.type_kind,
+        type_private: decl.type_private,
+        type_manifest: decl.type_manifest,
+        type_variance: decl.type_variance,
+        type_newtype_level: decl.type_newtype_level,
+        type_loc: decl.type_loc,
+        type_attributes: decl.type_attributes
+      }, [
+        ext.ext_args,
+        ext.ext_ret_type
+      ]);
 }
 
 function compute_variance_decl(env, check, decl, rloc) {
   if ((Caml_obj.caml_equal(decl.type_kind, /* Type_abstract */0) || Caml_obj.caml_equal(decl.type_kind, /* Type_open */1)) && decl.type_manifest === undefined) {
     return Stdlib__List.map((function (param) {
-                  return make(!param[1], !param[0], Caml_obj.caml_notequal(decl.type_kind, /* Type_abstract */0) || param[2]);
-                }), rloc[0]);
+            return make(!param[1], !param[0], Caml_obj.caml_notequal(decl.type_kind, /* Type_abstract */0) || param[2]);
+          }), rloc[0]);
   }
   const ty = decl.type_manifest;
   const mn = ty !== undefined ? ({
-        hd: [
-          false,
-          ty
-        ],
-        tl: /* [] */0
-      }) : /* [] */0;
+      hd: [
+        false,
+        ty
+      ],
+      tl: /* [] */0
+    }) : /* [] */0;
   const tll = decl.type_kind;
   if (/* tag */typeof tll === "number" || typeof tll === "string") {
     return compute_variance_type(env, check, rloc, decl, mn);
   }
   if (tll.TAG === /* Type_record */0) {
     return compute_variance_type(env, check, rloc, decl, Stdlib.$at(mn, Stdlib__List.map((function (param) {
-                          return [
-                                  param.ld_mutable === /* Mutable */1,
-                                  param.ld_type
-                                ];
-                        }), tll._0)));
+                    return [
+                      param.ld_mutable === /* Mutable */1,
+                      param.ld_type
+                    ];
+                  }), tll._0)));
   }
   const tll$1 = tll._0;
   if (Stdlib__List.for_all((function (c) {
             return c.cd_res === undefined;
           }), tll$1)) {
     return compute_variance_type(env, check, rloc, decl, Stdlib.$at(mn, add_false(Stdlib__List.flatten(Stdlib__List.map((function (c) {
-                                  return c.cd_args;
-                                }), tll$1)))));
+                            return c.cd_args;
+                          }), tll$1)))));
   }
   const mn$1 = Stdlib__List.map((function (param) {
           return [
-                  {
-                    hd: param[1],
-                    tl: /* [] */0
-                  },
-                  undefined
-                ];
+            {
+              hd: param[1],
+              tl: /* [] */0
+            },
+            undefined
+          ];
         }), mn);
   const tll$2 = Stdlib.$at(mn$1, Stdlib__List.map((function (c) {
               return [
-                      c.cd_args,
-                      c.cd_res
-                    ];
+                c.cd_args,
+                c.cd_res
+              ];
             }), tll$1));
   const match = Stdlib__List.map((function (param) {
           return compute_variance_gadt(env, check, rloc, decl, param);
@@ -74192,21 +74192,21 @@ function compute_variance_decl(env, check, decl, rloc) {
             return Stdlib__List.map2(Types_Variance.union, param, param$1);
           }), match.hd, match.tl);
     return Stdlib__List.map((function (v) {
-                  if (Curry._2(Types_Variance.mem, /* Pos */4, v) && Curry._2(Types_Variance.mem, /* Neg */5, v)) {
-                    return Types_Variance.full;
-                  } else {
-                    return v;
-                  }
-                }), varl);
+            if (Curry._2(Types_Variance.mem, /* Pos */4, v) && Curry._2(Types_Variance.mem, /* Neg */5, v)) {
+              return Types_Variance.full;
+            } else {
+              return v;
+            }
+          }), varl);
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/ocaml_typedtree_test.ml",
-              47062,
-              15
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/ocaml_typedtree_test.ml",
+          47062,
+          15
+        ]
+      });
 }
 
 function is_sharp(id) {
@@ -74224,19 +74224,19 @@ function compute_variance_fixpoint(env, decls, required, _variances) {
     const new_decls = Stdlib__List.map2((function (param, variance) {
             const decl = param[1];
             return [
-                    param[0],
-                    {
-                      type_params: decl.type_params,
-                      type_arity: decl.type_arity,
-                      type_kind: decl.type_kind,
-                      type_private: decl.type_private,
-                      type_manifest: decl.type_manifest,
-                      type_variance: variance,
-                      type_newtype_level: decl.type_newtype_level,
-                      type_loc: decl.type_loc,
-                      type_attributes: decl.type_attributes
-                    }
-                  ];
+              param[0],
+              {
+                type_params: decl.type_params,
+                type_arity: decl.type_arity,
+                type_kind: decl.type_kind,
+                type_private: decl.type_private,
+                type_manifest: decl.type_manifest,
+                type_variance: variance,
+                type_newtype_level: decl.type_newtype_level,
+                type_loc: decl.type_loc,
+                type_attributes: decl.type_attributes
+              }
+            ];
           }), decls, variances);
     const new_env = Stdlib__List.fold_right((function (param, env) {
             return add_type$1(true, param[0], param[1], env);
@@ -74262,42 +74262,42 @@ function compute_variance_fixpoint(env, decls, required, _variances) {
             
           }), new_decls, required);
     return [
-            new_decls,
-            new_env
-          ];
+      new_decls,
+      new_env
+    ];
   };
 }
 
 function init_variance(param) {
   return Stdlib__List.map((function (param) {
-                return Types_Variance.$$null;
-              }), param[1].type_params);
+          return Types_Variance.$$null;
+        }), param[1].type_params);
 }
 
 function add_injectivity(param) {
   return Stdlib__List.map((function (param) {
-                switch (param) {
-                  case /* Covariant */0 :
-                      return [
-                              true,
-                              false,
-                              false
-                            ];
-                  case /* Contravariant */1 :
-                      return [
-                              false,
-                              true,
-                              false
-                            ];
-                  case /* Invariant */2 :
-                      return [
-                              false,
-                              false,
-                              false
-                            ];
-                  
-                }
-              }), param);
+          switch (param) {
+            case /* Covariant */0 :
+                return [
+                  true,
+                  false,
+                  false
+                ];
+            case /* Contravariant */1 :
+                return [
+                  false,
+                  true,
+                  false
+                ];
+            case /* Invariant */2 :
+                return [
+                  false,
+                  false,
+                  false
+                ];
+            
+          }
+        }), param);
 }
 
 function compute_variance_decls(env, cldecls) {
@@ -74307,21 +74307,21 @@ function compute_variance_decls(env, cldecls) {
                   return prim[1];
                 }), ci.ci_params);
           return [
-                  {
-                    hd: [
-                      param[0],
-                      param[1]
-                    ],
-                    tl: param$1[0]
-                  },
-                  {
-                    hd: [
-                      add_injectivity(variance),
-                      ci.ci_loc
-                    ],
-                    tl: param$1[1]
-                  }
-                ];
+            {
+              hd: [
+                param[0],
+                param[1]
+              ],
+              tl: param$1[0]
+            },
+            {
+              hd: [
+                add_injectivity(variance),
+                ci.ci_loc
+              ],
+              tl: param$1[1]
+            }
+          ];
         }), cldecls, [
         /* [] */0,
         /* [] */0
@@ -74330,43 +74330,43 @@ function compute_variance_decls(env, cldecls) {
   const variances = Stdlib__List.map(init_variance, decls);
   const match$1 = compute_variance_fixpoint(env, decls, match[1], variances);
   return Stdlib__List.map2((function (param, param$1) {
-                const cltydef = param$1[4];
-                const clty = param$1[3];
-                const cl_abbr = param$1[2];
-                const decl = param[1];
-                const variance = decl.type_variance;
-                return [
-                        decl,
-                        {
-                          type_params: cl_abbr.type_params,
-                          type_arity: cl_abbr.type_arity,
-                          type_kind: cl_abbr.type_kind,
-                          type_private: cl_abbr.type_private,
-                          type_manifest: cl_abbr.type_manifest,
-                          type_variance: variance,
-                          type_newtype_level: cl_abbr.type_newtype_level,
-                          type_loc: cl_abbr.type_loc,
-                          type_attributes: cl_abbr.type_attributes
-                        },
-                        {
-                          cty_params: clty.cty_params,
-                          cty_type: clty.cty_type,
-                          cty_path: clty.cty_path,
-                          cty_new: clty.cty_new,
-                          cty_variance: variance,
-                          cty_loc: clty.cty_loc,
-                          cty_attributes: clty.cty_attributes
-                        },
-                        {
-                          clty_params: cltydef.clty_params,
-                          clty_type: cltydef.clty_type,
-                          clty_path: cltydef.clty_path,
-                          clty_variance: variance,
-                          clty_loc: cltydef.clty_loc,
-                          clty_attributes: cltydef.clty_attributes
-                        }
-                      ];
-              }), match$1[0], cldecls);
+          const cltydef = param$1[4];
+          const clty = param$1[3];
+          const cl_abbr = param$1[2];
+          const decl = param[1];
+          const variance = decl.type_variance;
+          return [
+            decl,
+            {
+              type_params: cl_abbr.type_params,
+              type_arity: cl_abbr.type_arity,
+              type_kind: cl_abbr.type_kind,
+              type_private: cl_abbr.type_private,
+              type_manifest: cl_abbr.type_manifest,
+              type_variance: variance,
+              type_newtype_level: cl_abbr.type_newtype_level,
+              type_loc: cl_abbr.type_loc,
+              type_attributes: cl_abbr.type_attributes
+            },
+            {
+              cty_params: clty.cty_params,
+              cty_type: clty.cty_type,
+              cty_path: clty.cty_path,
+              cty_new: clty.cty_new,
+              cty_variance: variance,
+              cty_loc: clty.cty_loc,
+              cty_attributes: clty.cty_attributes
+            },
+            {
+              clty_params: cltydef.clty_params,
+              clty_type: cltydef.clty_type,
+              clty_path: cltydef.clty_path,
+              clty_variance: variance,
+              clty_loc: cltydef.clty_loc,
+              clty_attributes: cltydef.clty_attributes
+            }
+          ];
+        }), match$1[0], cldecls);
 }
 
 function check_duplicates(sdecl_list) {
@@ -74378,45 +74378,45 @@ function check_duplicates(sdecl_list) {
             return ;
           } else if (cl.TAG === /* Ptype_variant */0) {
             return Stdlib__List.iter((function (pcd) {
-                          try {
-                            const name$p = Stdlib__Hashtbl.find(constrs, pcd.pcd_name.txt);
-                            return prerr_warning(pcd.pcd_loc, {
-                                        TAG: /* Duplicate_definitions */14,
-                                        _0: "constructor",
-                                        _1: pcd.pcd_name.txt,
-                                        _2: name$p,
-                                        _3: sdecl.ptype_name.txt
-                                      });
-                          }
-                          catch (raw_exn){
-                            const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-                            if (exn.MEL_EXN_ID === Stdlib.Not_found) {
-                              return Stdlib__Hashtbl.add(constrs, pcd.pcd_name.txt, sdecl.ptype_name.txt);
-                            }
-                            throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
-                          }
-                        }), cl._0);
+                    try {
+                      const name$p = Stdlib__Hashtbl.find(constrs, pcd.pcd_name.txt);
+                      return prerr_warning(pcd.pcd_loc, {
+                            TAG: /* Duplicate_definitions */14,
+                            _0: "constructor",
+                            _1: pcd.pcd_name.txt,
+                            _2: name$p,
+                            _3: sdecl.ptype_name.txt
+                          });
+                    }
+                    catch (raw_exn){
+                      const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
+                      if (exn.MEL_EXN_ID === Stdlib.Not_found) {
+                        return Stdlib__Hashtbl.add(constrs, pcd.pcd_name.txt, sdecl.ptype_name.txt);
+                      }
+                      throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
+                    }
+                  }), cl._0);
           } else {
             return Stdlib__List.iter((function (param) {
-                          const cname = param.pld_name;
-                          try {
-                            const name$p = Stdlib__Hashtbl.find(labels, cname.txt);
-                            return prerr_warning(param.pld_loc, {
-                                        TAG: /* Duplicate_definitions */14,
-                                        _0: "label",
-                                        _1: cname.txt,
-                                        _2: name$p,
-                                        _3: sdecl.ptype_name.txt
-                                      });
-                          }
-                          catch (raw_exn){
-                            const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-                            if (exn.MEL_EXN_ID === Stdlib.Not_found) {
-                              return Stdlib__Hashtbl.add(labels, cname.txt, sdecl.ptype_name.txt);
-                            }
-                            throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
-                          }
-                        }), cl._0);
+                    const cname = param.pld_name;
+                    try {
+                      const name$p = Stdlib__Hashtbl.find(labels, cname.txt);
+                      return prerr_warning(param.pld_loc, {
+                            TAG: /* Duplicate_definitions */14,
+                            _0: "label",
+                            _1: cname.txt,
+                            _2: name$p,
+                            _3: sdecl.ptype_name.txt
+                          });
+                    }
+                    catch (raw_exn){
+                      const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
+                      if (exn.MEL_EXN_ID === Stdlib.Not_found) {
+                        return Stdlib__Hashtbl.add(labels, cname.txt, sdecl.ptype_name.txt);
+                      }
+                      throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
+                    }
+                  }), cl._0);
           }
         }), sdecl_list);
 }
@@ -74460,16 +74460,16 @@ function name_recursion(sdecl, id, decl) {
   };
   link_type(ty$1, newty2(ty$1.level, td));
   return {
-          type_params: decl.type_params,
-          type_arity: decl.type_arity,
-          type_kind: decl.type_kind,
-          type_private: decl.type_private,
-          type_manifest: ty$p,
-          type_variance: decl.type_variance,
-          type_newtype_level: decl.type_newtype_level,
-          type_loc: decl.type_loc,
-          type_attributes: decl.type_attributes
-        };
+    type_params: decl.type_params,
+    type_arity: decl.type_arity,
+    type_kind: decl.type_kind,
+    type_private: decl.type_private,
+    type_manifest: ty$p,
+    type_variance: decl.type_variance,
+    type_newtype_level: decl.type_newtype_level,
+    type_loc: decl.type_loc,
+    type_attributes: decl.type_attributes
+  };
 }
 
 function transl_type_decl(env, rec_flag, sdecl_list) {
@@ -74482,15 +74482,15 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
                 loc: ptype_name_loc
               };
               return {
-                      ptype_name: ptype_name,
-                      ptype_params: sdecl.ptype_params,
-                      ptype_cstrs: sdecl.ptype_cstrs,
-                      ptype_kind: /* Ptype_abstract */0,
-                      ptype_private: sdecl.ptype_private,
-                      ptype_manifest: undefined,
-                      ptype_attributes: sdecl.ptype_attributes,
-                      ptype_loc: sdecl.ptype_loc
-                    };
+                ptype_name: ptype_name,
+                ptype_params: sdecl.ptype_params,
+                ptype_cstrs: sdecl.ptype_cstrs,
+                ptype_kind: /* Ptype_abstract */0,
+                ptype_private: sdecl.ptype_private,
+                ptype_manifest: undefined,
+                ptype_attributes: sdecl.ptype_attributes,
+                ptype_loc: sdecl.ptype_loc
+              };
             }), fixed_types), sdecl_list);
   const id_list = Stdlib__List.map((function (sdecl) {
           return create(sdecl.ptype_name.txt);
@@ -74509,15 +74509,15 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
   const id_slots = function (id) {
     if (rec_flag === /* Nonrecursive */0) {
       return [
-              id,
-              undefined
-            ];
+        id,
+        undefined
+      ];
     }
     if (!warn_unused) {
       return [
-              id,
-              undefined
-            ];
+        id,
+        undefined
+      ];
     }
     const slot = {
       contents: /* [] */0
@@ -74546,9 +74546,9 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
             }
           }));
     return [
-            id,
-            slot
-          ];
+      id,
+      slot
+    ];
   };
   const transl_declaration = function (name_sdecl, param) {
     current_slot.contents = param[1];
@@ -74561,10 +74561,10 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
           }), tparams);
     const cstrs = Stdlib__List.map((function (param) {
             return [
-                    transl_simple_type(temp_env, false, param[0]),
-                    transl_simple_type(temp_env, false, param[1]),
-                    param[2]
-                  ];
+              transl_simple_type(temp_env, false, param[0]),
+              transl_simple_type(temp_env, false, param[1]),
+              param[2]
+            ];
           }), name_sdecl.ptype_cstrs);
     const scstrs = name_sdecl.ptype_kind;
     let match;
@@ -74588,13 +74588,13 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
               const name = param.pcd_name.txt;
               if (Curry._2(mem$6, name, all_constrs.contents)) {
                 throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                          MEL_EXN_ID: $$Error$8,
-                          _1: name_sdecl.ptype_loc,
-                          _2: {
-                            TAG: /* Duplicate_constructor */0,
-                            _0: name
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$8,
+                      _1: name_sdecl.ptype_loc,
+                      _2: {
+                        TAG: /* Duplicate_constructor */0,
+                        _0: name
+                      }
+                    });
               }
               all_constrs.contents = Curry._2(add$12, name, all_constrs.contents);
             }), scstrs$1);
@@ -74602,10 +74602,10 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
                     return Caml_obj.caml_notequal(cd.pcd_args, /* [] */0);
                   }), scstrs$1)) > 246) {
         throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                  MEL_EXN_ID: $$Error$8,
-                  _1: name_sdecl.ptype_loc,
-                  _2: /* Too_many_constructors */1
-                });
+              MEL_EXN_ID: $$Error$8,
+              _1: name_sdecl.ptype_loc,
+              _2: /* Too_many_constructors */1
+            });
       }
       const make_cstr = function (scstr) {
         const name = create(scstr.pcd_name.txt);
@@ -74638,9 +74638,9 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
           cd_attributes: cstr_cd_attributes
         };
         return [
-                tcstr,
-                cstr
-              ];
+          tcstr,
+          cstr
+        ];
       };
       const match$1 = Stdlib__List.split(Stdlib__List.map(make_cstr, scstrs$1));
       match = [
@@ -74665,13 +74665,13 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
               const name = param.pld_name.txt;
               if (Curry._2(mem$6, name, all_labels.contents)) {
                 throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                          MEL_EXN_ID: $$Error$8,
-                          _1: name_sdecl.ptype_loc,
-                          _2: {
-                            TAG: /* Duplicate_label */1,
-                            _0: name
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$8,
+                      _1: name_sdecl.ptype_loc,
+                      _2: {
+                        TAG: /* Duplicate_label */1,
+                        _0: name
+                      }
+                    });
               }
               all_labels.contents = Curry._2(add$12, name, all_labels.contents);
             }), lbls);
@@ -74680,13 +74680,13 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
               const arg = force_poly(param.pld_type);
               const cty = transl_simple_type(temp_env, true, arg);
               return {
-                      ld_id: create(name.txt),
-                      ld_name: name,
-                      ld_mutable: param.pld_mutable,
-                      ld_type: cty,
-                      ld_loc: param.pld_loc,
-                      ld_attributes: param.pld_attributes
-                    };
+                ld_id: create(name.txt),
+                ld_name: name,
+                ld_mutable: param.pld_mutable,
+                ld_type: cty,
+                ld_loc: param.pld_loc,
+                ld_attributes: param.pld_attributes
+              };
             }), lbls);
       const lbls$p = Stdlib__List.map((function (ld) {
               const ty = ld.ld_type.ctyp_type;
@@ -74694,12 +74694,12 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
               let ty$1;
               ty$1 = /* tag */typeof match === "number" || typeof match === "string" || !(match.TAG === /* Tpoly */10 && !match._1) ? ty : match._0;
               return {
-                      ld_id: ld.ld_id,
-                      ld_mutable: ld.ld_mutable,
-                      ld_type: ty$1,
-                      ld_loc: ld.ld_loc,
-                      ld_attributes: ld.ld_attributes
-                    };
+                ld_id: ld.ld_id,
+                ld_mutable: ld.ld_mutable,
+                ld_type: ty$1,
+                ld_loc: ld.ld_loc,
+                ld_attributes: ld.ld_attributes
+              };
             }), lbls$1);
       const rep = Stdlib__List.for_all((function (l) {
               let ty = l.ld_type;
@@ -74768,14 +74768,14 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
               const tr = Caml_js_exceptions.internalToOCamlException(raw_tr);
               if (tr.MEL_EXN_ID === Unify) {
                 throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                          MEL_EXN_ID: $$Error$8,
-                          _1: param[2],
-                          _2: {
-                            TAG: /* Inconsistent_constraint */6,
-                            _0: temp_env,
-                            _1: tr._1
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$8,
+                      _1: param[2],
+                      _2: {
+                        TAG: /* Inconsistent_constraint */6,
+                        _0: temp_env,
+                        _1: tr._1
+                      }
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(tr.MEL_EXN_ID, tr);
             }
@@ -74793,13 +74793,13 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
         const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
         if (exn.MEL_EXN_ID === Stdlib.Not_found) {
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      46515,
-                      26
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  46515,
+                  26
+                ]
+              });
         }
         throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
       }
@@ -74807,33 +74807,33 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
     }
     if (man !== undefined && cyclic_abbrev(temp_env, id, man)) {
       throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                MEL_EXN_ID: $$Error$8,
-                _1: name_sdecl.ptype_loc,
-                _2: {
-                  TAG: /* Recursive_abbrev */2,
-                  _0: name_sdecl.ptype_name.txt
-                }
-              });
+            MEL_EXN_ID: $$Error$8,
+            _1: name_sdecl.ptype_loc,
+            _2: {
+              TAG: /* Recursive_abbrev */2,
+              _0: name_sdecl.ptype_name.txt
+            }
+          });
     }
     return {
-            typ_id: id,
-            typ_name: name_sdecl.ptype_name,
-            typ_params: tparams,
-            typ_type: decl,
-            typ_cstrs: cstrs,
-            typ_kind: match[0],
-            typ_private: name_sdecl.ptype_private,
-            typ_manifest: match$2[0],
-            typ_loc: name_sdecl.ptype_loc,
-            typ_attributes: name_sdecl.ptype_attributes
-          };
+      typ_id: id,
+      typ_name: name_sdecl.ptype_name,
+      typ_params: tparams,
+      typ_type: decl,
+      typ_cstrs: cstrs,
+      typ_kind: match[0],
+      typ_private: name_sdecl.ptype_private,
+      typ_manifest: match$2[0],
+      typ_loc: name_sdecl.ptype_loc,
+      typ_attributes: name_sdecl.ptype_attributes
+    };
   };
   const tdecls = Stdlib__List.map2(transl_declaration, sdecl_list$1, Stdlib__List.map(id_slots, id_list));
   const decls = Stdlib__List.map((function (tdecl) {
           return [
-                  tdecl.typ_id,
-                  tdecl.typ_type
-                ];
+            tdecl.typ_id,
+            tdecl.typ_type
+          ];
         }), tdecls);
   current_slot.contents = undefined;
   check_duplicates(sdecl_list$1);
@@ -74862,14 +74862,14 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
               const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
               if (trace.MEL_EXN_ID === Unify) {
                 throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                          MEL_EXN_ID: $$Error$8,
-                          _1: loc,
-                          _2: {
-                            TAG: /* Type_clash */7,
-                            _0: newenv,
-                            _1: trace._1
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$8,
+                      _1: loc,
+                      _2: {
+                        TAG: /* Type_clash */7,
+                        _0: newenv,
+                        _1: trace._1
+                      }
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
             }
@@ -74881,9 +74881,9 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
         }), decls);
   const id_loc_list = Stdlib__List.map2((function (id, sdecl) {
           return [
-                  id,
-                  sdecl.ptype_loc
-                ];
+            id,
+            sdecl.ptype_loc
+          ];
         }), id_list, sdecl_list$1);
   Stdlib__List.iter((function (param) {
           const id = param[0];
@@ -74924,9 +74924,9 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
           const decl = param.typ_type;
           const id = param.typ_id;
           return check_recursion(newenv, Stdlib__List.assoc(id, id_loc_list), {
-                      TAG: /* Pident */0,
-                      _0: id
-                    }, decl, to_check);
+                TAG: /* Pident */0,
+                _0: id
+              }, decl, to_check);
         }), tdecls);
   Stdlib__List.iter2((function (sdecl, tdecl) {
           const decl = tdecl.typ_type;
@@ -74935,14 +74935,14 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
             return ;
           }
           throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                    MEL_EXN_ID: $$Error$8,
-                    _1: sdecl.ptype_loc,
-                    _2: {
-                      TAG: /* Unbound_type_var */9,
-                      _0: ty,
-                      _1: decl
-                    }
-                  });
+                MEL_EXN_ID: $$Error$8,
+                _1: sdecl.ptype_loc,
+                _2: {
+                  TAG: /* Unbound_type_var */9,
+                  _0: ty,
+                  _1: decl
+                }
+              });
         }), sdecl_list$1, tdecls);
   Stdlib__List.iter2((function (param, param$1) {
           const decl = param$1[1];
@@ -74956,25 +74956,25 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
             const find_pl = function (pl) {
               if (/* tag */typeof pl === "number" || typeof pl === "string") {
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            46623,
-                            59
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        46623,
+                        59
+                      ]
+                    });
               }
               if (pl.TAG === /* Ptype_record */1) {
                 return pl._0;
               }
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          46623,
-                          59
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/ocaml_typedtree_test.ml",
+                      46623,
+                      59
+                    ]
+                  });
             };
             const pl = find_pl(param.ptype_kind);
             const get_loc = function (name, _param) {
@@ -74989,13 +74989,13 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
                   continue ;
                 }
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            46627,
-                            16
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        46627,
+                        16
+                      ]
+                    });
               };
             };
             Stdlib__List.iter((function (param) {
@@ -75005,25 +75005,25 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
             const find_pl$1 = function (pl) {
               if (/* tag */typeof pl === "number" || typeof pl === "string") {
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            46596,
-                            58
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        46596,
+                        58
+                      ]
+                    });
               }
               if (pl.TAG === /* Ptype_variant */0) {
                 return pl._0;
               }
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          46596,
-                          58
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/ocaml_typedtree_test.ml",
+                      46596,
+                      58
+                    ]
+                  });
             };
             const pl$1 = find_pl$1(param.ptype_kind);
             const foldf = function (acc, x) {
@@ -75040,13 +75040,13 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
                       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
                       if (exn.MEL_EXN_ID === Stdlib.Not_found) {
                         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                  MEL_EXN_ID: "Assert_failure",
-                                  _1: [
-                                    "jscomp/test/ocaml_typedtree_test.ml",
-                                    46609,
-                                    30
-                                  ]
-                                });
+                              MEL_EXN_ID: "Assert_failure",
+                              _1: [
+                                "jscomp/test/ocaml_typedtree_test.ml",
+                                46609,
+                                30
+                              ]
+                            });
                       }
                       throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
                     }
@@ -75070,30 +75070,30 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
             sty$1 = sty;
           } else {
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "jscomp/test/ocaml_typedtree_test.ml",
-                        46642,
-                        63
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "jscomp/test/ocaml_typedtree_test.ml",
+                    46642,
+                    63
+                  ]
+                });
           }
           return check_constraints_rec(newenv, sty$1.ptyp_loc, visited, ty);
         }), sdecl_list$1, decls);
   const decls$1 = Stdlib__List.map2((function (sdecl, param) {
           const id = param[0];
           return [
-                  id,
-                  name_recursion(sdecl, id, param[1])
-                ];
+            id,
+            name_recursion(sdecl, id, param[1])
+          ];
         }), sdecl_list$1, decls);
   const required = Stdlib__List.map((function (sdecl) {
           return [
-                  add_injectivity(Stdlib__List.map((function (prim) {
-                              return prim[1];
-                            }), sdecl.ptype_params)),
-                  sdecl.ptype_loc
-                ];
+            add_injectivity(Stdlib__List.map((function (prim) {
+                        return prim[1];
+                      }), sdecl.ptype_params)),
+            sdecl.ptype_loc
+          ];
         }), sdecl_list$1);
   const match = compute_variance_fixpoint(env, decls$1, required, Stdlib__List.map(init_variance, decls$1));
   const final_env = match[1];
@@ -75103,22 +75103,22 @@ function transl_type_decl(env, rec_flag, sdecl_list) {
         }), sdecl_list$1, final_decls);
   const final_decls$1 = Stdlib__List.map2((function (tdecl, param) {
           return {
-                  typ_id: tdecl.typ_id,
-                  typ_name: tdecl.typ_name,
-                  typ_params: tdecl.typ_params,
-                  typ_type: param[1],
-                  typ_cstrs: tdecl.typ_cstrs,
-                  typ_kind: tdecl.typ_kind,
-                  typ_private: tdecl.typ_private,
-                  typ_manifest: tdecl.typ_manifest,
-                  typ_loc: tdecl.typ_loc,
-                  typ_attributes: tdecl.typ_attributes
-                };
+            typ_id: tdecl.typ_id,
+            typ_name: tdecl.typ_name,
+            typ_params: tdecl.typ_params,
+            typ_type: param[1],
+            typ_cstrs: tdecl.typ_cstrs,
+            typ_kind: tdecl.typ_kind,
+            typ_private: tdecl.typ_private,
+            typ_manifest: tdecl.typ_manifest,
+            typ_loc: tdecl.typ_loc,
+            typ_attributes: tdecl.typ_attributes
+          };
         }), tdecls, final_decls);
   return [
-          final_decls$1,
-          final_env
-        ];
+    final_decls$1,
+    final_env
+  ];
 }
 
 function transl_extension_constructor(env, check_open, type_path, type_params, typext_params, priv, sext) {
@@ -75165,15 +75165,15 @@ function transl_extension_constructor(env, check_open, type_path, type_params, t
       const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
       if (trace.MEL_EXN_ID === Unify) {
         throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                  MEL_EXN_ID: $$Error$8,
-                  _1: lid$1.loc,
-                  _2: {
-                    TAG: /* Rebind_wrong_type */13,
-                    _0: lid$1.txt,
-                    _1: env,
-                    _2: trace._1
-                  }
-                });
+              MEL_EXN_ID: $$Error$8,
+              _1: lid$1.loc,
+              _2: {
+                TAG: /* Rebind_wrong_type */13,
+                _0: lid$1.txt,
+                _1: env,
+                _2: trace._1
+              }
+            });
       }
       throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
     }
@@ -75205,13 +75205,13 @@ function transl_extension_constructor(env, check_open, type_path, type_params, t
     let match$5;
     if (/* tag */typeof match$4 === "number" || typeof match$4 === "string") {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  47376,
-                  17
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              47376,
+              17
+            ]
+          });
     }
     if (match$4.TAG === /* Tconstr */3) {
       const p = match$4._0;
@@ -75222,13 +75222,13 @@ function transl_extension_constructor(env, check_open, type_path, type_params, t
       ];
     } else {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  47376,
-                  17
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              47376,
+              17
+            ]
+          });
     }
     const cstr_type_params = match$5[1];
     const cstr_type_path = match$5[0];
@@ -75258,26 +75258,26 @@ function transl_extension_constructor(env, check_open, type_path, type_params, t
     };
     if (!equal$5(env, true, cstr_types, ext_types)) {
       throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                MEL_EXN_ID: $$Error$8,
-                _1: lid$1.loc,
-                _2: {
-                  TAG: /* Rebind_mismatch */14,
-                  _0: lid$1.txt,
-                  _1: cstr_type_path,
-                  _2: type_path
-                }
-              });
+            MEL_EXN_ID: $$Error$8,
+            _1: lid$1.loc,
+            _2: {
+              TAG: /* Rebind_mismatch */14,
+              _0: lid$1.txt,
+              _1: cstr_type_path,
+              _2: type_path
+            }
+          });
     }
     const match$6 = cdescr.cstr_private;
     if (match$6 === /* Private */0 && priv !== /* Private */0) {
       throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                MEL_EXN_ID: $$Error$8,
-                _1: lid$1.loc,
-                _2: {
-                  TAG: /* Rebind_private */15,
-                  _0: lid$1.txt
-                }
-              });
+            MEL_EXN_ID: $$Error$8,
+            _1: lid$1.loc,
+            _2: {
+              TAG: /* Rebind_private */15,
+              _0: lid$1.txt
+            }
+          });
     }
     const match$7 = cdescr.cstr_tag;
     let path;
@@ -75285,13 +75285,13 @@ function transl_extension_constructor(env, check_open, type_path, type_params, t
       case /* Cstr_constant */0 :
       case /* Cstr_block */1 :
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      47401,
-                      17
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  47401,
+                  17
+                ]
+              });
       case /* Cstr_extension */2 :
           path = match$7._0;
           break;
@@ -75321,13 +75321,13 @@ function transl_extension_constructor(env, check_open, type_path, type_params, t
     ext_attributes: ext_ext_attributes
   };
   return {
-          ext_id: id,
-          ext_name: sext.pext_name,
-          ext_type: ext,
-          ext_kind: match[2],
-          ext_loc: sext.pext_loc,
-          ext_attributes: sext.pext_attributes
-        };
+    ext_id: id,
+    ext_name: sext.pext_name,
+    ext_type: ext,
+    ext_kind: match[2],
+    ext_loc: sext.pext_loc,
+    ext_attributes: sext.pext_attributes
+  };
 }
 
 function transl_type_extension(check_open, env, loc, styext) {
@@ -75348,13 +75348,13 @@ function transl_type_extension(check_open, env, loc, styext) {
                 }
               }), styext.ptyext_constructors);
         throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                  MEL_EXN_ID: $$Error$8,
-                  _1: match$2.pext_loc,
-                  _2: {
-                    TAG: /* Not_open_type */10,
-                    _0: type_path
-                  }
-                });
+              MEL_EXN_ID: $$Error$8,
+              _1: match$2.pext_loc,
+              _2: {
+                TAG: /* Not_open_type */10,
+                _0: type_path
+              }
+            });
       }
       catch (raw_exn){
         const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -75368,35 +75368,35 @@ function transl_type_extension(check_open, env, loc, styext) {
   } else {
     if (match$1.TAG === /* Type_record */0) {
       throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                MEL_EXN_ID: $$Error$8,
-                _1: loc,
-                _2: {
-                  TAG: /* Not_extensible_type */11,
-                  _0: type_path
-                }
-              });
+            MEL_EXN_ID: $$Error$8,
+            _1: loc,
+            _2: {
+              TAG: /* Not_extensible_type */11,
+              _0: type_path
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError($$Error$8, {
-              MEL_EXN_ID: $$Error$8,
-              _1: loc,
-              _2: {
-                TAG: /* Not_extensible_type */11,
-                _0: type_path
-              }
-            });
+          MEL_EXN_ID: $$Error$8,
+          _1: loc,
+          _2: {
+            TAG: /* Not_extensible_type */11,
+            _0: type_path
+          }
+        });
   }
   const type_variance = Stdlib__List.map((function (v) {
           const match = Curry._1(Types_Variance.get_upper, v);
           return [
-                  !match[1],
-                  !match[0],
-                  false
-                ];
+            !match[1],
+            !match[0],
+            false
+          ];
         }), type_decl.type_variance);
   const err = type_decl.type_arity !== Stdlib__List.length(styext.ptyext_params) ? ({
-        hd: /* Arity */0,
-        tl: /* [] */0
-      }) : (
+      hd: /* Arity */0,
+      tl: /* [] */0
+    }) : (
       Stdlib__List.for_all2((function (param, param$1) {
               if (!param$1[0] || param[0]) {
                 if (param$1[1]) {
@@ -75410,20 +75410,20 @@ function transl_type_extension(check_open, env, loc, styext) {
             }), type_variance, add_injectivity(Stdlib__List.map((function (prim) {
                       return prim[1];
                     }), styext.ptyext_params))) ? /* [] */0 : ({
-            hd: /* Variance */5,
-            tl: /* [] */0
-          })
+          hd: /* Variance */5,
+          tl: /* [] */0
+        })
     );
   if (Caml_obj.caml_notequal(err, /* [] */0)) {
     throw new Caml_js_exceptions.MelangeError($$Error$8, {
-              MEL_EXN_ID: $$Error$8,
-              _1: loc,
-              _2: {
-                TAG: /* Extension_mismatch */12,
-                _0: type_path,
-                _1: err
-              }
-            });
+          MEL_EXN_ID: $$Error$8,
+          _1: loc,
+          _2: {
+            TAG: /* Extension_mismatch */12,
+            _0: type_path,
+            _1: err
+          }
+        });
   }
   const ttype_params = make_params(env, styext.ptyext_params);
   const type_params = Stdlib__List.map((function (param) {
@@ -75449,14 +75449,14 @@ function transl_type_extension(check_open, env, loc, styext) {
             return ;
           }
           throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                    MEL_EXN_ID: $$Error$8,
-                    _1: ext.ext_loc,
-                    _2: {
-                      TAG: /* Unbound_type_var_ext */19,
-                      _0: ty,
-                      _1: ext.ext_type
-                    }
-                  });
+                MEL_EXN_ID: $$Error$8,
+                _1: ext.ext_loc,
+                _2: {
+                  TAG: /* Unbound_type_var_ext */19,
+                  _0: ty,
+                  _1: ext.ext_type
+                }
+              });
         }), constructors);
   Stdlib__List.iter((function (ext) {
           compute_variance_extension(env, true, type_decl, ext.ext_type, [
@@ -75479,9 +75479,9 @@ function transl_type_extension(check_open, env, loc, styext) {
     tyext_attributes: tyext_tyext_attributes
   };
   return [
-          tyext,
-          newenv
-        ];
+    tyext,
+    newenv
+  ];
 }
 
 function transl_exception(env, sext) {
@@ -75494,20 +75494,20 @@ function transl_exception(env, sext) {
   const ty = closed_extension_constructor(ext.ext_type);
   if (ty !== undefined) {
     throw new Caml_js_exceptions.MelangeError($$Error$8, {
-              MEL_EXN_ID: $$Error$8,
-              _1: ext.ext_loc,
-              _2: {
-                TAG: /* Unbound_type_var_ext */19,
-                _0: ty,
-                _1: ext.ext_type
-              }
-            });
+          MEL_EXN_ID: $$Error$8,
+          _1: ext.ext_loc,
+          _2: {
+            TAG: /* Unbound_type_var_ext */19,
+            _0: ty,
+            _1: ext.ext_type
+          }
+        });
   }
   const newenv = add_extension(true, ext.ext_id, ext.ext_type, env);
   return [
-          ext,
-          newenv
-        ];
+    ext,
+    newenv
+  ];
 }
 
 function customize_arity(arity, pval_attributes) {
@@ -75567,17 +75567,17 @@ function transl_value_decl(env, loc, valdecl) {
     const prim_native_name = prim.prim_native_name;
     if (arity$1 === 0 && !(prim_native_name.length > 3 && prim_native_name[0] === "B" && prim_native_name[1] === "S" && prim_native_name[2] === ":") && (prim.prim_name.length === 0 || Caml_string.get(prim.prim_name, 0) !== /* '%' */37 && Caml_string.get(prim.prim_name, 0) !== /* '#' */35)) {
       throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                MEL_EXN_ID: $$Error$8,
-                _1: valdecl.pval_type.ptyp_loc,
-                _2: /* Null_arity_external */2
-              });
+            MEL_EXN_ID: $$Error$8,
+            _1: valdecl.pval_type.ptyp_loc,
+            _2: /* Null_arity_external */2
+          });
     }
     if (native_code.contents && prim.prim_arity > 5 && prim_native_name === "") {
       throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                MEL_EXN_ID: $$Error$8,
-                _1: valdecl.pval_type.ptyp_loc,
-                _2: /* Missing_native_external */3
-              });
+            MEL_EXN_ID: $$Error$8,
+            _1: valdecl.pval_type.ptyp_loc,
+            _2: /* Missing_native_external */3
+          });
     }
     v = {
       val_type: ty,
@@ -75598,9 +75598,9 @@ function transl_value_decl(env, loc, valdecl) {
   }
   const match = enter_value((function (s) {
             return {
-                    TAG: /* Unused_value_declaration */16,
-                    _0: s
-                  };
+              TAG: /* Unused_value_declaration */16,
+              _0: s
+            };
           }))(valdecl.pval_name.txt, v, env);
   const desc_val_id = match[0];
   const desc_val_name = valdecl.pval_name;
@@ -75617,9 +75617,9 @@ function transl_value_decl(env, loc, valdecl) {
     val_attributes: desc_val_attributes
   };
   return [
-          desc,
-          match[1]
-        ];
+    desc,
+    match[1]
+  ];
 }
 
 function transl_with_constraint(env, id, row_path, orig_decl, sdecl) {
@@ -75646,23 +75646,23 @@ function transl_with_constraint(env, id, row_path, orig_decl, sdecl) {
             const ty$p = cty$p.ctyp_type;
             unify$2(env, ty, ty$p);
             return [
-                    cty,
-                    cty$p,
-                    loc
-                  ];
+              cty,
+              cty$p,
+              loc
+            ];
           }
           catch (raw_tr){
             const tr = Caml_js_exceptions.internalToOCamlException(raw_tr);
             if (tr.MEL_EXN_ID === Unify) {
               throw new Caml_js_exceptions.MelangeError($$Error$8, {
-                        MEL_EXN_ID: $$Error$8,
-                        _1: loc,
-                        _2: {
-                          TAG: /* Inconsistent_constraint */6,
-                          _0: env,
-                          _1: tr._1
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$8,
+                    _1: loc,
+                    _2: {
+                      TAG: /* Inconsistent_constraint */6,
+                      _0: env,
+                      _1: tr._1
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(tr.MEL_EXN_ID, tr);
           }
@@ -75713,14 +75713,14 @@ function transl_with_constraint(env, id, row_path, orig_decl, sdecl) {
   const ty = closed_type_decl(decl);
   if (ty !== undefined) {
     throw new Caml_js_exceptions.MelangeError($$Error$8, {
-              MEL_EXN_ID: $$Error$8,
-              _1: sdecl.ptype_loc,
-              _2: {
-                TAG: /* Unbound_type_var */9,
-                _0: ty,
-                _1: decl
-              }
-            });
+          MEL_EXN_ID: $$Error$8,
+          _1: sdecl.ptype_loc,
+          _2: {
+            TAG: /* Unbound_type_var */9,
+            _0: ty,
+            _1: decl
+          }
+        });
   }
   const decl$1 = name_recursion(sdecl, id, decl);
   const decl_type_params = decl$1.type_params;
@@ -75751,17 +75751,17 @@ function transl_with_constraint(env, id, row_path, orig_decl, sdecl) {
   end_def(undefined);
   generalize_decl(decl$2);
   return {
-          typ_id: id,
-          typ_name: sdecl.ptype_name,
-          typ_params: tparams,
-          typ_type: decl$2,
-          typ_cstrs: constraints,
-          typ_kind: /* Ttype_abstract */0,
-          typ_private: sdecl.ptype_private,
-          typ_manifest: match[0],
-          typ_loc: sdecl.ptype_loc,
-          typ_attributes: sdecl.ptype_attributes
-        };
+    typ_id: id,
+    typ_name: sdecl.ptype_name,
+    typ_params: tparams,
+    typ_type: decl$2,
+    typ_cstrs: constraints,
+    typ_kind: /* Ttype_abstract */0,
+    typ_private: sdecl.ptype_private,
+    typ_manifest: match[0],
+    typ_loc: sdecl.ptype_loc,
+    typ_attributes: sdecl.ptype_attributes
+  };
 }
 
 function abstract_type_decl(arity) {
@@ -75770,9 +75770,9 @@ function abstract_type_decl(arity) {
       return /* [] */0;
     } else {
       return {
-              hd: newvar(undefined, undefined),
-              tl: make_params(n - 1 | 0)
-            };
+        hd: newvar(undefined, undefined),
+        tl: make_params(n - 1 | 0)
+      };
     }
   };
   begin_def(undefined);
@@ -75796,11 +75796,11 @@ function abstract_type_decl(arity) {
 
 function approx_type_decl(env, sdecl_list) {
   return Stdlib__List.map((function (sdecl) {
-                return [
-                        create(sdecl.ptype_name.txt),
-                        abstract_type_decl(Stdlib__List.length(sdecl.ptype_params))
-                      ];
-              }), sdecl_list);
+          return [
+            create(sdecl.ptype_name.txt),
+            abstract_type_decl(Stdlib__List.length(sdecl.ptype_params))
+          ];
+        }), sdecl_list);
 }
 
 function explain_unbound(ppf, tv, tl, typ, kwd, lab) {
@@ -75823,69 +75823,66 @@ function explain_unbound(ppf, tv, tl, typ, kwd, lab) {
           }
         });
     return Curry._6(Stdlib__Format.fprintf(ppf)({
-                    TAG: /* Format */0,
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char_literal */12,
+                _0: /* '.' */46,
+                _1: {
+                  TAG: /* Formatting_lit */17,
+                  _0: /* Flush_newline */4,
+                  _1: {
+                    TAG: /* Formatting_gen */18,
                     _0: {
-                      TAG: /* Char_literal */12,
-                      _0: /* '.' */46,
+                      TAG: /* Open_box */1,
+                      _0: {
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: "<hov2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hov2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* String_literal */11,
+                      _0: "In ",
                       _1: {
-                        TAG: /* Formatting_lit */17,
-                        _0: /* Flush_newline */4,
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
                         _1: {
-                          TAG: /* Formatting_gen */18,
+                          TAG: /* Formatting_lit */17,
                           _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hov2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hov2>"
-                            }
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
                           },
                           _1: {
-                            TAG: /* String_literal */11,
-                            _0: "In ",
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
+                              TAG: /* Alpha */15,
+                              _0: {
                                 TAG: /* Formatting_lit */17,
                                 _0: {
                                   TAG: /* Break */0,
-                                  _0: "@ ",
+                                  _0: "@;<1 -2>",
                                   _1: 1,
-                                  _2: 0
+                                  _2: -2
                                 },
                                 _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
+                                  TAG: /* String_literal */11,
+                                  _0: "the variable ",
                                   _1: {
                                     TAG: /* Alpha */15,
                                     _0: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@;<1 -2>",
-                                        _1: 1,
-                                        _2: -2
-                                      },
+                                      TAG: /* String_literal */11,
+                                      _0: " is unbound",
                                       _1: {
-                                        TAG: /* String_literal */11,
-                                        _0: "the variable ",
-                                        _1: {
-                                          TAG: /* Alpha */15,
-                                          _0: {
-                                            TAG: /* String_literal */11,
-                                            _0: " is unbound",
-                                            _1: {
-                                              TAG: /* Formatting_lit */17,
-                                              _0: /* Close_box */0,
-                                              _1: /* End_of_format */0
-                                            }
-                                          }
-                                        }
+                                        TAG: /* Formatting_lit */17,
+                                        _0: /* Close_box */0,
+                                        _1: /* End_of_format */0
                                       }
                                     }
                                   }
@@ -75895,9 +75892,12 @@ function explain_unbound(ppf, tv, tl, typ, kwd, lab) {
                           }
                         }
                       }
-                    },
-                    _1: ".@.@[<hov2>In %s@ %s%a@;<1 -2>the variable %a is unbound@]"
-                  }), kwd, Curry._1(lab, ti), type_expr$1, Curry._1(typ, ti), type_expr$1, tv);
+                    }
+                  }
+                }
+              },
+              _1: ".@.@[<hov2>In %s@ %s%a@;<1 -2>the variable %a is unbound@]"
+            }), kwd, Curry._1(lab, ti), type_expr$1, Curry._1(typ, ti), type_expr$1, tv);
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -75913,352 +75913,352 @@ function report_error$5(ppf, s) {
     switch (s) {
       case /* Repeated_parameter */0 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "A type parameter occurs several times",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "A type parameter occurs several times"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "A type parameter occurs several times",
+                  _1: /* End_of_format */0
+                },
+                _1: "A type parameter occurs several times"
+              });
       case /* Too_many_constructors */1 :
           return Curry._2(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
                           TAG: /* Format */0,
+                          _0: /* End_of_format */0,
+                          _1: ""
+                        }
+                      },
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "Too many non-constant constructors",
+                        _1: {
+                          TAG: /* Formatting_lit */17,
                           _0: {
-                            TAG: /* Formatting_gen */18,
-                            _0: {
-                              TAG: /* Open_box */1,
-                              _0: {
-                                TAG: /* Format */0,
-                                _0: /* End_of_format */0,
-                                _1: ""
-                              }
-                            },
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
+                          _1: {
+                            TAG: /* String_literal */11,
+                            _0: "-- maximum is ",
                             _1: {
-                              TAG: /* String_literal */11,
-                              _0: "Too many non-constant constructors",
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
+                              TAG: /* Int */4,
+                              _0: /* Int_i */3,
+                              _1: /* No_padding */0,
+                              _2: /* No_precision */0,
+                              _3: {
+                                TAG: /* Char_literal */12,
+                                _0: /* ' ' */32,
                                 _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: "-- maximum is ",
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
                                   _1: {
-                                    TAG: /* Int */4,
-                                    _0: /* Int_i */3,
-                                    _1: /* No_padding */0,
-                                    _2: /* No_precision */0,
-                                    _3: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* ' ' */32,
-                                      _1: {
-                                        TAG: /* String */2,
-                                        _0: /* No_padding */0,
-                                        _1: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: /* Close_box */0,
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
+                                    TAG: /* Formatting_lit */17,
+                                    _0: /* Close_box */0,
+                                    _1: /* End_of_format */0
                                   }
                                 }
                               }
                             }
-                          },
-                          _1: "@[Too many non-constant constructors@ -- maximum is %i %s@]"
-                        }), 246, "non-constant constructors");
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[Too many non-constant constructors@ -- maximum is %i %s@]"
+                  }), 246, "non-constant constructors");
       case /* Null_arity_external */2 :
           return Stdlib__Format.fprintf(ppf)({
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "External identifiers must be functions",
+                  _1: /* End_of_format */0
+                },
+                _1: "External identifiers must be functions"
+              });
+      case /* Missing_native_external */3 :
+          return Stdlib__Format.fprintf(ppf)({
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Formatting_gen */18,
+                  _0: {
+                    TAG: /* Open_box */1,
+                    _0: {
                       TAG: /* Format */0,
                       _0: {
                         TAG: /* String_literal */11,
-                        _0: "External identifiers must be functions",
+                        _0: "<hv>",
                         _1: /* End_of_format */0
                       },
-                      _1: "External identifiers must be functions"
-                    });
-      case /* Missing_native_external */3 :
-          return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
+                      _1: "<hv>"
+                    }
+                  },
+                  _1: {
+                    TAG: /* String_literal */11,
+                    _0: "An external function with more than 5 arguments requires a second stub function",
+                    _1: {
+                      TAG: /* Formatting_lit */17,
                       _0: {
-                        TAG: /* Formatting_gen */18,
-                        _0: {
-                          TAG: /* Open_box */1,
-                          _0: {
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: "<hv>",
-                              _1: /* End_of_format */0
-                            },
-                            _1: "<hv>"
-                          }
-                        },
+                        TAG: /* Break */0,
+                        _0: "@ ",
+                        _1: 1,
+                        _2: 0
+                      },
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "for native-code compilation",
                         _1: {
-                          TAG: /* String_literal */11,
-                          _0: "An external function with more than 5 arguments requires a second stub function",
-                          _1: {
-                            TAG: /* Formatting_lit */17,
-                            _0: {
-                              TAG: /* Break */0,
-                              _0: "@ ",
-                              _1: 1,
-                              _2: 0
-                            },
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: "for native-code compilation",
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: /* Close_box */0,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
+                          TAG: /* Formatting_lit */17,
+                          _0: /* Close_box */0,
+                          _1: /* End_of_format */0
                         }
-                      },
-                      _1: "@[<hv>An external function with more than 5 arguments requires a second stub function@ for native-code compilation@]"
-                    });
+                      }
+                    }
+                  }
+                },
+                _1: "@[<hv>An external function with more than 5 arguments requires a second stub function@ for native-code compilation@]"
+              });
       case /* Varying_anonymous */4 :
           return Curry._3(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
                           TAG: /* Format */0,
+                          _0: /* End_of_format */0,
+                          _1: ""
+                        }
+                      },
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
                           _0: {
-                            TAG: /* Formatting_gen */18,
-                            _0: {
-                              TAG: /* Open_box */1,
-                              _0: {
-                                TAG: /* Format */0,
-                                _0: /* End_of_format */0,
-                                _1: ""
-                              }
-                            },
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                              TAG: /* Formatting_lit */17,
+                              _0: {
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
+                              },
                               _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
                                 _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@ ",
-                                      _1: 1,
-                                      _2: 0
-                                    },
-                                    _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
+                                  TAG: /* Formatting_lit */17,
+                                  _0: /* Close_box */0,
+                                  _1: /* End_of_format */0
                                 }
                               }
                             }
-                          },
-                          _1: "@[%s@ %s@ %s@]"
-                        }), "In this GADT definition,", "the variance of some parameter", "cannot be checked");
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[%s@ %s@ %s@]"
+                  }), "In this GADT definition,", "the variance of some parameter", "cannot be checked");
       
     }
   } else {
     switch (s.TAG) {
       case /* Duplicate_constructor */0 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Two constructors are named ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          },
-                          _1: "Two constructors are named %s"
-                        }), s._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Two constructors are named ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
+                      }
+                    },
+                    _1: "Two constructors are named %s"
+                  }), s._0);
       case /* Duplicate_label */1 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Two labels are named ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          },
-                          _1: "Two labels are named %s"
-                        }), s._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Two labels are named ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
+                      }
+                    },
+                    _1: "Two labels are named %s"
+                  }), s._0);
       case /* Recursive_abbrev */2 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "The type abbreviation ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: " is cyclic",
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "The type abbreviation %s is cyclic"
-                        }), s._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "The type abbreviation ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " is cyclic",
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "The type abbreviation %s is cyclic"
+                  }), s._0);
       case /* Cycle_in_def */3 :
           const ty = s._1;
           reset(undefined);
           mark_loops(ty);
           return Curry._3(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
                           TAG: /* Format */0,
                           _0: {
-                            TAG: /* Formatting_gen */18,
-                            _0: {
-                              TAG: /* Open_box */1,
+                            TAG: /* String_literal */11,
+                            _0: "<v>",
+                            _1: /* End_of_format */0
+                          },
+                          _1: "<v>"
+                        }
+                      },
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "The definition of ",
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
+                          _1: {
+                            TAG: /* String_literal */11,
+                            _0: " contains a cycle:",
+                            _1: {
+                              TAG: /* Formatting_lit */17,
                               _0: {
-                                TAG: /* Format */0,
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
+                              },
+                              _1: {
+                                TAG: /* Alpha */15,
                                 _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "<v>",
+                                  TAG: /* Formatting_lit */17,
+                                  _0: /* Close_box */0,
                                   _1: /* End_of_format */0
-                                },
-                                _1: "<v>"
-                              }
-                            },
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: "The definition of ",
-                              _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: " contains a cycle:",
-                                  _1: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@ ",
-                                      _1: 1,
-                                      _2: 0
-                                    },
-                                    _1: {
-                                      TAG: /* Alpha */15,
-                                      _0: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
                                 }
                               }
                             }
-                          },
-                          _1: "@[<v>The definition of %s contains a cycle:@ %a@]"
-                        }), s._0, type_expr$1, ty);
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[<v>The definition of %s contains a cycle:@ %a@]"
+                  }), s._0, type_expr$1, ty);
       case /* Definition_mismatch */4 :
           const ty$1 = s._0;
           reset(undefined);
           mark_loops(ty$1);
           return Curry._6(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
                           TAG: /* Format */0,
                           _0: {
-                            TAG: /* Formatting_gen */18,
+                            TAG: /* String_literal */11,
+                            _0: "<v>",
+                            _1: /* End_of_format */0
+                          },
+                          _1: "<v>"
+                        }
+                      },
+                      _1: {
+                        TAG: /* Formatting_gen */18,
+                        _0: {
+                          TAG: /* Open_box */1,
+                          _0: {
+                            TAG: /* Format */0,
                             _0: {
-                              TAG: /* Open_box */1,
-                              _0: {
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "<v>",
-                                  _1: /* End_of_format */0
-                                },
-                                _1: "<v>"
-                              }
+                              TAG: /* String_literal */11,
+                              _0: "<hov>",
+                              _1: /* End_of_format */0
+                            },
+                            _1: "<hov>"
+                          }
+                        },
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
+                          _1: {
+                            TAG: /* Formatting_lit */17,
+                            _0: {
+                              TAG: /* Break */0,
+                              _0: "@ ",
+                              _1: 1,
+                              _2: 0
                             },
                             _1: {
-                              TAG: /* Formatting_gen */18,
-                              _0: {
-                                TAG: /* Open_box */1,
-                                _0: {
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* String_literal */11,
-                                    _0: "<hov>",
-                                    _1: /* End_of_format */0
-                                  },
-                                  _1: "<hov>"
-                                }
-                              },
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
                               _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
+                                TAG: /* Formatting_lit */17,
+                                _0: {
+                                  TAG: /* Break */0,
+                                  _0: "@;<1 2>",
+                                  _1: 1,
+                                  _2: 2
+                                },
                                 _1: {
-                                  TAG: /* Formatting_lit */17,
+                                  TAG: /* Alpha */15,
                                   _0: {
-                                    TAG: /* Break */0,
-                                    _0: "@ ",
-                                    _1: 1,
-                                    _2: 0
-                                  },
-                                  _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
+                                    TAG: /* Formatting_lit */17,
+                                    _0: /* Close_box */0,
                                     _1: {
-                                      TAG: /* Formatting_lit */17,
+                                      TAG: /* Alpha */15,
                                       _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@;<1 2>",
-                                        _1: 1,
-                                        _2: 2
-                                      },
-                                      _1: {
-                                        TAG: /* Alpha */15,
-                                        _0: {
-                                          TAG: /* Formatting_lit */17,
-                                          _0: /* Close_box */0,
-                                          _1: {
-                                            TAG: /* Alpha */15,
-                                            _0: {
-                                              TAG: /* Formatting_lit */17,
-                                              _0: /* Close_box */0,
-                                              _1: /* End_of_format */0
-                                            }
-                                          }
-                                        }
+                                        TAG: /* Formatting_lit */17,
+                                        _0: /* Close_box */0,
+                                        _1: /* End_of_format */0
                                       }
                                     }
                                   }
                                 }
                               }
                             }
-                          },
-                          _1: "@[<v>@[<hov>%s@ %s@;<1 2>%a@]%a@]"
-                        }), "This variant or record definition", "does not match that of type", type_expr$1, ty$1, (function (param) {
-                        return report_type_mismatch("the original", "this", "definition", param);
-                      }), s._1);
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[<v>@[<hov>%s@ %s@;<1 2>%a@]%a@]"
+                  }), "This variant or record definition", "does not match that of type", type_expr$1, ty$1, (function (param) {
+                  return report_type_mismatch("the original", "this", "definition", param);
+                }), s._1);
       case /* Constraint_failed */5 :
           const ty$p = s._1;
           const ty$2 = s._0;
@@ -76266,20 +76266,45 @@ function report_error$5(ppf, s) {
           mark_loops(ty$2);
           mark_loops(ty$p);
           return Curry._5(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
                           TAG: /* Format */0,
+                          _0: /* End_of_format */0,
+                          _1: ""
+                        }
+                      },
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
                           _0: {
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
+                          _1: {
                             TAG: /* Formatting_gen */18,
                             _0: {
                               TAG: /* Open_box */1,
                               _0: {
                                 TAG: /* Format */0,
-                                _0: /* End_of_format */0,
-                                _1: ""
+                                _0: {
+                                  TAG: /* String_literal */11,
+                                  _0: "<hv>",
+                                  _1: /* End_of_format */0
+                                },
+                                _1: "<hv>"
                               }
                             },
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                              TAG: /* String_literal */11,
+                              _0: "Type",
                               _1: {
                                 TAG: /* Formatting_lit */17,
                                 _0: {
@@ -76289,63 +76314,35 @@ function report_error$5(ppf, s) {
                                   _2: 0
                                 },
                                 _1: {
-                                  TAG: /* Formatting_gen */18,
+                                  TAG: /* Alpha */15,
                                   _0: {
-                                    TAG: /* Open_box */1,
+                                    TAG: /* Formatting_lit */17,
                                     _0: {
-                                      TAG: /* Format */0,
-                                      _0: {
-                                        TAG: /* String_literal */11,
-                                        _0: "<hv>",
-                                        _1: /* End_of_format */0
-                                      },
-                                      _1: "<hv>"
-                                    }
-                                  },
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: "Type",
+                                      TAG: /* Break */0,
+                                      _0: "@ ",
+                                      _1: 1,
+                                      _2: 0
+                                    },
                                     _1: {
-                                      TAG: /* Formatting_lit */17,
-                                      _0: {
-                                        TAG: /* Break */0,
-                                        _0: "@ ",
-                                        _1: 1,
-                                        _2: 0
-                                      },
+                                      TAG: /* String_literal */11,
+                                      _0: "should be an instance of",
                                       _1: {
-                                        TAG: /* Alpha */15,
+                                        TAG: /* Formatting_lit */17,
                                         _0: {
-                                          TAG: /* Formatting_lit */17,
+                                          TAG: /* Break */0,
+                                          _0: "@ ",
+                                          _1: 1,
+                                          _2: 0
+                                        },
+                                        _1: {
+                                          TAG: /* Alpha */15,
                                           _0: {
-                                            TAG: /* Break */0,
-                                            _0: "@ ",
-                                            _1: 1,
-                                            _2: 0
-                                          },
-                                          _1: {
-                                            TAG: /* String_literal */11,
-                                            _0: "should be an instance of",
+                                            TAG: /* Formatting_lit */17,
+                                            _0: /* Close_box */0,
                                             _1: {
                                               TAG: /* Formatting_lit */17,
-                                              _0: {
-                                                TAG: /* Break */0,
-                                                _0: "@ ",
-                                                _1: 1,
-                                                _2: 0
-                                              },
-                                              _1: {
-                                                TAG: /* Alpha */15,
-                                                _0: {
-                                                  TAG: /* Formatting_lit */17,
-                                                  _0: /* Close_box */0,
-                                                  _1: {
-                                                    TAG: /* Formatting_lit */17,
-                                                    _0: /* Close_box */0,
-                                                    _1: /* End_of_format */0
-                                                  }
-                                                }
-                                              }
+                                              _0: /* Close_box */0,
+                                              _1: /* End_of_format */0
                                             }
                                           }
                                         }
@@ -76355,9 +76352,12 @@ function report_error$5(ppf, s) {
                                 }
                               }
                             }
-                          },
-                          _1: "@[%s@ @[<hv>Type@ %a@ should be an instance of@ %a@]@]"
-                        }), "Constraints are not satisfied in this type.", type_expr$1, ty$2, type_expr$1, ty$p);
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[%s@ @[<hv>Type@ %a@ should be an instance of@ %a@]@]"
+                  }), "Constraints are not satisfied in this type.", type_expr$1, ty$2, type_expr$1, ty$p);
       case /* Inconsistent_constraint */6 :
           Stdlib__Format.fprintf(ppf)({
                 TAG: /* Format */0,
@@ -76373,48 +76373,48 @@ function report_error$5(ppf, s) {
                 _1: "The type constraints are not consistent.@."
               });
           return report_unification_error(ppf, s._0, undefined, s._1, (function (ppf) {
-                        Stdlib__Format.fprintf(ppf)({
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "Type",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "Type"
-                            });
-                      }), (function (ppf) {
-                        Stdlib__Format.fprintf(ppf)({
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "is not compatible with type",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "is not compatible with type"
-                            });
-                      }));
+                  Stdlib__Format.fprintf(ppf)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: "Type",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "Type"
+                      });
+                }), (function (ppf) {
+                  Stdlib__Format.fprintf(ppf)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: "is not compatible with type",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "is not compatible with type"
+                      });
+                }));
       case /* Type_clash */7 :
           return report_unification_error(ppf, s._0, undefined, s._1, (function (ppf) {
-                        Stdlib__Format.fprintf(ppf)({
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "This type constructor expands to type",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "This type constructor expands to type"
-                            });
-                      }), (function (ppf) {
-                        Stdlib__Format.fprintf(ppf)({
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "but is used here with type",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "but is used here with type"
-                            });
-                      }));
+                  Stdlib__Format.fprintf(ppf)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: "This type constructor expands to type",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "This type constructor expands to type"
+                      });
+                }), (function (ppf) {
+                  Stdlib__Format.fprintf(ppf)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: "but is used here with type",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "but is used here with type"
+                      });
+                }));
       case /* Parameters_differ */8 :
           const ty$p$1 = s._2;
           const ty$3 = s._1;
@@ -76422,68 +76422,65 @@ function report_error$5(ppf, s) {
           mark_loops(ty$3);
           mark_loops(ty$p$1);
           return Curry._5(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
                           TAG: /* Format */0,
                           _0: {
-                            TAG: /* Formatting_gen */18,
-                            _0: {
-                              TAG: /* Open_box */1,
-                              _0: {
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "<hv>",
-                                  _1: /* End_of_format */0
-                                },
-                                _1: "<hv>"
-                              }
-                            },
+                            TAG: /* String_literal */11,
+                            _0: "<hv>",
+                            _1: /* End_of_format */0
+                          },
+                          _1: "<hv>"
+                        }
+                      },
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "In the definition of ",
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
+                          _1: {
+                            TAG: /* String_literal */11,
+                            _0: ", type",
                             _1: {
-                              TAG: /* String_literal */11,
-                              _0: "In the definition of ",
+                              TAG: /* Formatting_lit */17,
+                              _0: {
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
+                              },
                               _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: ", type",
+                                TAG: /* Alpha */15,
+                                _0: {
+                                  TAG: /* Formatting_lit */17,
+                                  _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@ ",
+                                    _1: 1,
+                                    _2: 0
+                                  },
                                   _1: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@ ",
-                                      _1: 1,
-                                      _2: 0
-                                    },
+                                    TAG: /* String_literal */11,
+                                    _0: "should be",
                                     _1: {
-                                      TAG: /* Alpha */15,
+                                      TAG: /* Formatting_lit */17,
                                       _0: {
-                                        TAG: /* Formatting_lit */17,
+                                        TAG: /* Break */0,
+                                        _0: "@ ",
+                                        _1: 1,
+                                        _2: 0
+                                      },
+                                      _1: {
+                                        TAG: /* Alpha */15,
                                         _0: {
-                                          TAG: /* Break */0,
-                                          _0: "@ ",
-                                          _1: 1,
-                                          _2: 0
-                                        },
-                                        _1: {
-                                          TAG: /* String_literal */11,
-                                          _0: "should be",
-                                          _1: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: {
-                                              TAG: /* Break */0,
-                                              _0: "@ ",
-                                              _1: 1,
-                                              _2: 0
-                                            },
-                                            _1: {
-                                              TAG: /* Alpha */15,
-                                              _0: {
-                                                TAG: /* Formatting_lit */17,
-                                                _0: /* Close_box */0,
-                                                _1: /* End_of_format */0
-                                              }
-                                            }
-                                          }
+                                          TAG: /* Formatting_lit */17,
+                                          _0: /* Close_box */0,
+                                          _1: /* End_of_format */0
                                         }
                                       }
                                     }
@@ -76491,9 +76488,12 @@ function report_error$5(ppf, s) {
                                 }
                               }
                             }
-                          },
-                          _1: "@[<hv>In the definition of %s, type@ %a@ should be@ %a@]"
-                        }), name(undefined, s._0), type_expr$1, ty$3, type_expr$1, ty$p$1);
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[<hv>In the definition of %s, type@ %a@ should be@ %a@]"
+                  }), name(undefined, s._0), type_expr$1, ty$3, type_expr$1, ty$p$1);
       case /* Unbound_type_var */9 :
           const decl = s._1;
           Stdlib__Format.fprintf(ppf)({
@@ -76531,10 +76531,10 @@ function report_error$5(ppf, s) {
                       return trivial(match$1);
                     } else {
                       return explain_unbound(ppf, ty$4, match$2[0], (function (param) {
-                                    return param[2];
-                                  }), "method", (function (param) {
-                                    return param[0] + ": ";
-                                  }));
+                              return param[2];
+                            }), "method", (function (param) {
+                              return param[0] + ": ";
+                            }));
                     }
                 case /* Tvariant */8 :
                     const row$1 = row_repr_aux(/* [] */0, row._0);
@@ -76542,36 +76542,36 @@ function report_error$5(ppf, s) {
                       return trivial(match$1);
                     } else {
                       return explain_unbound(ppf, ty$4, row$1.row_fields, (function (param) {
-                                    const match = row_field_repr_aux(/* [] */0, param[1]);
-                                    if (/* tag */typeof match === "number" || typeof match === "string") {
-                                      return newty2(100000000, {
-                                                  TAG: /* Ttuple */2,
-                                                  _0: /* [] */0
-                                                });
-                                    }
-                                    if (match.TAG === /* Rpresent */0) {
-                                      const t = match._0;
-                                      if (t !== undefined) {
-                                        return t;
-                                      } else {
-                                        return newty2(100000000, {
-                                                    TAG: /* Ttuple */2,
-                                                    _0: /* [] */0
-                                                  });
-                                      }
-                                    }
-                                    const match$1 = match._1;
-                                    if (match$1 && !match$1.tl) {
-                                      return match$1.hd;
-                                    } else {
-                                      return newty2(100000000, {
-                                                  TAG: /* Ttuple */2,
-                                                  _0: match._1
-                                                });
-                                    }
-                                  }), "case", (function (param) {
-                                    return "`" + (param[0] + " of ");
-                                  }));
+                              const match = row_field_repr_aux(/* [] */0, param[1]);
+                              if (/* tag */typeof match === "number" || typeof match === "string") {
+                                return newty2(100000000, {
+                                      TAG: /* Ttuple */2,
+                                      _0: /* [] */0
+                                    });
+                              }
+                              if (match.TAG === /* Rpresent */0) {
+                                const t = match._0;
+                                if (t !== undefined) {
+                                  return t;
+                                } else {
+                                  return newty2(100000000, {
+                                        TAG: /* Ttuple */2,
+                                        _0: /* [] */0
+                                      });
+                                }
+                              }
+                              const match$1 = match._1;
+                              if (match$1 && !match$1.tl) {
+                                return match$1.hd;
+                              } else {
+                                return newty2(100000000, {
+                                      TAG: /* Ttuple */2,
+                                      _0: match._1
+                                    });
+                              }
+                            }), "case", (function (param) {
+                              return "`" + (param[0] + " of ");
+                            }));
                     }
                 default:
                   return trivial(match$1);
@@ -76581,69 +76581,148 @@ function report_error$5(ppf, s) {
             }
           } else if (match.TAG === /* Type_record */0) {
             return explain_unbound(ppf, ty$4, match._0, (function (l) {
-                          return l.ld_type;
-                        }), "field", (function (l) {
-                          return l.ld_id.name + ": ";
-                        }));
+                    return l.ld_type;
+                  }), "field", (function (l) {
+                    return l.ld_id.name + ": ";
+                  }));
           } else {
             return explain_unbound(ppf, ty$4, match._0, (function (c) {
-                          return newty2(100000000, {
-                                      TAG: /* Ttuple */2,
-                                      _0: c.cd_args
-                                    });
-                        }), "case", (function (c) {
-                          return c.cd_id.name + " of ";
-                        }));
+                    return newty2(100000000, {
+                          TAG: /* Ttuple */2,
+                          _0: c.cd_args
+                        });
+                  }), "case", (function (c) {
+                    return c.cd_id.name + " of ";
+                  }));
           }
       case /* Not_open_type */10 :
           return Curry._3(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
                           TAG: /* Format */0,
+                          _0: /* End_of_format */0,
+                          _1: ""
+                        }
+                      },
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
                           _0: {
-                            TAG: /* Formatting_gen */18,
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
+                          _1: {
+                            TAG: /* Alpha */15,
                             _0: {
-                              TAG: /* Open_box */1,
-                              _0: {
-                                TAG: /* Format */0,
-                                _0: /* End_of_format */0,
-                                _1: ""
-                              }
-                            },
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
-                                _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: /* Close_box */0,
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* Formatting_lit */17,
+                              _0: /* Close_box */0,
+                              _1: /* End_of_format */0
                             }
-                          },
-                          _1: "@[%s@ %a@]"
-                        }), "Cannot extend type definition", path, s._0);
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[%s@ %a@]"
+                  }), "Cannot extend type definition", path, s._0);
       case /* Not_extensible_type */11 :
           return Curry._4(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
                           TAG: /* Format */0,
+                          _0: /* End_of_format */0,
+                          _1: ""
+                        }
+                      },
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
                           _0: {
-                            TAG: /* Formatting_gen */18,
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
+                          _1: {
+                            TAG: /* Alpha */15,
                             _0: {
-                              TAG: /* Open_box */1,
+                              TAG: /* Formatting_lit */17,
                               _0: {
-                                TAG: /* Format */0,
-                                _0: /* End_of_format */0,
-                                _1: ""
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
+                              },
+                              _1: {
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
+                                _1: {
+                                  TAG: /* Formatting_lit */17,
+                                  _0: /* Close_box */0,
+                                  _1: /* End_of_format */0
+                                }
                               }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[%s@ %a@ %s@]"
+                  }), "Type", path, s._0, "is not extensible");
+      case /* Extension_mismatch */12 :
+          return Curry._5(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* String_literal */11,
+                            _0: "<v>",
+                            _1: /* End_of_format */0
+                          },
+                          _1: "<v>"
+                        }
+                      },
+                      _1: {
+                        TAG: /* Formatting_gen */18,
+                        _0: {
+                          TAG: /* Open_box */1,
+                          _0: {
+                            TAG: /* Format */0,
+                            _0: {
+                              TAG: /* String_literal */11,
+                              _0: "<hov>",
+                              _1: /* End_of_format */0
+                            },
+                            _1: "<hov>"
+                          }
+                        },
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
+                          _1: {
+                            TAG: /* Formatting_lit */17,
+                            _0: {
+                              TAG: /* Break */0,
+                              _0: "@ ",
+                              _1: 1,
+                              _2: 0
                             },
                             _1: {
                               TAG: /* String */2,
@@ -76652,24 +76731,19 @@ function report_error$5(ppf, s) {
                                 TAG: /* Formatting_lit */17,
                                 _0: {
                                   TAG: /* Break */0,
-                                  _0: "@ ",
+                                  _0: "@;<1 2>",
                                   _1: 1,
-                                  _2: 0
+                                  _2: 2
                                 },
                                 _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: {
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
+                                  _1: {
                                     TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@ ",
-                                      _1: 1,
-                                      _2: 0
-                                    },
+                                    _0: /* Close_box */0,
                                     _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: {
+                                      TAG: /* Alpha */15,
+                                      _0: {
                                         TAG: /* Formatting_lit */17,
                                         _0: /* Close_box */0,
                                         _1: /* End_of_format */0
@@ -76679,39 +76753,86 @@ function report_error$5(ppf, s) {
                                 }
                               }
                             }
-                          },
-                          _1: "@[%s@ %a@ %s@]"
-                        }), "Type", path, s._0, "is not extensible");
-      case /* Extension_mismatch */12 :
-          return Curry._5(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Formatting_gen */18,
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[<v>@[<hov>%s@ %s@;<1 2>%s@]%a@]"
+                  }), "This extension", "does not match the definition of type", name(undefined, s._0), (function (param) {
+                  return report_type_mismatch("the type", "this extension", "definition", param);
+                }), s._1);
+      case /* Rebind_wrong_type */13 :
+          const lid = s._0;
+          return report_unification_error(ppf, s._1, undefined, s._2, (function (ppf) {
+                  Curry._2(Stdlib__Format.fprintf(ppf)({
+                            TAG: /* Format */0,
                             _0: {
-                              TAG: /* Open_box */1,
-                              _0: {
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "<v>",
-                                  _1: /* End_of_format */0
-                                },
-                                _1: "<v>"
-                              }
-                            },
-                            _1: {
-                              TAG: /* Formatting_gen */18,
-                              _0: {
-                                TAG: /* Open_box */1,
+                              TAG: /* String_literal */11,
+                              _0: "The constructor ",
+                              _1: {
+                                TAG: /* Alpha */15,
                                 _0: {
-                                  TAG: /* Format */0,
+                                  TAG: /* Formatting_lit */17,
                                   _0: {
+                                    TAG: /* Break */0,
+                                    _0: "@ ",
+                                    _1: 1,
+                                    _2: 0
+                                  },
+                                  _1: {
                                     TAG: /* String_literal */11,
-                                    _0: "<hov>",
+                                    _0: "has type",
                                     _1: /* End_of_format */0
-                                  },
-                                  _1: "<hov>"
+                                  }
                                 }
+                              }
+                            },
+                            _1: "The constructor %a@ has type"
+                          }), longident, lid);
+                }), (function (ppf) {
+                  Stdlib__Format.fprintf(ppf)({
+                        TAG: /* Format */0,
+                        _0: {
+                          TAG: /* String_literal */11,
+                          _0: "but was expected to be of type",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "but was expected to be of type"
+                      });
+                }));
+      case /* Rebind_mismatch */14 :
+          return Curry._8(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
+                          TAG: /* Format */0,
+                          _0: /* End_of_format */0,
+                          _1: ""
+                        }
+                      },
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
+                          _0: {
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
+                          _1: {
+                            TAG: /* Alpha */15,
+                            _0: {
+                              TAG: /* Formatting_lit */17,
+                              _0: {
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
                               },
                               _1: {
                                 TAG: /* String */2,
@@ -76731,163 +76852,39 @@ function report_error$5(ppf, s) {
                                       TAG: /* Formatting_lit */17,
                                       _0: {
                                         TAG: /* Break */0,
-                                        _0: "@;<1 2>",
+                                        _0: "@ ",
                                         _1: 1,
-                                        _2: 2
+                                        _2: 0
                                       },
                                       _1: {
                                         TAG: /* String */2,
                                         _0: /* No_padding */0,
                                         _1: {
                                           TAG: /* Formatting_lit */17,
-                                          _0: /* Close_box */0,
-                                          _1: {
-                                            TAG: /* Alpha */15,
-                                            _0: {
-                                              TAG: /* Formatting_lit */17,
-                                              _0: /* Close_box */0,
-                                              _1: /* End_of_format */0
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          },
-                          _1: "@[<v>@[<hov>%s@ %s@;<1 2>%s@]%a@]"
-                        }), "This extension", "does not match the definition of type", name(undefined, s._0), (function (param) {
-                        return report_type_mismatch("the type", "this extension", "definition", param);
-                      }), s._1);
-      case /* Rebind_wrong_type */13 :
-          const lid = s._0;
-          return report_unification_error(ppf, s._1, undefined, s._2, (function (ppf) {
-                        Curry._2(Stdlib__Format.fprintf(ppf)({
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* String_literal */11,
-                                    _0: "The constructor ",
-                                    _1: {
-                                      TAG: /* Alpha */15,
-                                      _0: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: {
-                                          TAG: /* Break */0,
-                                          _0: "@ ",
-                                          _1: 1,
-                                          _2: 0
-                                        },
-                                        _1: {
-                                          TAG: /* String_literal */11,
-                                          _0: "has type",
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
-                                  },
-                                  _1: "The constructor %a@ has type"
-                                }), longident, lid);
-                      }), (function (ppf) {
-                        Stdlib__Format.fprintf(ppf)({
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "but was expected to be of type",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "but was expected to be of type"
-                            });
-                      }));
-      case /* Rebind_mismatch */14 :
-          return Curry._8(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Formatting_gen */18,
-                            _0: {
-                              TAG: /* Open_box */1,
-                              _0: {
-                                TAG: /* Format */0,
-                                _0: /* End_of_format */0,
-                                _1: ""
-                              }
-                            },
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
-                                _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@ ",
-                                      _1: 1,
-                                      _2: 0
-                                    },
-                                    _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: {
-                                          TAG: /* Break */0,
-                                          _0: "@ ",
-                                          _1: 1,
-                                          _2: 0
-                                        },
-                                        _1: {
-                                          TAG: /* String */2,
-                                          _0: /* No_padding */0,
+                                          _0: {
+                                            TAG: /* Break */0,
+                                            _0: "@ ",
+                                            _1: 1,
+                                            _2: 0
+                                          },
                                           _1: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: {
-                                              TAG: /* Break */0,
-                                              _0: "@ ",
-                                              _1: 1,
-                                              _2: 0
-                                            },
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
                                             _1: {
-                                              TAG: /* String */2,
-                                              _0: /* No_padding */0,
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
                                               _1: {
-                                                TAG: /* Formatting_lit */17,
-                                                _0: {
-                                                  TAG: /* Break */0,
-                                                  _0: "@ ",
-                                                  _1: 1,
-                                                  _2: 0
-                                                },
+                                                TAG: /* String */2,
+                                                _0: /* No_padding */0,
                                                 _1: {
-                                                  TAG: /* String */2,
-                                                  _0: /* No_padding */0,
-                                                  _1: {
-                                                    TAG: /* Formatting_lit */17,
-                                                    _0: {
-                                                      TAG: /* Break */0,
-                                                      _0: "@ ",
-                                                      _1: 1,
-                                                      _2: 0
-                                                    },
-                                                    _1: {
-                                                      TAG: /* String */2,
-                                                      _0: /* No_padding */0,
-                                                      _1: {
-                                                        TAG: /* Formatting_lit */17,
-                                                        _0: /* Close_box */0,
-                                                        _1: /* End_of_format */0
-                                                      }
-                                                    }
-                                                  }
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: /* Close_box */0,
+                                                  _1: /* End_of_format */0
                                                 }
                                               }
                                             }
@@ -76899,59 +76896,62 @@ function report_error$5(ppf, s) {
                                 }
                               }
                             }
-                          },
-                          _1: "@[%s@ %a@ %s@ %s@ %s@ %s@ %s@]"
-                        }), "The constructor", longident, s._0, "extends type", name(undefined, s._1), "whose declaration does not match", "the declaration of type", name(undefined, s._2));
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[%s@ %a@ %s@ %s@ %s@ %s@ %s@]"
+                  }), "The constructor", longident, s._0, "extends type", name(undefined, s._1), "whose declaration does not match", "the declaration of type", name(undefined, s._2));
       case /* Rebind_private */15 :
           return Curry._4(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
                           TAG: /* Format */0,
+                          _0: /* End_of_format */0,
+                          _1: ""
+                        }
+                      },
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
                           _0: {
-                            TAG: /* Formatting_gen */18,
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
+                          },
+                          _1: {
+                            TAG: /* Alpha */15,
                             _0: {
-                              TAG: /* Open_box */1,
+                              TAG: /* Formatting_lit */17,
                               _0: {
-                                TAG: /* Format */0,
-                                _0: /* End_of_format */0,
-                                _1: ""
-                              }
-                            },
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
+                              },
                               _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
                                 _1: {
-                                  TAG: /* Alpha */15,
-                                  _0: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@ ",
-                                      _1: 1,
-                                      _2: 0
-                                    },
-                                    _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: {
-                                        TAG: /* Formatting_lit */17,
-                                        _0: /* Close_box */0,
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  }
+                                  TAG: /* Formatting_lit */17,
+                                  _0: /* Close_box */0,
+                                  _1: /* End_of_format */0
                                 }
                               }
                             }
-                          },
-                          _1: "@[%s@ %a@ %s@]"
-                        }), "The constructor", longident, s._0, "is private");
+                          }
+                        }
+                      }
+                    },
+                    _1: "@[%s@ %a@ %s@]"
+                  }), "The constructor", longident, s._0, "is private");
       case /* Bad_variance */16 :
           const n = s._0;
           const variance = function (param) {
@@ -77193,90 +77193,90 @@ function report_error$5(ppf, s) {
           }
           if (n !== -2) {
             return Curry._2(Stdlib__Format.fprintf(ppf)({
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: " was expected to be ",
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: " was expected to be ",
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
+                          _1: {
+                            TAG: /* Char_literal */12,
+                            _0: /* ',' */44,
+                            _1: {
+                              TAG: /* Formatting_lit */17,
+                              _0: {
+                                TAG: /* Break */0,
+                                _0: "@ ",
+                                _1: 1,
+                                _2: 0
+                              },
                               _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
+                                TAG: /* String_literal */11,
+                                _0: "but it is ",
                                 _1: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* ',' */44,
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
                                   _1: {
-                                    TAG: /* Formatting_lit */17,
-                                    _0: {
-                                      TAG: /* Break */0,
-                                      _0: "@ ",
-                                      _1: 1,
-                                      _2: 0
-                                    },
+                                    TAG: /* Char_literal */12,
+                                    _0: /* '.' */46,
                                     _1: {
-                                      TAG: /* String_literal */11,
-                                      _0: "but it is ",
-                                      _1: {
-                                        TAG: /* String */2,
-                                        _0: /* No_padding */0,
-                                        _1: {
-                                          TAG: /* Char_literal */12,
-                                          _0: /* '.' */46,
-                                          _1: {
-                                            TAG: /* Formatting_lit */17,
-                                            _0: /* Close_box */0,
-                                            _1: /* End_of_format */0
-                                          }
-                                        }
-                                      }
+                                      TAG: /* Formatting_lit */17,
+                                      _0: /* Close_box */0,
+                                      _1: /* End_of_format */0
                                     }
                                   }
                                 }
                               }
-                            },
-                            _1: " was expected to be %s,@ but it is %s.@]"
-                          }), variance(s._2), variance(s._1));
+                            }
+                          }
+                        }
+                      },
+                      _1: " was expected to be %s,@ but it is %s.@]"
+                    }), variance(s._2), variance(s._1));
           } else {
             return ;
           }
       case /* Unavailable_type_constructor */17 :
           return Curry._2(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "The definition of type ",
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Formatting_lit */17,
-                                _0: {
-                                  TAG: /* Break */0,
-                                  _0: "@ ",
-                                  _1: 1,
-                                  _2: 0
-                                },
-                                _1: {
-                                  TAG: /* String_literal */11,
-                                  _0: "is unavailable",
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "The definition of type ",
+                      _1: {
+                        TAG: /* Alpha */15,
+                        _0: {
+                          TAG: /* Formatting_lit */17,
+                          _0: {
+                            TAG: /* Break */0,
+                            _0: "@ ",
+                            _1: 1,
+                            _2: 0
                           },
-                          _1: "The definition of type %a@ is unavailable"
-                        }), path, s._0);
+                          _1: {
+                            TAG: /* String_literal */11,
+                            _0: "is unavailable",
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "The definition of type %a@ is unavailable"
+                  }), path, s._0);
       case /* Bad_fixed_type */18 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "This fixed type ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          },
-                          _1: "This fixed type %s"
-                        }), s._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "This fixed type ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
+                      }
+                    },
+                    _1: "This fixed type %s"
+                  }), s._0);
       case /* Unbound_type_var_ext */19 :
           Stdlib__Format.fprintf(ppf)({
                 TAG: /* Format */0,
@@ -77288,10 +77288,10 @@ function report_error$5(ppf, s) {
                 _1: "A type variable is unbound in this extension constructor"
               });
           return explain_unbound(ppf, s._0, s._1.ext_args, (function (c) {
-                        return c;
-                      }), "type", (function (param) {
-                        return "";
-                      }));
+                  return c;
+                }), "type", (function (param) {
+                  return "";
+                }));
       
     }
   }
@@ -77310,12 +77310,12 @@ const Error_forward$2 = /* @__PURE__ */Caml_exceptions.create("Ocaml_typedtree_t
 
 function ctyp(desc, typ, env, loc) {
   return {
-          ctyp_desc: desc,
-          ctyp_type: typ,
-          ctyp_env: env,
-          ctyp_loc: loc,
-          ctyp_attributes: /* [] */0
-        };
+    ctyp_desc: desc,
+    ctyp_type: typ,
+    ctyp_env: env,
+    ctyp_loc: loc,
+    ctyp_attributes: /* [] */0
+  };
 }
 
 const unbound_class = {
@@ -77353,8 +77353,8 @@ function generalize_class_type(gen, _param) {
                   Curry._1(gen, param$1[2]);
                 }), match.csig_vars);
           return Stdlib__List.iter((function (param) {
-                        Stdlib__List.iter(gen, param[1]);
-                      }), match.csig_inher);
+                  Stdlib__List.iter(gen, param[1]);
+                }), match.csig_inher);
       case /* Cty_arrow */2 :
           Curry._1(gen, param._1);
           _param = param._2;
@@ -77367,16 +77367,16 @@ function generalize_class_type(gen, _param) {
 function virtual_methods(sign) {
   const match = flatten_fields(object_fields(sign.csig_self));
   return Stdlib__List.fold_left((function (virt, param) {
-                const lab = param[0];
-                if (lab === dummy_method || Curry._2(mem$2, lab, sign.csig_concr)) {
-                  return virt;
-                } else {
-                  return {
-                          hd: lab,
-                          tl: virt
-                        };
-                }
-              }), /* [] */0, match[0]);
+          const lab = param[0];
+          if (lab === dummy_method || Curry._2(mem$2, lab, sign.csig_concr)) {
+            return virt;
+          } else {
+            return {
+              hd: lab,
+              tl: virt
+            };
+          }
+        }), /* [] */0, match[0]);
 }
 
 function constructor_type(constr, _cty) {
@@ -77424,25 +77424,25 @@ function extract_constraints(cty) {
   const sign = signature_of_class_type(cty);
   const match = flatten_fields(object_fields(sign.csig_self));
   return [
-          Curry._3(Meths.fold, (function (lab, param, vars) {
-                  return {
-                          hd: lab,
-                          tl: vars
-                        };
-                }), sign.csig_vars, /* [] */0),
-          Stdlib__List.fold_left((function (meths, param) {
-                  const lab = param[0];
-                  if (lab === dummy_method) {
-                    return meths;
-                  } else {
-                    return {
-                            hd: lab,
-                            tl: meths
-                          };
-                  }
-                }), /* [] */0, match[0]),
-          sign.csig_concr
-        ];
+    Curry._3(Meths.fold, (function (lab, param, vars) {
+            return {
+              hd: lab,
+              tl: vars
+            };
+          }), sign.csig_vars, /* [] */0),
+    Stdlib__List.fold_left((function (meths, param) {
+            const lab = param[0];
+            if (lab === dummy_method) {
+              return meths;
+            } else {
+              return {
+                hd: lab,
+                tl: meths
+              };
+            }
+          }), /* [] */0, match[0]),
+    sign.csig_concr
+  ];
 }
 
 function abbreviate_class_type(path, params, cty) {
@@ -77450,18 +77450,18 @@ function abbreviate_class_type(path, params, cty) {
     case /* Cty_constr */0 :
     case /* Cty_signature */1 :
         return {
-                TAG: /* Cty_constr */0,
-                _0: path,
-                _1: params,
-                _2: cty
-              };
+          TAG: /* Cty_constr */0,
+          _0: path,
+          _1: params,
+          _2: cty
+        };
     case /* Cty_arrow */2 :
         return {
-                TAG: /* Cty_arrow */2,
-                _0: cty._0,
-                _1: cty._1,
-                _2: abbreviate_class_type(path, params, cty._2)
-              };
+          TAG: /* Cty_arrow */2,
+          _0: cty._0,
+          _1: cty._1,
+          _2: abbreviate_class_type(path, params, cty._2)
+        };
     
   }
 }
@@ -77478,12 +77478,12 @@ function closed_class$1(cty) {
             const sign$1 = sign._0;
             if (closed_schema(sign$1.csig_self)) {
               return Curry._3(Meths.fold, (function (param, param$1, cc) {
-                            if (closed_schema(param$1[2])) {
-                              return cc;
-                            } else {
-                              return false;
-                            }
-                          }), sign$1.csig_vars, true);
+                      if (closed_schema(param$1[2])) {
+                        return cc;
+                      } else {
+                        return false;
+                      }
+                    }), sign$1.csig_vars, true);
             } else {
               return false;
             }
@@ -77518,10 +77518,10 @@ function limited_generalize$1(rv, _sign) {
                   limited_generalize(rv, param$1[2]);
                 }), sign$1.csig_vars);
           return Stdlib__List.iter((function (param) {
-                        Stdlib__List.iter((function (param) {
-                                return limited_generalize(rv, param);
-                              }), param[1]);
-                      }), sign$1.csig_inher);
+                  Stdlib__List.iter((function (param) {
+                          return limited_generalize(rv, param);
+                        }), param[1]);
+                }), sign$1.csig_inher);
       case /* Cty_arrow */2 :
           limited_generalize(rv, sign._1);
           _sign = sign._2;
@@ -77552,21 +77552,21 @@ function enter_met_env(check, loc, lab, kind, ty, val_env, met_env, par_env) {
       }, val_env);
   const id = match[0];
   return [
-          id,
-          match[1],
-          add_value(check, id, {
-                val_type: ty,
-                val_kind: kind,
-                val_loc: loc,
-                val_attributes: /* [] */0
-              }, met_env),
-          add_value(undefined, id, {
-                val_type: ty,
-                val_kind: /* Val_unbound */1,
-                val_loc: loc,
-                val_attributes: /* [] */0
-              }, par_env)
-        ];
+    id,
+    match[1],
+    add_value(check, id, {
+          val_type: ty,
+          val_kind: kind,
+          val_loc: loc,
+          val_attributes: /* [] */0
+        }, met_env),
+    add_value(undefined, id, {
+          val_type: ty,
+          val_kind: /* Val_unbound */1,
+          val_loc: loc,
+          val_attributes: /* [] */0
+        }, par_env)
+  ];
 }
 
 function enter_val(cl_num, vars, inh, lab, mut, virt, ty, val_env, met_env, par_env, loc) {
@@ -77576,15 +77576,15 @@ function enter_val(cl_num, vars, inh, lab, mut, virt, ty, val_env, met_env, par_
     const virt$p = match$1[2];
     if (match$1[1] !== mut) {
       throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                MEL_EXN_ID: $$Error$9,
-                _1: loc,
-                _2: val_env,
-                _3: {
-                  TAG: /* Mutability_mismatch */22,
-                  _0: lab,
-                  _1: mut
-                }
-              });
+            MEL_EXN_ID: $$Error$9,
+            _1: loc,
+            _2: val_env,
+            _3: {
+              TAG: /* Mutability_mismatch */22,
+              _0: lab,
+              _1: mut
+            }
+          });
     }
     unify$2(val_env, instance(undefined, val_env, ty), instance(undefined, val_env, match$1[3]));
     match = [
@@ -77596,16 +77596,16 @@ function enter_val(cl_num, vars, inh, lab, mut, virt, ty, val_env, met_env, par_
     const tr = Caml_js_exceptions.internalToOCamlException(raw_tr);
     if (tr.MEL_EXN_ID === Unify) {
       throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                MEL_EXN_ID: $$Error$9,
-                _1: loc,
-                _2: val_env,
-                _3: {
-                  TAG: /* Field_type_mismatch */1,
-                  _0: "instance variable",
-                  _1: lab,
-                  _2: tr._1
-                }
-              });
+            MEL_EXN_ID: $$Error$9,
+            _1: loc,
+            _2: val_env,
+            _3: {
+              TAG: /* Field_type_mismatch */1,
+              _0: "instance variable",
+              _1: lab,
+              _2: tr._1
+            }
+          });
     }
     if (tr.MEL_EXN_ID === Stdlib.Not_found) {
       match = [
@@ -77638,12 +77638,12 @@ function enter_val(cl_num, vars, inh, lab, mut, virt, ty, val_env, met_env, par_
 
 function concr_vals(vars) {
   return Curry._3(Meths.fold, (function (id, param, s) {
-                if (param[1] === /* Virtual */0) {
-                  return s;
-                } else {
-                  return Curry._2(add$2, id, s);
-                }
-              }), vars, /* Empty */0);
+          if (param[1] === /* Virtual */0) {
+            return s;
+          } else {
+            return Curry._2(add$2, id, s);
+          }
+        }), vars, /* Empty */0);
 }
 
 function inheritance(self_type, env, ovf, concr_meths, warn_vals, loc, parent) {
@@ -77672,16 +77672,16 @@ function inheritance(self_type, env, ovf, concr_meths, warn_vals, loc, parent) {
                     } else {
                       if (match$3.TAG === /* Tfield */5) {
                         throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                                  MEL_EXN_ID: $$Error$9,
-                                  _1: loc,
-                                  _2: env,
-                                  _3: {
-                                    TAG: /* Field_type_mismatch */1,
-                                    _0: "method",
-                                    _1: match$3._0,
-                                    _2: match$2.tl
-                                  }
-                                });
+                              MEL_EXN_ID: $$Error$9,
+                              _1: loc,
+                              _2: env,
+                              _3: {
+                                TAG: /* Field_type_mismatch */1,
+                                _0: "method",
+                                _1: match$3._0,
+                                _2: match$2.tl
+                              }
+                            });
                       }
                       exit = 1;
                     }
@@ -77699,13 +77699,13 @@ function inheritance(self_type, env, ovf, concr_meths, warn_vals, loc, parent) {
             }
             if (exit === 1) {
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          48280,
-                          12
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/ocaml_typedtree_test.ml",
+                      48280,
+                      12
+                    ]
+                  });
             }
             
           } else {
@@ -77719,15 +77719,15 @@ function inheritance(self_type, env, ovf, concr_meths, warn_vals, loc, parent) {
           if (ovf === /* Override */0) {
             if (Curry._1(is_empty$1, over_meths) && Curry._1(is_empty$1, over_vals)) {
               throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                        MEL_EXN_ID: $$Error$9,
-                        _1: loc,
-                        _2: env,
-                        _3: {
-                          TAG: /* No_overriding */23,
-                          _0: "",
-                          _1: ""
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$9,
+                    _1: loc,
+                    _2: env,
+                    _3: {
+                      TAG: /* No_overriding */23,
+                      _0: "",
+                      _1: ""
+                    }
+                  });
             }
             
           } else {
@@ -77766,21 +77766,21 @@ function inheritance(self_type, env, ovf, concr_meths, warn_vals, loc, parent) {
         const concr_meths$1 = Curry._2(union$2, cl_sig$1.csig_concr, concr_meths);
         const warn_vals$1 = Curry._2(union$2, concr_vals$1, warn_vals);
         return [
-                cl_sig$1,
-                concr_meths$1,
-                warn_vals$1
-              ];
+          cl_sig$1,
+          concr_meths$1,
+          warn_vals$1
+        ];
     case /* Cty_constr */0 :
     case /* Cty_arrow */2 :
         throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                  MEL_EXN_ID: $$Error$9,
-                  _1: loc,
-                  _2: env,
-                  _3: {
-                    TAG: /* Structure_expected */2,
-                    _0: parent
-                  }
-                });
+              MEL_EXN_ID: $$Error$9,
+              _1: loc,
+              _2: env,
+              _3: {
+                TAG: /* Structure_expected */2,
+                _0: parent
+              }
+            });
     
   }
 }
@@ -77797,16 +77797,16 @@ function virtual_method(val_env, meths, self_type, lab, priv, sty, loc) {
     const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
     if (trace.MEL_EXN_ID === Unify) {
       throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                MEL_EXN_ID: $$Error$9,
-                _1: loc,
-                _2: val_env,
-                _3: {
-                  TAG: /* Field_type_mismatch */1,
-                  _0: "method",
-                  _1: lab,
-                  _2: trace._1
-                }
-              });
+            MEL_EXN_ID: $$Error$9,
+            _1: loc,
+            _2: val_env,
+            _3: {
+              TAG: /* Field_type_mismatch */1,
+              _0: "method",
+              _1: lab,
+              _2: trace._1
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
   }
@@ -77828,16 +77828,16 @@ function declare_method(val_env, meths, self_type, lab, priv, sty, loc) {
       const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
       if (trace.MEL_EXN_ID === Unify) {
         throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                  MEL_EXN_ID: $$Error$9,
-                  _1: loc,
-                  _2: val_env,
-                  _3: {
-                    TAG: /* Field_type_mismatch */1,
-                    _0: "method",
-                    _1: lab,
-                    _2: trace._1
-                  }
-                });
+              MEL_EXN_ID: $$Error$9,
+              _1: loc,
+              _2: val_env,
+              _3: {
+                TAG: /* Field_type_mismatch */1,
+                _0: "method",
+                _1: lab,
+                _2: trace._1
+              }
+            });
       }
       throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
     }
@@ -77887,31 +77887,31 @@ function type_constraint(val_env, sty, sty$p, loc) {
     const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
     if (trace.MEL_EXN_ID === Unify) {
       throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                MEL_EXN_ID: $$Error$9,
-                _1: loc,
-                _2: val_env,
-                _3: {
-                  TAG: /* Unconsistent_constraint */0,
-                  _0: trace._1
-                }
-              });
+            MEL_EXN_ID: $$Error$9,
+            _1: loc,
+            _2: val_env,
+            _3: {
+              TAG: /* Unconsistent_constraint */0,
+              _0: trace._1
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
   }
   return [
-          cty,
-          cty$p
-        ];
+    cty,
+    cty$p
+  ];
 }
 
 function make_method(loc, cl_num, expr) {
   return Curry._6(Ast_helper_Exp.fun_, expr.pexp_loc, undefined, "", undefined, alias$1(loc, undefined, $$var$1(loc, undefined, {
-                      txt: "self-*",
-                      loc: loc
-                    }), {
-                  txt: "self-" + cl_num,
-                  loc: loc
-                }), expr);
+                txt: "self-*",
+                loc: loc
+              }), {
+            txt: "self-" + cl_num,
+            loc: loc
+          }), expr);
 }
 
 function add_val(env, loc, lab, param, val_sig) {
@@ -77931,10 +77931,10 @@ function add_val(env, loc, lab, param, val_sig) {
     }
   }
   return Curry._3(Meths.add, lab, [
-              param[0],
-              virt$1,
-              param[2]
-            ], val_sig);
+        param[0],
+        virt$1,
+        param[2]
+      ], val_sig);
 }
 
 function class_signature$1(env, param) {
@@ -77963,14 +77963,14 @@ function class_signature$1(env, param) {
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Unify) {
       throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                MEL_EXN_ID: $$Error$9,
-                _1: sty.ptyp_loc,
-                _2: env,
-                _3: {
-                  TAG: /* Pattern_type_clash */5,
-                  _0: self_type
-                }
-              });
+            MEL_EXN_ID: $$Error$9,
+            _1: sty.ptyp_loc,
+            _2: env,
+            _3: {
+              TAG: /* Pattern_type_clash */5,
+              _0: self_type
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -77983,10 +77983,10 @@ function class_signature$1(env, param) {
           const loc = param$1.pctf_loc;
           const mkctf = function (desc) {
             return {
-                    ctf_desc: desc,
-                    ctf_loc: loc,
-                    ctf_attributes: param$1.pctf_attributes
-                  };
+              ctf_desc: desc,
+              ctf_loc: loc,
+              ctf_attributes: param$1.pctf_attributes
+            };
           };
           const sparent = param$1.pctf_desc;
           switch (sparent.TAG) {
@@ -78017,17 +78017,17 @@ function class_signature$1(env, param) {
                         return add_val(env, partial_arg, param, param$1, param$2);
                       }), match$1[0].csig_vars, val_sig);
                 return [
-                        {
-                          hd: mkctf({
-                                TAG: /* Tctf_inherit */0,
-                                _0: parent
-                              }),
-                          tl: fields
-                        },
-                        val_sig$1,
-                        match$1[1],
-                        inher$1
-                      ];
+                  {
+                    hd: mkctf({
+                          TAG: /* Tctf_inherit */0,
+                          _0: parent
+                        }),
+                    tl: fields
+                  },
+                  val_sig$1,
+                  match$1[1],
+                  inher$1
+                ];
             case /* Pctf_val */1 :
                 const match$2 = sparent._0;
                 const virt = match$2[2];
@@ -78036,26 +78036,26 @@ function class_signature$1(env, param) {
                 const cty = transl_simple_type(env, false, match$2[3]);
                 const ty = cty.ctyp_type;
                 return [
-                        {
-                          hd: mkctf({
-                                TAG: /* Tctf_val */1,
-                                _0: [
-                                  lab,
-                                  mut,
-                                  virt,
-                                  cty
-                                ]
-                              }),
-                          tl: fields
-                        },
-                        add_val(env, param$1.pctf_loc, lab, [
-                              mut,
-                              virt,
-                              ty
-                            ], val_sig),
-                        concr_meths,
-                        inher
-                      ];
+                  {
+                    hd: mkctf({
+                          TAG: /* Tctf_val */1,
+                          _0: [
+                            lab,
+                            mut,
+                            virt,
+                            cty
+                          ]
+                        }),
+                    tl: fields
+                  },
+                  add_val(env, param$1.pctf_loc, lab, [
+                        mut,
+                        virt,
+                        ty
+                      ], val_sig),
+                  concr_meths,
+                  inher
+                ];
             case /* Pctf_method */2 :
                 const match$3 = sparent._0;
                 const virt$1 = match$3[2];
@@ -78065,40 +78065,40 @@ function class_signature$1(env, param) {
                 let concr_meths$1;
                 concr_meths$1 = virt$1 === /* Virtual */0 ? concr_meths : Curry._2(add$2, lab$1, concr_meths);
                 return [
-                        {
-                          hd: mkctf({
-                                TAG: /* Tctf_method */2,
-                                _0: [
-                                  lab$1,
-                                  priv,
-                                  virt$1,
-                                  cty$1
-                                ]
-                              }),
-                          tl: fields
-                        },
-                        val_sig,
-                        concr_meths$1,
-                        inher
-                      ];
+                  {
+                    hd: mkctf({
+                          TAG: /* Tctf_method */2,
+                          _0: [
+                            lab$1,
+                            priv,
+                            virt$1,
+                            cty$1
+                          ]
+                        }),
+                    tl: fields
+                  },
+                  val_sig,
+                  concr_meths$1,
+                  inher
+                ];
             case /* Pctf_constraint */3 :
                 const match$4 = sparent._0;
                 const match$5 = type_constraint(env, match$4[0], match$4[1], param$1.pctf_loc);
                 return [
-                        {
-                          hd: mkctf({
-                                TAG: /* Tctf_constraint */3,
-                                _0: [
-                                  match$5[0],
-                                  match$5[1]
-                                ]
-                              }),
-                          tl: fields
-                        },
-                        val_sig,
-                        concr_meths,
-                        inher
-                      ];
+                  {
+                    hd: mkctf({
+                          TAG: /* Tctf_constraint */3,
+                          _0: [
+                            match$5[0],
+                            match$5[1]
+                          ]
+                        }),
+                    tl: fields
+                  },
+                  val_sig,
+                  concr_meths,
+                  inher
+                ];
             case /* Pctf_attribute */4 :
                 const x = sparent._0;
                 warning_attribute({
@@ -78106,22 +78106,22 @@ function class_signature$1(env, param) {
                       tl: /* [] */0
                     });
                 return [
-                        {
-                          hd: mkctf({
-                                TAG: /* Tctf_attribute */4,
-                                _0: x
-                              }),
-                          tl: fields
-                        },
-                        val_sig,
-                        concr_meths,
-                        inher
-                      ];
+                  {
+                    hd: mkctf({
+                          TAG: /* Tctf_attribute */4,
+                          _0: x
+                        }),
+                    tl: fields
+                  },
+                  val_sig,
+                  concr_meths,
+                  inher
+                ];
             case /* Pctf_extension */5 :
                 throw new Caml_js_exceptions.MelangeError(Error_forward$2, {
-                          MEL_EXN_ID: Error_forward$2,
-                          _1: error_of_extension(sparent._0)
-                        });
+                      MEL_EXN_ID: Error_forward$2,
+                      _1: error_of_extension(sparent._0)
+                    });
             
           }
         }), [
@@ -78141,21 +78141,21 @@ function class_signature$1(env, param) {
     csig_inher: cty_csig_inher
   };
   return {
-          csig_self: self_cty$1,
-          csig_fields: Stdlib__List.rev(match[0]),
-          csig_type: cty
-        };
+    csig_self: self_cty$1,
+    csig_fields: Stdlib__List.rev(match[0]),
+    csig_type: cty
+  };
 }
 
 function class_type$3(env, scty) {
   const cltyp = function (desc, typ) {
     return {
-            cltyp_desc: desc,
-            cltyp_type: typ,
-            cltyp_env: env,
-            cltyp_loc: scty.pcty_loc,
-            cltyp_attributes: scty.pcty_attributes
-          };
+      cltyp_desc: desc,
+      cltyp_type: typ,
+      cltyp_env: env,
+      cltyp_loc: scty.pcty_loc,
+      cltyp_attributes: scty.pcty_attributes
+    };
   };
   const pcsig = scty.pcty_desc;
   switch (pcsig.TAG) {
@@ -78167,29 +78167,29 @@ function class_type$3(env, scty) {
         const path = match[0];
         if (same(decl.clty_path, unbound_class)) {
           throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                    MEL_EXN_ID: $$Error$9,
-                    _1: scty.pcty_loc,
-                    _2: env,
-                    _3: {
-                      TAG: /* Unbound_class_type_2 */7,
-                      _0: lid.txt
-                    }
-                  });
+                MEL_EXN_ID: $$Error$9,
+                _1: scty.pcty_loc,
+                _2: env,
+                _3: {
+                  TAG: /* Unbound_class_type_2 */7,
+                  _0: lid.txt
+                }
+              });
         }
         const match$1 = instance_class(decl.clty_params, decl.clty_type);
         const params = match$1[0];
         if (Stdlib__List.length(params) !== Stdlib__List.length(styl)) {
           throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                    MEL_EXN_ID: $$Error$9,
-                    _1: scty.pcty_loc,
-                    _2: env,
-                    _3: {
-                      TAG: /* Parameter_arity_mismatch */11,
-                      _0: lid.txt,
-                      _1: Stdlib__List.length(params),
-                      _2: Stdlib__List.length(styl)
-                    }
-                  });
+                MEL_EXN_ID: $$Error$9,
+                _1: scty.pcty_loc,
+                _2: env,
+                _3: {
+                  TAG: /* Parameter_arity_mismatch */11,
+                  _0: lid.txt,
+                  _1: Stdlib__List.length(params),
+                  _2: Stdlib__List.length(styl)
+                }
+              });
         }
         const ctys = Stdlib__List.map2((function (sty, ty) {
                 const cty$p = transl_simple_type(env, false, sty);
@@ -78201,14 +78201,14 @@ function class_type$3(env, scty) {
                   const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
                   if (trace.MEL_EXN_ID === Unify) {
                     throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                              MEL_EXN_ID: $$Error$9,
-                              _1: sty.ptyp_loc,
-                              _2: env,
-                              _3: {
-                                TAG: /* Parameter_mismatch */12,
-                                _0: trace._1
-                              }
-                            });
+                          MEL_EXN_ID: $$Error$9,
+                          _1: sty.ptyp_loc,
+                          _2: env,
+                          _3: {
+                            TAG: /* Parameter_mismatch */12,
+                            _0: trace._1
+                          }
+                        });
                   }
                   throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
                 }
@@ -78222,11 +78222,11 @@ function class_type$3(env, scty) {
           _2: typ_2
         };
         return cltyp({
-                    TAG: /* Tcty_constr */0,
-                    _0: path,
-                    _1: lid,
-                    _2: ctys
-                  }, typ);
+              TAG: /* Tcty_constr */0,
+              _0: path,
+              _1: lid,
+              _2: ctys
+            }, typ);
     case /* Pcty_signature */1 :
         const clsig = class_signature$1(env, pcsig._0);
         const typ$1 = {
@@ -78234,9 +78234,9 @@ function class_type$3(env, scty) {
           _0: clsig.csig_type
         };
         return cltyp({
-                    TAG: /* Tcty_signature */1,
-                    _0: clsig
-                  }, typ$1);
+              TAG: /* Tcty_signature */1,
+              _0: clsig
+            }, typ$1);
     case /* Pcty_arrow */2 :
         const l = pcsig._0;
         const cty = transl_simple_type(env, false, pcsig._1);
@@ -78250,16 +78250,16 @@ function class_type$3(env, scty) {
           _2: typ_2$1
         };
         return cltyp({
-                    TAG: /* Tcty_arrow */2,
-                    _0: l,
-                    _1: cty,
-                    _2: clty
-                  }, typ$2);
+              TAG: /* Tcty_arrow */2,
+              _0: l,
+              _1: cty,
+              _2: clty
+            }, typ$2);
     case /* Pcty_extension */3 :
         throw new Caml_js_exceptions.MelangeError(Error_forward$2, {
-                  MEL_EXN_ID: Error_forward$2,
-                  _1: error_of_extension(pcsig._0)
-                });
+              MEL_EXN_ID: Error_forward$2,
+              _1: error_of_extension(pcsig._0)
+            });
     
   }
 }
@@ -78316,14 +78316,14 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Unify) {
       throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                MEL_EXN_ID: $$Error$9,
-                _1: spat.ppat_loc,
-                _2: val_env$1,
-                _3: {
-                  TAG: /* Pattern_type_clash */5,
-                  _0: public_self
-                }
-              });
+            MEL_EXN_ID: $$Error$9,
+            _1: spat.ppat_loc,
+            _2: val_env$1,
+            _3: {
+              TAG: /* Pattern_type_clash */5,
+              _0: public_self
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -78338,13 +78338,13 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
             }
             catch (exn){
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          48779,
-                          18
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/ocaml_typedtree_test.ml",
+                      48779,
+                      18
+                    ]
+                  });
             }
           }), get_methods(public_self));
   }
@@ -78362,10 +78362,10 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
           const loc = param$1.pcf_loc;
           const mkcf = function (desc) {
             return {
-                    cf_desc: desc,
-                    cf_loc: loc,
-                    cf_attributes: param$1.pcf_attributes
-                  };
+              cf_desc: desc,
+              cf_loc: loc,
+              cf_attributes: param$1.pcf_attributes
+            };
           };
           const expr = param$1.pcf_desc;
           switch (expr.TAG) {
@@ -78397,17 +78397,17 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                 const match$2 = Curry._3(Meths.fold, (function (lab, info, param) {
                         const match = enter_val(cl_num, vars, true, lab, info[0], info[1], info[2], param[0], param[1], param[2], sparent.pcl_loc);
                         return [
-                                match[1],
-                                match[2],
-                                match[3],
-                                {
-                                  hd: [
-                                    lab,
-                                    match[0]
-                                  ],
-                                  tl: param[3]
-                                }
-                              ];
+                          match[1],
+                          match[2],
+                          match[3],
+                          {
+                            hd: [
+                              lab,
+                              match[0]
+                            ],
+                            tl: param[3]
+                          }
+                        ];
                       }), cl_sig.csig_vars, [
                       val_env,
                       met_env,
@@ -78420,20 +78420,20 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                 const val_env$1 = match$2[0];
                 const inh_meths = Curry._3(fold$1, (function (lab, rem) {
                         return {
-                                hd: [
-                                  lab,
-                                  create(lab)
-                                ],
-                                tl: rem
-                              };
+                          hd: [
+                            lab,
+                            create(lab)
+                          ],
+                          tl: rem
+                        };
                       }), cl_sig.csig_concr, /* [] */0);
                 let match$3;
                 if ($$super !== undefined) {
                   const match$4 = enter_met_env((function (s) {
                           return {
-                                  TAG: /* Unused_ancestor */20,
-                                  _0: s
-                                };
+                            TAG: /* Unused_ancestor */20,
+                            _0: s
+                          };
                         }), sparent.pcl_loc, $$super, {
                         TAG: /* Val_anc */3,
                         _0: inh_meths,
@@ -78452,31 +78452,31 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                   ];
                 }
                 return [
-                        match$3[0],
-                        match$3[1],
-                        match$3[2],
-                        {
-                          hd: {
-                            LAZY_DONE: false,
-                            VAL: (function () {
-                                return mkcf({
-                                            TAG: /* Tcf_inherit */0,
-                                            _0: ovf,
-                                            _1: parent,
-                                            _2: $$super,
-                                            _3: inh_vars,
-                                            _4: inh_meths
-                                          });
-                              })
-                          },
-                          tl: fields
-                        },
-                        match$1[1],
-                        match$1[2],
-                        inher$1,
-                        local_meths,
-                        local_vals
-                      ];
+                  match$3[0],
+                  match$3[1],
+                  match$3[2],
+                  {
+                    hd: {
+                      LAZY_DONE: false,
+                      VAL: (function () {
+                          return mkcf({
+                                TAG: /* Tcf_inherit */0,
+                                _0: ovf,
+                                _1: parent,
+                                _2: $$super,
+                                _3: inh_vars,
+                                _4: inh_meths
+                              });
+                        })
+                    },
+                    tl: fields
+                  },
+                  match$1[1],
+                  match$1[2],
+                  inher$1,
+                  local_meths,
+                  local_vals
+                ];
             case /* Pcf_val */1 :
                 const match$5 = expr._0;
                 const styp = match$5[2];
@@ -78496,47 +78496,47 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                   const met_env$p = match$6[2];
                   const id = match$6[0];
                   return [
-                          match$6[1],
-                          met_env$p,
-                          match$6[3],
-                          {
-                            hd: {
-                              LAZY_DONE: false,
-                              VAL: (function () {
-                                  return mkcf({
-                                              TAG: /* Tcf_val */1,
-                                              _0: lab,
-                                              _1: mut,
-                                              _2: id,
-                                              _3: {
-                                                TAG: /* Tcfk_virtual */0,
-                                                _0: cty
-                                              },
-                                              _4: met_env === met_env$p
-                                            });
-                                })
-                            },
-                            tl: fields
-                          },
-                          concr_meths,
-                          warn_vals,
-                          inher,
-                          local_meths,
-                          local_vals
-                        ];
+                    match$6[1],
+                    met_env$p,
+                    match$6[3],
+                    {
+                      hd: {
+                        LAZY_DONE: false,
+                        VAL: (function () {
+                            return mkcf({
+                                  TAG: /* Tcf_val */1,
+                                  _0: lab,
+                                  _1: mut,
+                                  _2: id,
+                                  _3: {
+                                    TAG: /* Tcfk_virtual */0,
+                                    _0: cty
+                                  },
+                                  _4: met_env === met_env$p
+                                });
+                          })
+                      },
+                      tl: fields
+                    },
+                    concr_meths,
+                    warn_vals,
+                    inher,
+                    local_meths,
+                    local_vals
+                  ];
                 }
                 const ovf$1 = styp._0;
                 if (Curry._2(mem$2, lab.txt, local_vals)) {
                   throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                            MEL_EXN_ID: $$Error$9,
-                            _1: loc,
-                            _2: val_env,
-                            _3: {
-                              TAG: /* Duplicate */24,
-                              _0: "instance variable",
-                              _1: lab.txt
-                            }
-                          });
+                        MEL_EXN_ID: $$Error$9,
+                        _1: loc,
+                        _2: val_env,
+                        _3: {
+                          TAG: /* Duplicate */24,
+                          _0: "instance variable",
+                          _1: lab.txt
+                        }
+                      });
                 }
                 if (Curry._2(mem$2, lab.txt, warn_vals)) {
                   if (ovf$1 === /* Fresh */1) {
@@ -78551,15 +78551,15 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                   
                 } else if (ovf$1 === /* Override */0) {
                   throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                            MEL_EXN_ID: $$Error$9,
-                            _1: loc,
-                            _2: val_env,
-                            _3: {
-                              TAG: /* No_overriding */23,
-                              _0: "instance variable",
-                              _1: lab.txt
-                            }
-                          });
+                        MEL_EXN_ID: $$Error$9,
+                        _1: loc,
+                        _2: val_env,
+                        _3: {
+                          TAG: /* No_overriding */23,
+                          _0: "instance variable",
+                          _1: lab.txt
+                        }
+                      });
                 }
                 if (principal.contents) {
                   begin_def(undefined);
@@ -78577,14 +78577,14 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                         throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
                       }
                       throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                                MEL_EXN_ID: $$Error$9,
-                                _1: loc,
-                                _2: val_env,
-                                _3: {
-                                  TAG: /* Make_nongen_seltype */17,
-                                  _0: match$7.hd[0]
-                                }
-                              });
+                            MEL_EXN_ID: $$Error$9,
+                            _1: loc,
+                            _2: val_env,
+                            _3: {
+                              TAG: /* Make_nongen_seltype */17,
+                              _0: match$7.hd[0]
+                            }
+                          });
                     }
                     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
                   }
@@ -78598,35 +78598,35 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                 const met_env$p$1 = match$8[2];
                 const id$1 = match$8[0];
                 return [
-                        match$8[1],
-                        met_env$p$1,
-                        match$8[3],
-                        {
-                          hd: {
-                            LAZY_DONE: false,
-                            VAL: (function () {
-                                return mkcf({
-                                            TAG: /* Tcf_val */1,
-                                            _0: lab,
-                                            _1: mut,
-                                            _2: id$1,
-                                            _3: {
-                                              TAG: /* Tcfk_concrete */1,
-                                              _0: ovf$1,
-                                              _1: exp
-                                            },
-                                            _4: met_env === met_env$p$1
-                                          });
-                              })
-                          },
-                          tl: fields
-                        },
-                        concr_meths,
-                        Curry._2(add$2, lab.txt, warn_vals),
-                        inher,
-                        local_meths,
-                        Curry._2(add$2, lab.txt, local_vals)
-                      ];
+                  match$8[1],
+                  met_env$p$1,
+                  match$8[3],
+                  {
+                    hd: {
+                      LAZY_DONE: false,
+                      VAL: (function () {
+                          return mkcf({
+                                TAG: /* Tcf_val */1,
+                                _0: lab,
+                                _1: mut,
+                                _2: id$1,
+                                _3: {
+                                  TAG: /* Tcfk_concrete */1,
+                                  _0: ovf$1,
+                                  _1: exp
+                                },
+                                _4: met_env === met_env$p$1
+                              });
+                        })
+                    },
+                    tl: fields
+                  },
+                  concr_meths,
+                  Curry._2(add$2, lab.txt, warn_vals),
+                  inher,
+                  local_meths,
+                  Curry._2(add$2, lab.txt, local_vals)
+                ];
             case /* Pcf_method */2 :
                 const match$9 = expr._0;
                 const sty = match$9[2];
@@ -78635,32 +78635,32 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                 if (sty.TAG === /* Cfk_virtual */0) {
                   const cty$1 = virtual_method(val_env, meths, self_type, lab$1.txt, priv, sty._0, loc);
                   return [
-                          val_env,
-                          met_env,
-                          par_env,
-                          {
-                            hd: {
-                              LAZY_DONE: false,
-                              VAL: (function () {
-                                  return mkcf({
-                                              TAG: /* Tcf_method */2,
-                                              _0: lab$1,
-                                              _1: priv,
-                                              _2: {
-                                                TAG: /* Tcfk_virtual */0,
-                                                _0: cty$1
-                                              }
-                                            });
-                                })
-                            },
-                            tl: fields
-                          },
-                          concr_meths,
-                          warn_vals,
-                          inher,
-                          local_meths,
-                          local_vals
-                        ];
+                    val_env,
+                    met_env,
+                    par_env,
+                    {
+                      hd: {
+                        LAZY_DONE: false,
+                        VAL: (function () {
+                            return mkcf({
+                                  TAG: /* Tcf_method */2,
+                                  _0: lab$1,
+                                  _1: priv,
+                                  _2: {
+                                    TAG: /* Tcfk_virtual */0,
+                                    _0: cty$1
+                                  }
+                                });
+                          })
+                      },
+                      tl: fields
+                    },
+                    concr_meths,
+                    warn_vals,
+                    inher,
+                    local_meths,
+                    local_vals
+                  ];
                 }
                 const expr$1 = sty._1;
                 const ovf$2 = sty._0;
@@ -78669,15 +78669,15 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                 expr$2 = match$10.TAG === /* Pexp_poly */28 ? expr$1 : Curry._4(Ast_helper_Exp.poly, expr$1.pexp_loc, undefined, expr$1, undefined);
                 if (Curry._2(mem$2, lab$1.txt, local_meths)) {
                   throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                            MEL_EXN_ID: $$Error$9,
-                            _1: loc,
-                            _2: val_env,
-                            _3: {
-                              TAG: /* Duplicate */24,
-                              _0: "method",
-                              _1: lab$1.txt
-                            }
-                          });
+                        MEL_EXN_ID: $$Error$9,
+                        _1: loc,
+                        _2: val_env,
+                        _3: {
+                          TAG: /* Duplicate */24,
+                          _0: "method",
+                          _1: lab$1.txt
+                        }
+                      });
                 }
                 if (Curry._2(mem$2, lab$1.txt, concr_meths)) {
                   if (ovf$2 === /* Fresh */1) {
@@ -78692,15 +78692,15 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                   
                 } else if (ovf$2 === /* Override */0) {
                   throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                            MEL_EXN_ID: $$Error$9,
-                            _1: loc,
-                            _2: val_env,
-                            _3: {
-                              TAG: /* No_overriding */23,
-                              _0: "method",
-                              _1: lab$1.txt
-                            }
-                          });
+                        MEL_EXN_ID: $$Error$9,
+                        _1: loc,
+                        _2: val_env,
+                        _3: {
+                          TAG: /* No_overriding */23,
+                          _0: "method",
+                          _1: lab$1.txt
+                        }
+                      });
                 }
                 const match$11 = filter_self_method(val_env, lab$1.txt, priv, meths, self_type);
                 const ty$1 = match$11[1];
@@ -78718,13 +78718,13 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                     const match$13 = repr(ty$1).desc;
                     if (/* tag */typeof match$13 === "number" || typeof match$13 === "string") {
                       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                MEL_EXN_ID: "Assert_failure",
-                                _1: [
-                                  "jscomp/test/ocaml_typedtree_test.ml",
-                                  48681,
-                                  17
-                                ]
-                              });
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "jscomp/test/ocaml_typedtree_test.ml",
+                              48681,
+                              17
+                            ]
+                          });
                     }
                     switch (match$13.TAG) {
                       case /* Tvar */0 :
@@ -78743,39 +78743,39 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                           break;
                       default:
                         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                  MEL_EXN_ID: "Assert_failure",
-                                  _1: [
-                                    "jscomp/test/ocaml_typedtree_test.ml",
-                                    48681,
-                                    17
-                                  ]
-                                });
-                    }
-                  } else {
-                    throw new Caml_js_exceptions.MelangeError("Assert_failure", {
                               MEL_EXN_ID: "Assert_failure",
                               _1: [
                                 "jscomp/test/ocaml_typedtree_test.ml",
-                                48683,
-                                13
+                                48681,
+                                17
                               ]
                             });
+                    }
+                  } else {
+                    throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                          MEL_EXN_ID: "Assert_failure",
+                          _1: [
+                            "jscomp/test/ocaml_typedtree_test.ml",
+                            48683,
+                            13
+                          ]
+                        });
                   }
                 }
                 catch (raw_trace){
                   const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
                   if (trace.MEL_EXN_ID === Unify) {
                     throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                              MEL_EXN_ID: $$Error$9,
-                              _1: loc,
-                              _2: val_env,
-                              _3: {
-                                TAG: /* Field_type_mismatch */1,
-                                _0: "method",
-                                _1: lab$1.txt,
-                                _2: trace._1
-                              }
-                            });
+                          MEL_EXN_ID: $$Error$9,
+                          _1: loc,
+                          _2: val_env,
+                          _3: {
+                            TAG: /* Field_type_mismatch */1,
+                            _0: "method",
+                            _1: lab$1.txt,
+                            _2: trace._1
+                          }
+                        });
                   }
                   throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
                 }
@@ -78796,59 +78796,59 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                       const texp = type_expect(undefined, met_env, meth_expr, meth_type);
                       end_def(undefined);
                       return mkcf({
-                                  TAG: /* Tcf_method */2,
-                                  _0: lab$1,
-                                  _1: priv,
-                                  _2: {
-                                    TAG: /* Tcfk_concrete */1,
-                                    _0: ovf$2,
-                                    _1: texp
-                                  }
-                                });
+                            TAG: /* Tcf_method */2,
+                            _0: lab$1,
+                            _1: priv,
+                            _2: {
+                              TAG: /* Tcfk_concrete */1,
+                              _0: ovf$2,
+                              _1: texp
+                            }
+                          });
                     })
                 };
                 return [
-                        val_env,
-                        met_env,
-                        par_env,
-                        {
-                          hd: field,
-                          tl: fields
-                        },
-                        Curry._2(add$2, lab$1.txt, concr_meths),
-                        warn_vals,
-                        inher,
-                        Curry._2(add$2, lab$1.txt, local_meths),
-                        local_vals
-                      ];
+                  val_env,
+                  met_env,
+                  par_env,
+                  {
+                    hd: field,
+                    tl: fields
+                  },
+                  Curry._2(add$2, lab$1.txt, concr_meths),
+                  warn_vals,
+                  inher,
+                  Curry._2(add$2, lab$1.txt, local_meths),
+                  local_vals
+                ];
             case /* Pcf_constraint */3 :
                 const match$15 = expr._0;
                 const match$16 = type_constraint(val_env, match$15[0], match$15[1], loc);
                 const cty$p$1 = match$16[1];
                 const cty$2 = match$16[0];
                 return [
-                        val_env,
-                        met_env,
-                        par_env,
-                        {
-                          hd: {
-                            LAZY_DONE: false,
-                            VAL: (function () {
-                                return mkcf({
-                                            TAG: /* Tcf_constraint */3,
-                                            _0: cty$2,
-                                            _1: cty$p$1
-                                          });
-                              })
-                          },
-                          tl: fields
-                        },
-                        concr_meths,
-                        warn_vals,
-                        inher,
-                        local_meths,
-                        local_vals
-                      ];
+                  val_env,
+                  met_env,
+                  par_env,
+                  {
+                    hd: {
+                      LAZY_DONE: false,
+                      VAL: (function () {
+                          return mkcf({
+                                TAG: /* Tcf_constraint */3,
+                                _0: cty$2,
+                                _1: cty$p$1
+                              });
+                        })
+                    },
+                    tl: fields
+                  },
+                  concr_meths,
+                  warn_vals,
+                  inher,
+                  local_meths,
+                  local_vals
+                ];
             case /* Pcf_initializer */4 :
                 const expr$3 = make_method(self_loc, cl_num, expr._0);
                 const vars_local$1 = vars.contents;
@@ -78869,25 +78869,25 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                       const texp = type_expect(undefined, met_env, expr$3, meth_type);
                       end_def(undefined);
                       return mkcf({
-                                  TAG: /* Tcf_initializer */4,
-                                  _0: texp
-                                });
+                            TAG: /* Tcf_initializer */4,
+                            _0: texp
+                          });
                     })
                 };
                 return [
-                        val_env,
-                        met_env,
-                        par_env,
-                        {
-                          hd: field$1,
-                          tl: fields
-                        },
-                        concr_meths,
-                        warn_vals,
-                        inher,
-                        local_meths,
-                        local_vals
-                      ];
+                  val_env,
+                  met_env,
+                  par_env,
+                  {
+                    hd: field$1,
+                    tl: fields
+                  },
+                  concr_meths,
+                  warn_vals,
+                  inher,
+                  local_meths,
+                  local_vals
+                ];
             case /* Pcf_attribute */5 :
                 const x = expr._0;
                 warning_attribute({
@@ -78895,32 +78895,32 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
                       tl: /* [] */0
                     });
                 return [
-                        val_env,
-                        met_env,
-                        par_env,
-                        {
-                          hd: {
-                            LAZY_DONE: false,
-                            VAL: (function () {
-                                return mkcf({
-                                            TAG: /* Tcf_attribute */5,
-                                            _0: x
-                                          });
-                              })
-                          },
-                          tl: fields
-                        },
-                        concr_meths,
-                        warn_vals,
-                        inher,
-                        local_meths,
-                        local_vals
-                      ];
+                  val_env,
+                  met_env,
+                  par_env,
+                  {
+                    hd: {
+                      LAZY_DONE: false,
+                      VAL: (function () {
+                          return mkcf({
+                                TAG: /* Tcf_attribute */5,
+                                _0: x
+                              });
+                        })
+                    },
+                    tl: fields
+                  },
+                  concr_meths,
+                  warn_vals,
+                  inher,
+                  local_meths,
+                  local_vals
+                ];
             case /* Pcf_extension */6 :
                 throw new Caml_js_exceptions.MelangeError(Error_forward$2, {
-                          MEL_EXN_ID: Error_forward$2,
-                          _1: error_of_extension(expr._0)
-                        });
+                      MEL_EXN_ID: Error_forward$2,
+                      _1: error_of_extension(expr._0)
+                    });
             
           }
         }), [
@@ -78940,10 +78940,10 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
   unify$2(val_env$1, self_type, newvar(undefined, undefined));
   const sign_csig_vars = Curry._2(Meths.map, (function (param) {
           return [
-                  param[1],
-                  param[2],
-                  param[3]
-                ];
+            param[1],
+            param[2],
+            param[3]
+          ];
         }), vars.contents);
   const sign = {
     csig_self: public_self,
@@ -78966,26 +78966,26 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
     const vals = Curry._3(Meths.fold, (function (name, param, l) {
             if (param[1] === /* Virtual */0) {
               return {
-                      hd: name,
-                      tl: l
-                    };
+                hd: name,
+                tl: l
+              };
             } else {
               return l;
             }
           }), sign_csig_vars, /* [] */0);
     if (Caml_obj.caml_notequal(mets, /* [] */0) || Caml_obj.caml_notequal(vals, /* [] */0)) {
       throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                MEL_EXN_ID: $$Error$9,
-                _1: loc,
-                _2: val_env$1,
-                _3: {
-                  TAG: /* Virtual_class */10,
-                  _0: true,
-                  _1: $$final,
-                  _2: mets,
-                  _3: vals
-                }
-              });
+            MEL_EXN_ID: $$Error$9,
+            _1: loc,
+            _2: val_env$1,
+            _3: {
+              TAG: /* Virtual_class */10,
+              _0: true,
+              _1: $$final,
+              _2: mets,
+              _3: vals
+            }
+          });
     }
     const self_methods = Stdlib__List.fold_right((function (param, rem) {
             const kind = param[1];
@@ -79023,14 +79023,14 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
       const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
       if (trace.MEL_EXN_ID === Unify) {
         throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                  MEL_EXN_ID: $$Error$9,
-                  _1: loc,
-                  _2: val_env$1,
-                  _3: {
-                    TAG: /* Final_self_clash */21,
-                    _0: trace._1
-                  }
-                });
+              MEL_EXN_ID: $$Error$9,
+              _1: loc,
+              _2: val_env$1,
+              _3: {
+                TAG: /* Final_self_clash */21,
+                _0: trace._1
+              }
+            });
       }
       throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
     }
@@ -79054,8 +79054,8 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
         }), get_methods(public_self));
   const names = function (param) {
     return Stdlib__List.map((function (param) {
-                  return param[0];
-                }), param);
+            return param[0];
+          }), param);
   };
   const l1 = names(priv_meths);
   const l2 = names(pub_meths$p);
@@ -79069,20 +79069,20 @@ function class_structure(cl_num, $$final, val_env, met_env, loc, param) {
         });
   }
   const sign$1 = $$final ? sign : ({
-        csig_self: expand_head(val_env$1, public_self),
-        csig_vars: sign_csig_vars,
-        csig_concr: concr_meths,
-        csig_inher: inher
-      });
+      csig_self: expand_head(val_env$1, public_self),
+      csig_vars: sign_csig_vars,
+      csig_concr: concr_meths,
+      csig_inher: inher
+    });
   return [
-          {
-            cstr_self: pat,
-            cstr_fields: fields,
-            cstr_type: sign$1,
-            cstr_meths: meths$1
-          },
-          sign$1
-        ];
+    {
+      cstr_self: pat,
+      cstr_fields: fields,
+      cstr_type: sign$1,
+      cstr_meths: meths$1
+    },
+    sign$1
+  ];
 }
 
 function class_expr(cl_num, val_env, met_env, _scl) {
@@ -79097,14 +79097,14 @@ function class_expr(cl_num, val_env, met_env, _scl) {
           const path = match[0];
           if (same(decl.cty_path, unbound_class)) {
             throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                      MEL_EXN_ID: $$Error$9,
-                      _1: scl.pcl_loc,
-                      _2: val_env,
-                      _3: {
-                        TAG: /* Unbound_class_2 */6,
-                        _0: lid.txt
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$9,
+                  _1: scl.pcl_loc,
+                  _2: val_env,
+                  _3: {
+                    TAG: /* Unbound_class_2 */6,
+                    _0: lid.txt
+                  }
+                });
           }
           const tyl = Stdlib__List.map((function (sty) {
                   return transl_simple_type(val_env, false, sty);
@@ -79115,16 +79115,16 @@ function class_expr(cl_num, val_env, met_env, _scl) {
           const clty$p = abbreviate_class_type(path, params, clty);
           if (Stdlib__List.length(params) !== Stdlib__List.length(tyl)) {
             throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                      MEL_EXN_ID: $$Error$9,
-                      _1: scl.pcl_loc,
-                      _2: val_env,
-                      _3: {
-                        TAG: /* Parameter_arity_mismatch */11,
-                        _0: lid.txt,
-                        _1: Stdlib__List.length(params),
-                        _2: Stdlib__List.length(tyl)
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$9,
+                  _1: scl.pcl_loc,
+                  _2: val_env,
+                  _3: {
+                    TAG: /* Parameter_arity_mismatch */11,
+                    _0: lid.txt,
+                    _1: Stdlib__List.length(params),
+                    _2: Stdlib__List.length(tyl)
+                  }
+                });
           }
           Stdlib__List.iter2((function (cty$p, ty) {
                   const ty$p = cty$p.ctyp_type;
@@ -79135,14 +79135,14 @@ function class_expr(cl_num, val_env, met_env, _scl) {
                     const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
                     if (trace.MEL_EXN_ID === Unify) {
                       throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                                MEL_EXN_ID: $$Error$9,
-                                _1: cty$p.ctyp_loc,
-                                _2: val_env,
-                                _3: {
-                                  TAG: /* Parameter_mismatch */12,
-                                  _0: trace._1
-                                }
-                              });
+                            MEL_EXN_ID: $$Error$9,
+                            _1: cty$p.ctyp_loc,
+                            _2: val_env,
+                            _3: {
+                              TAG: /* Parameter_mismatch */12,
+                              _0: trace._1
+                            }
+                          });
                     }
                     throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
                   }
@@ -79161,34 +79161,34 @@ function class_expr(cl_num, val_env, met_env, _scl) {
               });
           const match$2 = extract_constraints(clty);
           return rc({
-                      cl_desc: {
-                        TAG: /* Tcl_constraint */5,
-                        _0: cl,
-                        _1: undefined,
-                        _2: match$2[0],
-                        _3: match$2[1],
-                        _4: match$2[2]
-                      },
-                      cl_loc: scl.pcl_loc,
-                      cl_type: clty$p,
-                      cl_env: val_env,
-                      cl_attributes: /* [] */0
-                    });
+                cl_desc: {
+                  TAG: /* Tcl_constraint */5,
+                  _0: cl,
+                  _1: undefined,
+                  _2: match$2[0],
+                  _3: match$2[1],
+                  _4: match$2[2]
+                },
+                cl_loc: scl.pcl_loc,
+                cl_type: clty$p,
+                cl_env: val_env,
+                cl_attributes: /* [] */0
+              });
       case /* Pcl_structure */1 :
           const match$3 = class_structure(cl_num, false, val_env, met_env, scl.pcl_loc, cl_str._0);
           return rc({
-                      cl_desc: {
-                        TAG: /* Tcl_structure */1,
-                        _0: match$3[0]
-                      },
-                      cl_loc: scl.pcl_loc,
-                      cl_type: {
-                        TAG: /* Cty_signature */1,
-                        _0: match$3[1]
-                      },
-                      cl_env: val_env,
-                      cl_attributes: scl.pcl_attributes
-                    });
+                cl_desc: {
+                  TAG: /* Tcl_structure */1,
+                  _0: match$3[0]
+                },
+                cl_loc: scl.pcl_loc,
+                cl_type: {
+                  TAG: /* Cty_signature */1,
+                  _0: match$3[1]
+                },
+                cl_env: val_env,
+                cl_attributes: scl.pcl_attributes
+              });
       case /* Pcl_fun */2 :
           const $$default = cl_str._1;
           const l = cl_str._0;
@@ -79269,28 +79269,28 @@ function class_expr(cl_num, val_env, met_env, _scl) {
                   };
                   const vd = find_value(path, val_env$p);
                   return [
-                          id,
-                          param[1],
-                          {
-                            exp_desc: {
-                              TAG: /* Texp_ident */0,
-                              _0: path,
-                              _1: {
-                                txt: {
-                                  TAG: /* Lident */0,
-                                  _0: id.name
-                                },
-                                loc: none
-                              },
-                              _2: vd
-                            },
-                            exp_loc: none,
-                            exp_extra: /* [] */0,
-                            exp_type: instance(undefined, val_env$p, vd.val_type),
-                            exp_env: val_env$p,
-                            exp_attributes: /* [] */0
-                          }
-                        ];
+                    id,
+                    param[1],
+                    {
+                      exp_desc: {
+                        TAG: /* Texp_ident */0,
+                        _0: path,
+                        _1: {
+                          txt: {
+                            TAG: /* Lident */0,
+                            _0: id.name
+                          },
+                          loc: none
+                        },
+                        _2: vd
+                      },
+                      exp_loc: none,
+                      exp_extra: /* [] */0,
+                      exp_type: instance(undefined, val_env$p, vd.val_type),
+                      exp_env: val_env$p,
+                      exp_attributes: /* [] */0
+                    }
+                  ];
                 }), match$4[1]);
           const not_function = function (param) {
             switch (param.TAG) {
@@ -79330,24 +79330,24 @@ function class_expr(cl_num, val_env, met_env, _scl) {
             prerr_warning(pat.pat_loc, /* Unerasable_optional_argument */8);
           }
           return rc({
-                      cl_desc: {
-                        TAG: /* Tcl_fun */2,
-                        _0: l,
-                        _1: pat,
-                        _2: pv,
-                        _3: cl$1,
-                        _4: partial
-                      },
-                      cl_loc: scl.pcl_loc,
-                      cl_type: {
-                        TAG: /* Cty_arrow */2,
-                        _0: l,
-                        _1: instance_def(pat.pat_type),
-                        _2: cl$1.cl_type
-                      },
-                      cl_env: val_env,
-                      cl_attributes: scl.pcl_attributes
-                    });
+                cl_desc: {
+                  TAG: /* Tcl_fun */2,
+                  _0: l,
+                  _1: pat,
+                  _2: pv,
+                  _3: cl$1,
+                  _4: partial
+                },
+                cl_loc: scl.pcl_loc,
+                cl_type: {
+                  TAG: /* Cty_arrow */2,
+                  _0: l,
+                  _1: instance_def(pat.pat_type),
+                  _2: cl$1.cl_type
+                },
+                cl_env: val_env,
+                cl_attributes: scl.pcl_attributes
+              });
       case /* Pcl_apply */3 :
           const sargs = cl_str._1;
           if (Caml_obj.caml_equal(sargs, /* [] */0)) {
@@ -79424,14 +79424,14 @@ function class_expr(cl_num, val_env, met_env, _scl) {
                               if (sargs) {
                                 const match$1 = sargs.hd;
                                 throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                                          MEL_EXN_ID: $$Error$9,
-                                          _1: match$1[1].pexp_loc,
-                                          _2: val_env,
-                                          _3: {
-                                            TAG: /* Apply_wrong_label */4,
-                                            _0: match$1[0]
-                                          }
-                                        });
+                                      MEL_EXN_ID: $$Error$9,
+                                      _1: match$1[1].pexp_loc,
+                                      _2: val_env,
+                                      _3: {
+                                        TAG: /* Apply_wrong_label */4,
+                                        _0: match$1[0]
+                                      }
+                                    });
                               }
                               if (more_sargs) {
                                 const match$2 = more_sargs.hd;
@@ -79439,14 +79439,14 @@ function class_expr(cl_num, val_env, met_env, _scl) {
                                 const l$p = match$2[0];
                                 if (l !== l$p && l$p !== "") {
                                   throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                                            MEL_EXN_ID: $$Error$9,
-                                            _1: sarg0.pexp_loc,
-                                            _2: val_env,
-                                            _3: {
-                                              TAG: /* Apply_wrong_label */4,
-                                              _0: l$p
-                                            }
-                                          });
+                                        MEL_EXN_ID: $$Error$9,
+                                        _1: sarg0.pexp_loc,
+                                        _2: val_env,
+                                        _3: {
+                                          TAG: /* Apply_wrong_label */4,
+                                          _0: l$p
+                                        }
+                                      });
                                 }
                                 match = [
                                   /* [] */0,
@@ -79455,13 +79455,13 @@ function class_expr(cl_num, val_env, met_env, _scl) {
                                 ];
                               } else {
                                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                          MEL_EXN_ID: "Assert_failure",
-                                          _1: [
-                                            "jscomp/test/ocaml_typedtree_test.ml",
-                                            49036,
-                                            20
-                                          ]
-                                        });
+                                      MEL_EXN_ID: "Assert_failure",
+                                      _1: [
+                                        "jscomp/test/ocaml_typedtree_test.ml",
+                                        49036,
+                                        20
+                                      ]
+                                    });
                               }
                             } else {
                               try {
@@ -79527,12 +79527,12 @@ function class_expr(cl_num, val_env, met_env, _scl) {
                             }
                             const arg$1 = match[2];
                             const omitted$1 = arg$1 === undefined ? ({
-                                  hd: [
-                                    l,
-                                    ty0
-                                  ],
-                                  tl: omitted
-                                }) : omitted;
+                                hd: [
+                                  l,
+                                  ty0
+                                ],
+                                tl: omitted
+                              }) : omitted;
                             _more_sargs = match[1];
                             _sargs = match[0];
                             _ty_fun0 = ty_fun0._2;
@@ -79557,54 +79557,54 @@ function class_expr(cl_num, val_env, met_env, _scl) {
               const match$6 = Stdlib.$at(sargs, more_sargs);
               if (!match$6) {
                 return [
-                        Stdlib__List.rev(args),
-                        Stdlib__List.fold_left((function (ty_fun, param) {
-                                return {
-                                        TAG: /* Cty_arrow */2,
-                                        _0: param[0],
-                                        _1: param[1],
-                                        _2: ty_fun
-                                      };
-                              }), ty_fun0, omitted)
-                      ];
+                  Stdlib__List.rev(args),
+                  Stdlib__List.fold_left((function (ty_fun, param) {
+                          return {
+                            TAG: /* Cty_arrow */2,
+                            _0: param[0],
+                            _1: param[1],
+                            _2: ty_fun
+                          };
+                        }), ty_fun0, omitted)
+                ];
               }
               if (Caml_obj.caml_notequal(omitted, /* [] */0)) {
                 const match$7 = match$6.hd;
                 throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                          MEL_EXN_ID: $$Error$9,
-                          _1: match$7[1].pexp_loc,
-                          _2: val_env,
-                          _3: {
-                            TAG: /* Apply_wrong_label */4,
-                            _0: match$7[0]
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$9,
+                      _1: match$7[1].pexp_loc,
+                      _2: val_env,
+                      _3: {
+                        TAG: /* Apply_wrong_label */4,
+                        _0: match$7[0]
+                      }
+                    });
               }
               throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                        MEL_EXN_ID: $$Error$9,
-                        _1: cl$2.cl_loc,
-                        _2: val_env,
-                        _3: {
-                          TAG: /* Cannot_apply */3,
-                          _0: cl$2.cl_type
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$9,
+                    _1: cl$2.cl_loc,
+                    _2: val_env,
+                    _3: {
+                      TAG: /* Cannot_apply */3,
+                      _0: cl$2.cl_type
+                    }
+                  });
             };
           };
           const match$5 = instance_class(/* [] */0, cl$2.cl_type);
           const ty_fun0 = match$5[1];
           const match$6 = ignore_labels ? type_args(/* [] */0, /* [] */0, cl$2.cl_type, ty_fun0, /* [] */0, sargs) : type_args(/* [] */0, /* [] */0, cl$2.cl_type, ty_fun0, sargs, /* [] */0);
           return rc({
-                      cl_desc: {
-                        TAG: /* Tcl_apply */3,
-                        _0: cl$2,
-                        _1: match$6[0]
-                      },
-                      cl_loc: scl.pcl_loc,
-                      cl_type: match$6[1],
-                      cl_env: val_env,
-                      cl_attributes: scl.pcl_attributes
-                    });
+                cl_desc: {
+                  TAG: /* Tcl_apply */3,
+                  _0: cl$2,
+                  _1: match$6[0]
+                },
+                cl_loc: scl.pcl_loc,
+                cl_type: match$6[1],
+                cl_env: val_env,
+                cl_attributes: scl.pcl_attributes
+              });
       case /* Pcl_let */4 :
           const rec_flag = cl_str._0;
           let match$7;
@@ -79620,14 +79620,14 @@ function class_expr(cl_num, val_env, met_env, _scl) {
                   throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
                 }
                 throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                          MEL_EXN_ID: $$Error$9,
-                          _1: scl.pcl_loc,
-                          _2: val_env,
-                          _3: {
-                            TAG: /* Make_nongen_seltype */17,
-                            _0: match$8.hd[0]
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$9,
+                      _1: scl.pcl_loc,
+                      _2: val_env,
+                      _3: {
+                        TAG: /* Make_nongen_seltype */17,
+                        _0: match$8.hd[0]
+                      }
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
             }
@@ -79683,34 +79683,34 @@ function class_expr(cl_num, val_env, met_env, _scl) {
                   };
                   const id$p = create(id.name);
                   return [
-                          {
-                            hd: [
-                              id$p,
-                              param[1],
-                              expr
-                            ],
-                            tl: param$1[0]
-                          },
-                          add_value(undefined, id$p, desc, param$1[1])
-                        ];
+                    {
+                      hd: [
+                        id$p,
+                        param[1],
+                        expr
+                      ],
+                      tl: param$1[0]
+                    },
+                    add_value(undefined, id$p, desc, param$1[1])
+                  ];
                 }), Stdlib__List.rev(rev_let_bound_idents_with_loc(defs)), [
                 /* [] */0,
                 met_env
               ]);
           const cl$3 = class_expr(cl_num, val_env$1, match$9[1], cl_str._2);
           return rc({
-                      cl_desc: {
-                        TAG: /* Tcl_let */4,
-                        _0: rec_flag,
-                        _1: defs,
-                        _2: match$9[0],
-                        _3: cl$3
-                      },
-                      cl_loc: scl.pcl_loc,
-                      cl_type: cl$3.cl_type,
-                      cl_env: val_env$1,
-                      cl_attributes: scl.pcl_attributes
-                    });
+                cl_desc: {
+                  TAG: /* Tcl_let */4,
+                  _0: rec_flag,
+                  _1: defs,
+                  _2: match$9[0],
+                  _3: cl$3
+                },
+                cl_loc: scl.pcl_loc,
+                cl_type: cl$3.cl_type,
+                cl_env: val_env$1,
+                cl_attributes: scl.pcl_attributes
+              });
       case /* Pcl_constraint */5 :
           begin_class_def(undefined);
           const context = narrow(undefined);
@@ -79725,35 +79725,35 @@ function class_expr(cl_num, val_env, met_env, _scl) {
           const error = class_types(val_env, cl$4.cl_type, clty$1.cltyp_type);
           if (error) {
             throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                      MEL_EXN_ID: $$Error$9,
-                      _1: cl$4.cl_loc,
-                      _2: val_env,
-                      _3: {
-                        TAG: /* Class_match_failure */14,
-                        _0: error
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$9,
+                  _1: cl$4.cl_loc,
+                  _2: val_env,
+                  _3: {
+                    TAG: /* Class_match_failure */14,
+                    _0: error
+                  }
+                });
           }
           const match$10 = extract_constraints(clty$1.cltyp_type);
           return rc({
-                      cl_desc: {
-                        TAG: /* Tcl_constraint */5,
-                        _0: cl$4,
-                        _1: clty$1,
-                        _2: match$10[0],
-                        _3: match$10[1],
-                        _4: match$10[2]
-                      },
-                      cl_loc: scl.pcl_loc,
-                      cl_type: instance_class(/* [] */0, clty$1.cltyp_type)[1],
-                      cl_env: val_env,
-                      cl_attributes: scl.pcl_attributes
-                    });
+                cl_desc: {
+                  TAG: /* Tcl_constraint */5,
+                  _0: cl$4,
+                  _1: clty$1,
+                  _2: match$10[0],
+                  _3: match$10[1],
+                  _4: match$10[2]
+                },
+                cl_loc: scl.pcl_loc,
+                cl_type: instance_class(/* [] */0, clty$1.cltyp_type)[1],
+                cl_env: val_env,
+                cl_attributes: scl.pcl_attributes
+              });
       case /* Pcl_extension */6 :
           throw new Caml_js_exceptions.MelangeError(Error_forward$2, {
-                    MEL_EXN_ID: Error_forward$2,
-                    _1: error_of_extension(cl_str._0)
-                  });
+                MEL_EXN_ID: Error_forward$2,
+                _1: error_of_extension(cl_str._0)
+              });
       
     }
   };
@@ -79832,54 +79832,54 @@ function temp_abbrev(loc, env, id, arity) {
         type_attributes: /* [] */0
       }, env);
   return [
-          params,
-          ty,
-          env$1
-        ];
+    params,
+    ty,
+    env$1
+  ];
 }
 
 function extract_type_decls(param, decls) {
   return {
-          hd: [
-            param[5],
-            param[6],
-            param[8],
-            param[2],
-            param[4],
-            param[13]
-          ],
-          tl: decls
-        };
+    hd: [
+      param[5],
+      param[6],
+      param[8],
+      param[2],
+      param[4],
+      param[13]
+    ],
+    tl: decls
+  };
 }
 
 function merge_type_decls(param, param$1) {
   return [
-          param[0],
-          param[1],
-          param$1[2],
-          param[3],
-          param$1[3],
-          param[5],
-          param$1[0],
-          param[7],
-          param$1[1],
-          param[9],
-          param[10],
-          param[11],
-          param[12],
-          param[13]
-        ];
+    param[0],
+    param[1],
+    param$1[2],
+    param[3],
+    param$1[3],
+    param[5],
+    param$1[0],
+    param[7],
+    param$1[1],
+    param[9],
+    param[10],
+    param[11],
+    param[12],
+    param[13]
+  ];
 }
 
 function type_classes(define_class, approx, kind, env, cls) {
   const cls$1 = Stdlib__List.map((function (cl) {
           return [
-                  cl,
-                  create(cl.pci_name.txt),
-                  create(cl.pci_name.txt),
-                  create(cl.pci_name.txt),
-                  create("#" + cl.pci_name.txt)
-                ];
+            cl,
+            create(cl.pci_name.txt),
+            create(cl.pci_name.txt),
+            create(cl.pci_name.txt),
+            create("#" + cl.pci_name.txt)
+          ];
         }), cls);
   init_def(currentstamp.contents);
   begin_class_def(undefined);
@@ -79927,24 +79927,24 @@ function type_classes(define_class, approx, kind, env, cls) {
                 clty_attributes: /* [] */0
               }, define_class ? add_class(id, dummy_class, env) : env);
           return [
-                  {
-                    hd: [
-                      cl,
-                      id,
-                      ty_id,
-                      obj_id,
-                      match[0],
-                      match[1],
-                      cl_id,
-                      match$1[0],
-                      match$1[1],
-                      constr_type,
-                      dummy_class
-                    ],
-                    tl: param[0]
-                  },
-                  env$1
-                ];
+            {
+              hd: [
+                cl,
+                id,
+                ty_id,
+                obj_id,
+                match[0],
+                match[1],
+                cl_id,
+                match$1[0],
+                match$1[1],
+                constr_type,
+                dummy_class
+              ],
+              tl: param[0]
+            },
+            env$1
+          ];
         }), [
         /* [] */0,
         env
@@ -79967,19 +79967,19 @@ function type_classes(define_class, approx, kind, env, cls) {
             const sty = param[0];
             try {
               return [
-                      transl_type_param(env, sty),
-                      param[1]
-                    ];
+                transl_type_param(env, sty),
+                param[1]
+              ];
             }
             catch (raw_exn){
               const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
               if (exn.MEL_EXN_ID === Already_bound) {
                 throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                          MEL_EXN_ID: $$Error$9,
-                          _1: sty.ptyp_loc,
-                          _2: env,
-                          _3: /* Repeated_parameter */0
-                        });
+                      MEL_EXN_ID: $$Error$9,
+                      _1: sty.ptyp_loc,
+                      _2: env,
+                      _3: /* Repeated_parameter */0
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
             }
@@ -80018,8 +80018,8 @@ function type_classes(define_class, approx, kind, env, cls) {
           Stdlib__List.iter((function (param) {
                   if (param[0] === dummy_method) {
                     return iter_generalize$1({
-                                contents: /* [] */0
-                              }, param[2]);
+                          contents: /* [] */0
+                        }, param[2]);
                   }
                   
                 }), match$1[0]);
@@ -80047,19 +80047,19 @@ function type_classes(define_class, approx, kind, env, cls) {
             const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn$1.MEL_EXN_ID === Unify) {
               throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                        MEL_EXN_ID: $$Error$9,
-                        _1: cl.pci_loc,
-                        _2: env,
-                        _3: {
-                          TAG: /* Bad_parameters */13,
-                          _0: obj_id,
-                          _1: constr,
-                          _2: newconstr({
-                                TAG: /* Pident */0,
-                                _0: obj_id
-                              }, obj_params$p)
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$9,
+                    _1: cl.pci_loc,
+                    _2: env,
+                    _3: {
+                      TAG: /* Bad_parameters */13,
+                      _0: obj_id,
+                      _1: constr,
+                      _2: newconstr({
+                            TAG: /* Pident */0,
+                            _0: obj_id
+                          }, obj_params$p)
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
           }
@@ -80070,16 +80070,16 @@ function type_classes(define_class, approx, kind, env, cls) {
             const exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
             if (exn$2.MEL_EXN_ID === Unify) {
               throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                        MEL_EXN_ID: $$Error$9,
-                        _1: cl.pci_loc,
-                        _2: env,
-                        _3: {
-                          TAG: /* Abbrev_type_clash */8,
-                          _0: constr,
-                          _1: ty,
-                          _2: expand_head(env, constr)
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$9,
+                    _1: cl.pci_loc,
+                    _2: env,
+                    _3: {
+                      TAG: /* Abbrev_type_clash */8,
+                      _0: constr,
+                      _1: ty,
+                      _2: expand_head(env, constr)
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$2.MEL_EXN_ID, exn$2);
           }
@@ -80097,22 +80097,22 @@ function type_classes(define_class, approx, kind, env, cls) {
             const exn$3 = Caml_js_exceptions.internalToOCamlException(raw_exn$2);
             if (exn$3.MEL_EXN_ID === Unify) {
               throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                        MEL_EXN_ID: $$Error$9,
-                        _1: cl.pci_loc,
-                        _2: env,
-                        _3: {
-                          TAG: /* Bad_parameters */13,
-                          _0: cl_id,
-                          _1: newconstr({
-                                TAG: /* Pident */0,
-                                _0: cl_id
-                              }, cl_params),
-                          _2: newconstr({
-                                TAG: /* Pident */0,
-                                _0: cl_id
-                              }, cl_params$p)
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$9,
+                    _1: cl.pci_loc,
+                    _2: env,
+                    _3: {
+                      TAG: /* Bad_parameters */13,
+                      _0: cl_id,
+                      _1: newconstr({
+                            TAG: /* Pident */0,
+                            _0: cl_id
+                          }, cl_params),
+                      _2: newconstr({
+                            TAG: /* Pident */0,
+                            _0: cl_id
+                          }, cl_params$p)
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$3.MEL_EXN_ID, exn$3);
           }
@@ -80127,16 +80127,16 @@ function type_classes(define_class, approx, kind, env, cls) {
                     _0: cl_id
                   }, params);
               throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                        MEL_EXN_ID: $$Error$9,
-                        _1: cl.pci_loc,
-                        _2: env,
-                        _3: {
-                          TAG: /* Abbrev_type_clash */8,
-                          _0: constr$1,
-                          _1: ty$1,
-                          _2: cl_ty
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$9,
+                    _1: cl.pci_loc,
+                    _2: env,
+                    _3: {
+                      TAG: /* Abbrev_type_clash */8,
+                      _0: constr$1,
+                      _1: ty$1,
+                      _2: cl_ty
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$4.MEL_EXN_ID, exn$4);
           }
@@ -80147,15 +80147,15 @@ function type_classes(define_class, approx, kind, env, cls) {
             const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
             if (trace.MEL_EXN_ID === Unify) {
               throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                        MEL_EXN_ID: $$Error$9,
-                        _1: cl.pci_loc,
-                        _2: env,
-                        _3: {
-                          TAG: /* Constructor_type_mismatch */9,
-                          _0: cl.pci_name.txt,
-                          _1: trace._1
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$9,
+                    _1: cl.pci_loc,
+                    _2: env,
+                    _3: {
+                      TAG: /* Constructor_type_mismatch */9,
+                      _0: cl.pci_name.txt,
+                      _1: trace._1
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
           }
@@ -80200,26 +80200,26 @@ function type_classes(define_class, approx, kind, env, cls) {
             const vals = Curry._3(Meths.fold, (function (name, param, l) {
                     if (param[1] === /* Virtual */0) {
                       return {
-                              hd: name,
-                              tl: l
-                            };
+                        hd: name,
+                        tl: l
+                      };
                     } else {
                       return l;
                     }
                   }), sign.csig_vars, /* [] */0);
             if (Caml_obj.caml_notequal(mets, /* [] */0) || Caml_obj.caml_notequal(vals, /* [] */0)) {
               throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                        MEL_EXN_ID: $$Error$9,
-                        _1: cl.pci_loc,
-                        _2: env$1,
-                        _3: {
-                          TAG: /* Virtual_class */10,
-                          _0: define_class,
-                          _1: false,
-                          _2: mets,
-                          _3: vals
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$9,
+                    _1: cl.pci_loc,
+                    _2: env$1,
+                    _3: {
+                      TAG: /* Virtual_class */10,
+                      _0: define_class,
+                      _1: false,
+                      _2: mets,
+                      _3: vals
+                    }
+                  });
             }
             
           }
@@ -80301,27 +80301,27 @@ function type_classes(define_class, approx, kind, env, cls) {
             type_attributes: /* [] */0
           };
           return [
-                  {
-                    hd: [
-                      cl,
-                      id,
-                      clty$1,
-                      ty_id,
-                      cltydef$1,
-                      obj_id,
-                      obj_abbr,
-                      cl_id,
-                      cl_abbr,
-                      ci_params,
-                      arity,
-                      pub_meths,
-                      Stdlib__List.rev(coercion_locs.contents),
-                      match[0]
-                    ],
-                    tl: param$1[0]
-                  },
-                  env$1
-                ];
+            {
+              hd: [
+                cl,
+                id,
+                clty$1,
+                ty_id,
+                cltydef$1,
+                obj_id,
+                obj_abbr,
+                cl_id,
+                cl_abbr,
+                ci_params,
+                arity,
+                pub_meths,
+                Stdlib__List.rev(coercion_locs.contents),
+                match[0]
+              ],
+              tl: param$1[0]
+            },
+            env$1
+          ];
         }), match[0], [
         /* [] */0,
         match[1]
@@ -80346,16 +80346,16 @@ function type_classes(define_class, approx, kind, env, cls) {
             const trace = Caml_js_exceptions.internalToOCamlException(raw_trace);
             if (trace.MEL_EXN_ID === Unify) {
               throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                        MEL_EXN_ID: $$Error$9,
-                        _1: cl.pci_loc,
-                        _2: env$1,
-                        _3: {
-                          TAG: /* Non_collapsable_conjunction */20,
-                          _0: id,
-                          _1: clty,
-                          _2: trace._1
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$9,
+                    _1: cl.pci_loc,
+                    _2: env$1,
+                    _3: {
+                      TAG: /* Non_collapsable_conjunction */20,
+                      _0: id,
+                      _1: clty,
+                      _2: trace._1
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(trace.MEL_EXN_ID, trace);
           }
@@ -80368,15 +80368,15 @@ function type_classes(define_class, approx, kind, env, cls) {
           may(generalize, cl_abbr.type_manifest);
           if (!closed_class$1(clty)) {
             throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                      MEL_EXN_ID: $$Error$9,
-                      _1: cl.pci_loc,
-                      _2: env$1,
-                      _3: {
-                        TAG: /* Non_generalizable_class */18,
-                        _0: id,
-                        _1: clty
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$9,
+                  _1: cl.pci_loc,
+                  _2: env$1,
+                  _3: {
+                    TAG: /* Non_generalizable_class */18,
+                    _0: id,
+                    _1: clty
+                  }
+                });
           }
           const reason = closed_class(clty.cty_params, signature_of_class_type(clty.cty_type));
           if (reason !== undefined) {
@@ -80386,45 +80386,45 @@ function type_classes(define_class, approx, kind, env, cls) {
                   cltype_declaration$1(id, ppf, cltydef);
                 });
             throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                      MEL_EXN_ID: $$Error$9,
-                      _1: cl.pci_loc,
-                      _2: env$1,
-                      _3: {
-                        TAG: /* Unbound_type_var */16,
-                        _0: printer,
-                        _1: reason
-                      }
-                    });
+                  MEL_EXN_ID: $$Error$9,
+                  _1: cl.pci_loc,
+                  _2: env$1,
+                  _3: {
+                    TAG: /* Unbound_type_var */16,
+                    _0: printer,
+                    _1: reason
+                  }
+                });
           }
           return [
-                  id,
-                  cl.pci_name,
-                  clty,
-                  ty_id,
-                  cltydef,
-                  obj_id,
-                  obj_abbr,
-                  cl_id,
-                  cl_abbr,
-                  param[10],
-                  param[11],
-                  param[12],
-                  expr,
-                  {
-                    ci_virt: cl.pci_virt,
-                    ci_params: param[9],
-                    ci_id_name: cl.pci_name,
-                    ci_id_class: id,
-                    ci_id_class_type: ty_id,
-                    ci_id_object: obj_id,
-                    ci_id_typesharp: cl_id,
-                    ci_expr: expr,
-                    ci_decl: clty,
-                    ci_type_decl: cltydef,
-                    ci_loc: cl.pci_loc,
-                    ci_attributes: cl.pci_attributes
-                  }
-                ];
+            id,
+            cl.pci_name,
+            clty,
+            ty_id,
+            cltydef,
+            obj_id,
+            obj_abbr,
+            cl_id,
+            cl_abbr,
+            param[10],
+            param[11],
+            param[12],
+            expr,
+            {
+              ci_virt: cl.pci_virt,
+              ci_params: param[9],
+              ci_id_name: cl.pci_name,
+              ci_id_class: id,
+              ci_id_class_type: ty_id,
+              ci_id_object: obj_id,
+              ci_id_typesharp: cl_id,
+              ci_expr: expr,
+              ci_decl: clty,
+              ci_type_decl: cltydef,
+              ci_loc: cl.pci_loc,
+              ci_attributes: cl.pci_attributes
+            }
+          ];
         }), match$1[0]);
   const decls = Stdlib__List.fold_right(extract_type_decls, res, /* [] */0);
   const decls$1 = compute_variance_decls(env$1, decls);
@@ -80454,23 +80454,23 @@ function type_classes(define_class, approx, kind, env, cls) {
                 ];
               } else {
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            49581,
-                            15
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        49581,
+                        15
+                      ]
+                    });
               }
             } else {
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          49581,
-                          15
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/ocaml_typedtree_test.ml",
+                      49581,
+                      15
+                    ]
+                  });
             }
             const obj_ty = match$2[1];
             const cl_ty = match$2[0];
@@ -80481,50 +80481,50 @@ function type_classes(define_class, approx, kind, env, cls) {
               const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
               if (exn.MEL_EXN_ID === Subtype) {
                 throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                          MEL_EXN_ID: $$Error$7,
-                          _1: loc,
-                          _2: env$2,
-                          _3: {
-                            TAG: /* Not_subtype */23,
-                            _0: exn._1,
-                            _1: exn._2
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$7,
+                      _1: loc,
+                      _2: env$2,
+                      _3: {
+                        TAG: /* Not_subtype */23,
+                        _0: exn._1,
+                        _1: exn._2
+                      }
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
             }
             if (!opened_object(cl_ty)) {
               throw new Caml_js_exceptions.MelangeError($$Error$9, {
-                        MEL_EXN_ID: $$Error$9,
-                        _1: loc,
-                        _2: env$2,
-                        _3: {
-                          TAG: /* Cannot_coerce_self */19,
-                          _0: obj_ty
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$9,
+                    _1: loc,
+                    _2: env$2,
+                    _3: {
+                      TAG: /* Cannot_coerce_self */19,
+                      _0: obj_ty
+                    }
+                  });
             }
             
           }
           return [
-                  param[0],
-                  param[1],
-                  param[2],
-                  param[3],
-                  param[4],
-                  param[5],
-                  obj_abbr,
-                  param[7],
-                  cl_abbr,
-                  param[9],
-                  param[10],
-                  param[13]
-                ];
+            param[0],
+            param[1],
+            param[2],
+            param[3],
+            param[4],
+            param[5],
+            obj_abbr,
+            param[7],
+            cl_abbr,
+            param[9],
+            param[10],
+            param[13]
+          ];
         }), res$1);
   return [
-          res$2,
-          env$2
-        ];
+    res$2,
+    env$2
+  ];
 }
 
 const class_num = {
@@ -80535,17 +80535,17 @@ function class_declaration$2(env, sexpr) {
   class_num.contents = class_num.contents + 1 | 0;
   const expr = class_expr(String(class_num.contents), env, env, sexpr);
   return [
-          expr,
-          expr.cl_type
-        ];
+    expr,
+    expr.cl_type
+  ];
 }
 
 function class_description(env, sexpr) {
   const expr = class_type$4(env, sexpr);
   return [
-          expr,
-          expr.cltyp_type
-        ];
+    expr,
+    expr.cltyp_type
+  ];
 }
 
 function class_declarations$2(env, cls) {
@@ -80559,20 +80559,20 @@ function class_descriptions(env, cls) {
 function class_type_declarations$2(env, cls) {
   const match = type_classes(false, approx_description, class_description, env, cls);
   return [
-          Stdlib__List.map((function (param) {
-                  return [
-                          param[3],
-                          param[1],
-                          param[4],
-                          param[5],
-                          param[6],
-                          param[7],
-                          param[8],
-                          param[11]
-                        ];
-                }), match[0]),
-          match[1]
-        ];
+    Stdlib__List.map((function (param) {
+            return [
+              param[3],
+              param[1],
+              param[4],
+              param[5],
+              param[6],
+              param[7],
+              param[8],
+              param[11]
+            ];
+          }), match[0]),
+    match[1]
+  ];
 }
 
 function unify_parents_struct(env, ty, st) {
@@ -80596,13 +80596,13 @@ function unify_parents_struct(env, ty, st) {
                         return ;
                       }
                       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                MEL_EXN_ID: "Assert_failure",
-                                _1: [
-                                  "jscomp/test/ocaml_typedtree_test.ml",
-                                  49658,
-                                  15
-                                ]
-                              });
+                            MEL_EXN_ID: "Assert_failure",
+                            _1: [
+                              "jscomp/test/ocaml_typedtree_test.ml",
+                              49658,
+                              15
+                            ]
+                          });
                     }
                 case /* Tcl_structure */1 :
                     return unify_parents_struct(env, ty, st._0);
@@ -80635,10 +80635,10 @@ function type_object$1(env, loc, s) {
         }), match$1[0]);
   unify_parents_struct(env, sign.csig_self, desc);
   return [
-          desc,
-          sign,
-          meths
-        ];
+    desc,
+    sign,
+    meths
+  ];
 }
 
 type_object.contents = type_object$1;
@@ -80650,13 +80650,13 @@ function approx_class(sdecl) {
         pcsig_fields: /* [] */0
       });
   return {
-          pci_virt: sdecl.pci_virt,
-          pci_params: sdecl.pci_params,
-          pci_name: sdecl.pci_name,
-          pci_expr: clty$p,
-          pci_loc: sdecl.pci_loc,
-          pci_attributes: sdecl.pci_attributes
-        };
+    pci_virt: sdecl.pci_virt,
+    pci_params: sdecl.pci_params,
+    pci_name: sdecl.pci_name,
+    pci_expr: clty$p,
+    pci_loc: sdecl.pci_loc,
+    pci_attributes: sdecl.pci_attributes
+  };
 }
 
 function approx_class_declarations(env, sdecls) {
@@ -80673,352 +80673,846 @@ register_error_of_exn(function (err) {
       }
       const env = err._2;
       return error_of_printer(err._1, (function (param, param$1) {
-                    return wrap_printing_env(env, (function (param$2) {
-                                  if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
-                                    return Stdlib__Format.fprintf(param)({
-                                                TAG: /* Format */0,
-                                                _0: {
-                                                  TAG: /* String_literal */11,
-                                                  _0: "A type parameter occurs several times",
-                                                  _1: /* End_of_format */0
-                                                },
-                                                _1: "A type parameter occurs several times"
-                                              });
-                                  }
-                                  switch (param$1.TAG) {
-                                    case /* Unconsistent_constraint */0 :
-                                        Stdlib__Format.fprintf(param)({
+              return wrap_printing_env(env, (function (param$2) {
+                      if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
+                        return Stdlib__Format.fprintf(param)({
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* String_literal */11,
+                                _0: "A type parameter occurs several times",
+                                _1: /* End_of_format */0
+                              },
+                              _1: "A type parameter occurs several times"
+                            });
+                      }
+                      switch (param$1.TAG) {
+                        case /* Unconsistent_constraint */0 :
+                            Stdlib__Format.fprintf(param)({
+                                  TAG: /* Format */0,
+                                  _0: {
+                                    TAG: /* String_literal */11,
+                                    _0: "The class constraints are not consistent.",
+                                    _1: {
+                                      TAG: /* Formatting_lit */17,
+                                      _0: /* Flush_newline */4,
+                                      _1: /* End_of_format */0
+                                    }
+                                  },
+                                  _1: "The class constraints are not consistent.@."
+                                });
+                            return report_unification_error(param, env, undefined, param$1._0, (function (ppf) {
+                                    Stdlib__Format.fprintf(ppf)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "Type",
+                                            _1: /* End_of_format */0
+                                          },
+                                          _1: "Type"
+                                        });
+                                  }), (function (ppf) {
+                                    Stdlib__Format.fprintf(ppf)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "is not compatible with type",
+                                            _1: /* End_of_format */0
+                                          },
+                                          _1: "is not compatible with type"
+                                        });
+                                  }));
+                        case /* Field_type_mismatch */1 :
+                            const m = param$1._1;
+                            const k = param$1._0;
+                            return report_unification_error(param, env, undefined, param$1._2, (function (ppf) {
+                                    Curry._2(Stdlib__Format.fprintf(ppf)({
                                               TAG: /* Format */0,
                                               _0: {
                                                 TAG: /* String_literal */11,
-                                                _0: "The class constraints are not consistent.",
+                                                _0: "The ",
                                                 _1: {
-                                                  TAG: /* Formatting_lit */17,
-                                                  _0: /* Flush_newline */4,
-                                                  _1: /* End_of_format */0
-                                                }
-                                              },
-                                              _1: "The class constraints are not consistent.@."
-                                            });
-                                        return report_unification_error(param, env, undefined, param$1._0, (function (ppf) {
-                                                      Stdlib__Format.fprintf(ppf)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "Type",
-                                                              _1: /* End_of_format */0
-                                                            },
-                                                            _1: "Type"
-                                                          });
-                                                    }), (function (ppf) {
-                                                      Stdlib__Format.fprintf(ppf)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "is not compatible with type",
-                                                              _1: /* End_of_format */0
-                                                            },
-                                                            _1: "is not compatible with type"
-                                                          });
-                                                    }));
-                                    case /* Field_type_mismatch */1 :
-                                        const m = param$1._1;
-                                        const k = param$1._0;
-                                        return report_unification_error(param, env, undefined, param$1._2, (function (ppf) {
-                                                      Curry._2(Stdlib__Format.fprintf(ppf)({
-                                                                TAG: /* Format */0,
-                                                                _0: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "The ",
-                                                                  _1: {
-                                                                    TAG: /* String */2,
-                                                                    _0: /* No_padding */0,
-                                                                    _1: {
-                                                                      TAG: /* Char_literal */12,
-                                                                      _0: /* ' ' */32,
-                                                                      _1: {
-                                                                        TAG: /* String */2,
-                                                                        _0: /* No_padding */0,
-                                                                        _1: {
-                                                                          TAG: /* Formatting_lit */17,
-                                                                          _0: {
-                                                                            TAG: /* Break */0,
-                                                                            _0: "@ ",
-                                                                            _1: 1,
-                                                                            _2: 0
-                                                                          },
-                                                                          _1: {
-                                                                            TAG: /* String_literal */11,
-                                                                            _0: "has type",
-                                                                            _1: /* End_of_format */0
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                },
-                                                                _1: "The %s %s@ has type"
-                                                              }), k, m);
-                                                    }), (function (ppf) {
-                                                      Stdlib__Format.fprintf(ppf)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "but is expected to have type",
-                                                              _1: /* End_of_format */0
-                                                            },
-                                                            _1: "but is expected to have type"
-                                                          });
-                                                    }));
-                                    case /* Structure_expected */2 :
-                                        return Curry._2(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
+                                                  TAG: /* String */2,
+                                                  _0: /* No_padding */0,
+                                                  _1: {
+                                                    TAG: /* Char_literal */12,
+                                                    _0: /* ' ' */32,
+                                                    _1: {
+                                                      TAG: /* String */2,
+                                                      _0: /* No_padding */0,
+                                                      _1: {
+                                                        TAG: /* Formatting_lit */17,
                                                         _0: {
-                                                          TAG: /* Formatting_gen */18,
-                                                          _0: {
-                                                            TAG: /* Open_box */1,
-                                                            _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: /* End_of_format */0,
-                                                              _1: ""
-                                                            }
-                                                          },
-                                                          _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "This class expression is not a class structure; it has type",
-                                                            _1: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: /* Close_box */0,
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            }
-                                                          }
+                                                          TAG: /* Break */0,
+                                                          _0: "@ ",
+                                                          _1: 1,
+                                                          _2: 0
                                                         },
-                                                        _1: "@[This class expression is not a class structure; it has type@ %a@]"
-                                                      }), class_type$2, param$1._0);
-                                    case /* Cannot_apply */3 :
-                                        return Stdlib__Format.fprintf(param)({
-                                                    TAG: /* Format */0,
+                                                        _1: {
+                                                          TAG: /* String_literal */11,
+                                                          _0: "has type",
+                                                          _1: /* End_of_format */0
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              _1: "The %s %s@ has type"
+                                            }), k, m);
+                                  }), (function (ppf) {
+                                    Stdlib__Format.fprintf(ppf)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "but is expected to have type",
+                                            _1: /* End_of_format */0
+                                          },
+                                          _1: "but is expected to have type"
+                                        });
+                                  }));
+                        case /* Structure_expected */2 :
+                            return Curry._2(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: /* End_of_format */0,
+                                            _1: ""
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* String_literal */11,
+                                          _0: "This class expression is not a class structure; it has type",
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: /* Close_box */0,
+                                                _1: /* End_of_format */0
+                                              }
+                                            }
+                                          }
+                                        }
+                                      },
+                                      _1: "@[This class expression is not a class structure; it has type@ %a@]"
+                                    }), class_type$2, param$1._0);
+                        case /* Cannot_apply */3 :
+                            return Stdlib__Format.fprintf(param)({
+                                  TAG: /* Format */0,
+                                  _0: {
+                                    TAG: /* String_literal */11,
+                                    _0: "This class expression is not a class function, it cannot be applied",
+                                    _1: /* End_of_format */0
+                                  },
+                                  _1: "This class expression is not a class function, it cannot be applied"
+                                });
+                        case /* Apply_wrong_label */4 :
+                            const mark_label = function (l) {
+                              if (l === "") {
+                                return "out label";
+                              } else {
+                                return Curry._1(Stdlib__Format.sprintf({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: " label ~",
+                                            _1: {
+                                              TAG: /* String */2,
+                                              _0: /* No_padding */0,
+                                              _1: /* End_of_format */0
+                                            }
+                                          },
+                                          _1: " label ~%s"
+                                        }), l);
+                              }
+                            };
+                            return Curry._1(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* String_literal */11,
+                                        _0: "This argument cannot be applied with",
+                                        _1: {
+                                          TAG: /* String */2,
+                                          _0: /* No_padding */0,
+                                          _1: /* End_of_format */0
+                                        }
+                                      },
+                                      _1: "This argument cannot be applied with%s"
+                                    }), mark_label(param$1._0));
+                        case /* Pattern_type_clash */5 :
+                            const ty = param$1._0;
+                            reset(undefined);
+                            mark_loops(ty);
+                            return Curry._3(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: /* End_of_format */0,
+                                            _1: ""
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* String */2,
+                                          _0: /* No_padding */0,
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: /* Close_box */0,
+                                                _1: /* End_of_format */0
+                                              }
+                                            }
+                                          }
+                                        }
+                                      },
+                                      _1: "@[%s@ %a@]"
+                                    }), "This pattern cannot match self: it only matches values of type", type_expr$1, ty);
+                        case /* Unbound_class_2 */6 :
+                            return Curry._2(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: /* End_of_format */0,
+                                            _1: ""
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The class",
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: {
+                                                  TAG: /* Break */0,
+                                                  _0: "@ ",
+                                                  _1: 1,
+                                                  _2: 0
+                                                },
+                                                _1: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "is not yet completely defined",
+                                                  _1: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: /* Close_box */0,
+                                                    _1: /* End_of_format */0
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      },
+                                      _1: "@[The class@ %a@ is not yet completely defined@]"
+                                    }), longident, param$1._0);
+                        case /* Unbound_class_type_2 */7 :
+                            return Curry._2(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: /* End_of_format */0,
+                                            _1: ""
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The class type",
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: {
+                                                  TAG: /* Break */0,
+                                                  _0: "@ ",
+                                                  _1: 1,
+                                                  _2: 0
+                                                },
+                                                _1: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "is not yet completely defined",
+                                                  _1: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: /* Close_box */0,
+                                                    _1: /* End_of_format */0
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      },
+                                      _1: "@[The class type@ %a@ is not yet completely defined@]"
+                                    }), longident, param$1._0);
+                        case /* Abbrev_type_clash */8 :
+                            const expected = param$1._2;
+                            const actual = param$1._1;
+                            const abbrev = param$1._0;
+                            reset_and_mark_loops_list({
+                                  hd: abbrev,
+                                  tl: {
+                                    hd: actual,
+                                    tl: {
+                                      hd: expected,
+                                      tl: /* [] */0
+                                    }
+                                  }
+                                });
+                            return Curry._6(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: /* End_of_format */0,
+                                            _1: ""
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The abbreviation",
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: {
+                                                  TAG: /* Break */0,
+                                                  _0: "@ ",
+                                                  _1: 1,
+                                                  _2: 0
+                                                },
+                                                _1: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "expands to type",
+                                                  _1: {
+                                                    TAG: /* Formatting_lit */17,
                                                     _0: {
-                                                      TAG: /* String_literal */11,
-                                                      _0: "This class expression is not a class function, it cannot be applied",
-                                                      _1: /* End_of_format */0
+                                                      TAG: /* Break */0,
+                                                      _0: "@ ",
+                                                      _1: 1,
+                                                      _2: 0
                                                     },
-                                                    _1: "This class expression is not a class function, it cannot be applied"
-                                                  });
-                                    case /* Apply_wrong_label */4 :
-                                        const mark_label = function (l) {
-                                          if (l === "") {
-                                            return "out label";
-                                          } else {
-                                            return Curry._1(Stdlib__Format.sprintf({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: " label ~",
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: /* End_of_format */0
-                                                              }
-                                                            },
-                                                            _1: " label ~%s"
-                                                          }), l);
-                                          }
-                                        };
-                                        return Curry._1(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
+                                                    _1: {
+                                                      TAG: /* Alpha */15,
+                                                      _0: {
+                                                        TAG: /* Formatting_lit */17,
                                                         _0: {
+                                                          TAG: /* Break */0,
+                                                          _0: "@ ",
+                                                          _1: 1,
+                                                          _2: 0
+                                                        },
+                                                        _1: {
                                                           TAG: /* String_literal */11,
-                                                          _0: "This argument cannot be applied with",
+                                                          _0: "but is used with type",
                                                           _1: {
-                                                            TAG: /* String */2,
-                                                            _0: /* No_padding */0,
-                                                            _1: /* End_of_format */0
-                                                          }
-                                                        },
-                                                        _1: "This argument cannot be applied with%s"
-                                                      }), mark_label(param$1._0));
-                                    case /* Pattern_type_clash */5 :
-                                        const ty = param$1._0;
-                                        reset(undefined);
-                                        mark_loops(ty);
-                                        return Curry._3(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* Formatting_gen */18,
-                                                          _0: {
-                                                            TAG: /* Open_box */1,
+                                                            TAG: /* Formatting_lit */17,
                                                             _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: /* End_of_format */0,
-                                                              _1: ""
-                                                            }
-                                                          },
-                                                          _1: {
-                                                            TAG: /* String */2,
-                                                            _0: /* No_padding */0,
+                                                              TAG: /* Break */0,
+                                                              _0: "@ ",
+                                                              _1: 1,
+                                                              _2: 0
+                                                            },
                                                             _1: {
-                                                              TAG: /* Formatting_lit */17,
+                                                              TAG: /* Alpha */15,
                                                               _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: /* Close_box */0,
-                                                                  _1: /* End_of_format */0
-                                                                }
+                                                                TAG: /* Formatting_lit */17,
+                                                                _0: /* Close_box */0,
+                                                                _1: /* End_of_format */0
                                                               }
                                                             }
                                                           }
-                                                        },
-                                                        _1: "@[%s@ %a@]"
-                                                      }), "This pattern cannot match self: it only matches values of type", type_expr$1, ty);
-                                    case /* Unbound_class_2 */6 :
-                                        return Curry._2(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* Formatting_gen */18,
-                                                          _0: {
-                                                            TAG: /* Open_box */1,
-                                                            _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: /* End_of_format */0,
-                                                              _1: ""
-                                                            }
-                                                          },
-                                                          _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The class",
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      },
+                                      _1: "@[The abbreviation@ %a@ expands to type@ %a@ but is used with type@ %a@]"
+                                    }), type_expr$1, abbrev, type_expr$1, actual, type_expr$1, expected);
+                        case /* Constructor_type_mismatch */9 :
+                            const c = param$1._0;
+                            return report_unification_error(param, env, undefined, param$1._1, (function (ppf) {
+                                    Curry._1(Stdlib__Format.fprintf(ppf)({
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: "The expression \"new ",
+                                                _1: {
+                                                  TAG: /* String */2,
+                                                  _0: /* No_padding */0,
+                                                  _1: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: "\" has type",
+                                                    _1: /* End_of_format */0
+                                                  }
+                                                }
+                                              },
+                                              _1: "The expression \"new %s\" has type"
+                                            }), c);
+                                  }), (function (ppf) {
+                                    Stdlib__Format.fprintf(ppf)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "but is used with type",
+                                            _1: /* End_of_format */0
+                                          },
+                                          _1: "but is used with type"
+                                        });
+                                  }));
+                        case /* Virtual_class */10 :
+                            const vals = param$1._3;
+                            const mets = param$1._2;
+                            const imm = param$1._1;
+                            const cl = param$1._0;
+                            const print_mets = function (ppf, mets) {
+                              Stdlib__List.iter((function (met) {
+                                      Curry._1(Stdlib__Format.fprintf(ppf)({
+                                                TAG: /* Format */0,
+                                                _0: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: {
+                                                    TAG: /* Break */0,
+                                                    _0: "@ ",
+                                                    _1: 1,
+                                                    _2: 0
+                                                  },
+                                                  _1: {
+                                                    TAG: /* String */2,
+                                                    _0: /* No_padding */0,
+                                                    _1: /* End_of_format */0
+                                                  }
+                                                },
+                                                _1: "@ %s"
+                                              }), met);
+                                    }), mets);
+                            };
+                            const missings = mets ? (
+                                vals ? "methods and variables" : "methods"
+                              ) : "variables";
+                            const print_msg = function (ppf) {
+                              if (imm) {
+                                return Curry._1(Stdlib__Format.fprintf(ppf)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "This object has virtual ",
+                                            _1: {
+                                              TAG: /* String */2,
+                                              _0: /* No_padding */0,
+                                              _1: /* End_of_format */0
+                                            }
+                                          },
+                                          _1: "This object has virtual %s"
+                                        }), missings);
+                              } else if (cl) {
+                                return Stdlib__Format.fprintf(ppf)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* String_literal */11,
+                                        _0: "This class should be virtual",
+                                        _1: /* End_of_format */0
+                                      },
+                                      _1: "This class should be virtual"
+                                    });
+                              } else {
+                                return Stdlib__Format.fprintf(ppf)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* String_literal */11,
+                                        _0: "This class type should be virtual",
+                                        _1: /* End_of_format */0
+                                      },
+                                      _1: "This class type should be virtual"
+                                    });
+                              }
+                            };
+                            return Curry._4(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: /* End_of_format */0,
+                                            _1: ""
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* Theta */16,
+                                          _0: {
+                                            TAG: /* Char_literal */12,
+                                            _0: /* '.' */46,
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* Formatting_gen */18,
+                                                _0: {
+                                                  TAG: /* Open_box */1,
+                                                  _0: {
+                                                    TAG: /* Format */0,
+                                                    _0: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: "<2>",
+                                                      _1: /* End_of_format */0
+                                                    },
+                                                    _1: "<2>"
+                                                  }
+                                                },
+                                                _1: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "The following ",
+                                                  _1: {
+                                                    TAG: /* String */2,
+                                                    _0: /* No_padding */0,
+                                                    _1: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: " are undefined :",
+                                                      _1: {
+                                                        TAG: /* Alpha */15,
+                                                        _0: {
+                                                          TAG: /* Formatting_lit */17,
+                                                          _0: /* Close_box */0,
+                                                          _1: {
+                                                            TAG: /* Formatting_lit */17,
+                                                            _0: /* Close_box */0,
+                                                            _1: /* End_of_format */0
+                                                          }
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      },
+                                      _1: "@[%t.@ @[<2>The following %s are undefined :%a@]@]"
+                                    }), print_msg, missings, print_mets, Stdlib.$at(mets, vals));
+                        case /* Parameter_arity_mismatch */11 :
+                            return Curry._4(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: /* End_of_format */0,
+                                            _1: ""
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The class constructor ",
+                                          _1: {
+                                            TAG: /* Alpha */15,
+                                            _0: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* String_literal */11,
+                                                _0: "expects ",
+                                                _1: {
+                                                  TAG: /* Int */4,
+                                                  _0: /* Int_i */3,
+                                                  _1: /* No_padding */0,
+                                                  _2: /* No_precision */0,
+                                                  _3: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: " type argument(s),",
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: {
+                                                        TAG: /* Break */0,
+                                                        _0: "@ ",
+                                                        _1: 1,
+                                                        _2: 0
+                                                      },
+                                                      _1: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: "but is here applied to ",
+                                                        _1: {
+                                                          TAG: /* Int */4,
+                                                          _0: /* Int_i */3,
+                                                          _1: /* No_padding */0,
+                                                          _2: /* No_precision */0,
+                                                          _3: {
+                                                            TAG: /* String_literal */11,
+                                                            _0: " type argument(s)",
                                                             _1: {
                                                               TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: {
-                                                                    TAG: /* Break */0,
-                                                                    _0: "@ ",
-                                                                    _1: 1,
-                                                                    _2: 0
-                                                                  },
-                                                                  _1: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: "is not yet completely defined",
-                                                                    _1: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: /* Close_box */0,
-                                                                      _1: /* End_of_format */0
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
+                                                              _0: /* Close_box */0,
+                                                              _1: /* End_of_format */0
                                                             }
                                                           }
-                                                        },
-                                                        _1: "@[The class@ %a@ is not yet completely defined@]"
-                                                      }), longident, param$1._0);
-                                    case /* Unbound_class_type_2 */7 :
-                                        return Curry._2(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* Formatting_gen */18,
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      },
+                                      _1: "@[The class constructor %a@ expects %i type argument(s),@ but is here applied to %i type argument(s)@]"
+                                    }), longident, param$1._0, param$1._1, param$1._2);
+                        case /* Parameter_mismatch */12 :
+                            return report_unification_error(param, env, undefined, param$1._0, (function (ppf) {
+                                    Stdlib__Format.fprintf(ppf)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "The type parameter",
+                                            _1: /* End_of_format */0
+                                          },
+                                          _1: "The type parameter"
+                                        });
+                                  }), (function (ppf) {
+                                    Stdlib__Format.fprintf(ppf)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "does not meet its constraint: it should be",
+                                            _1: /* End_of_format */0
+                                          },
+                                          _1: "does not meet its constraint: it should be"
+                                        });
+                                  }));
+                        case /* Bad_parameters */13 :
+                            const cstrs = param$1._2;
+                            const params = param$1._1;
+                            reset_and_mark_loops_list({
+                                  hd: params,
+                                  tl: {
+                                    hd: cstrs,
+                                    tl: /* [] */0
+                                  }
+                                });
+                            return Curry._6(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: /* End_of_format */0,
+                                            _1: ""
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The abbreviation ",
+                                          _1: {
+                                            TAG: /* Alpha */15,
+                                            _0: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* String_literal */11,
+                                                _0: "is used with parameters",
+                                                _1: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: {
+                                                    TAG: /* Break */0,
+                                                    _0: "@ ",
+                                                    _1: 1,
+                                                    _2: 0
+                                                  },
+                                                  _1: {
+                                                    TAG: /* Alpha */15,
+                                                    _0: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: {
+                                                        TAG: /* Break */0,
+                                                        _0: "@ ",
+                                                        _1: 1,
+                                                        _2: 0
+                                                      },
+                                                      _1: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: "wich are incompatible with constraints",
+                                                        _1: {
+                                                          TAG: /* Formatting_lit */17,
                                                           _0: {
-                                                            TAG: /* Open_box */1,
-                                                            _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: /* End_of_format */0,
-                                                              _1: ""
-                                                            }
+                                                            TAG: /* Break */0,
+                                                            _0: "@ ",
+                                                            _1: 1,
+                                                            _2: 0
                                                           },
                                                           _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The class type",
-                                                            _1: {
+                                                            TAG: /* Alpha */15,
+                                                            _0: {
                                                               TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: {
-                                                                    TAG: /* Break */0,
-                                                                    _0: "@ ",
-                                                                    _1: 1,
-                                                                    _2: 0
-                                                                  },
-                                                                  _1: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: "is not yet completely defined",
-                                                                    _1: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: /* Close_box */0,
-                                                                      _1: /* End_of_format */0
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
+                                                              _0: /* Close_box */0,
+                                                              _1: /* End_of_format */0
                                                             }
                                                           }
-                                                        },
-                                                        _1: "@[The class type@ %a@ is not yet completely defined@]"
-                                                      }), longident, param$1._0);
-                                    case /* Abbrev_type_clash */8 :
-                                        const expected = param$1._2;
-                                        const actual = param$1._1;
-                                        const abbrev = param$1._0;
-                                        reset_and_mark_loops_list({
-                                              hd: abbrev,
-                                              tl: {
-                                                hd: actual,
-                                                tl: {
-                                                  hd: expected,
-                                                  tl: /* [] */0
+                                                        }
+                                                      }
+                                                    }
+                                                  }
                                                 }
                                               }
-                                            });
-                                        return Curry._6(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
+                                            }
+                                          }
+                                        }
+                                      },
+                                      _1: "@[The abbreviation %a@ is used with parameters@ %a@ wich are incompatible with constraints@ %a@]"
+                                    }), ident$3, param$1._0, type_expr$1, params, type_expr$1, cstrs);
+                        case /* Class_match_failure */14 :
+                            return report_error$3(param, param$1._0);
+                        case /* Unbound_val */15 :
+                            return Curry._1(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* String_literal */11,
+                                        _0: "Unbound instance variable ",
+                                        _1: {
+                                          TAG: /* String */2,
+                                          _0: /* No_padding */0,
+                                          _1: /* End_of_format */0
+                                        }
+                                      },
+                                      _1: "Unbound instance variable %s"
+                                    }), param$1._0);
+                        case /* Unbound_type_var */16 :
+                            const print_common = function (ppf, kind, ty0, real, lab, ty) {
+                              const ty1 = real ? ty0 : newty2(100000000, {
+                                      TAG: /* Tobject */4,
+                                      _0: ty0,
+                                      _1: {
+                                        contents: undefined
+                                      }
+                                    });
+                              mark_loops(ty1);
+                              Curry._6(Stdlib__Format.fprintf(ppf)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* Char_literal */12,
+                                              _0: /* ' ' */32,
+                                              _1: {
+                                                TAG: /* String */2,
+                                                _0: /* No_padding */0,
+                                                _1: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: {
+                                                    TAG: /* Break */0,
+                                                    _0: "@ ",
+                                                    _1: 1,
+                                                    _2: 0
+                                                  },
+                                                  _1: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: "has type",
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: {
+                                                        TAG: /* Break */0,
+                                                        _0: "@;<1 2>",
+                                                        _1: 1,
+                                                        _2: 2
+                                                      },
+                                                      _1: {
+                                                        TAG: /* Alpha */15,
                                                         _0: {
-                                                          TAG: /* Formatting_gen */18,
+                                                          TAG: /* Formatting_lit */17,
                                                           _0: {
-                                                            TAG: /* Open_box */1,
-                                                            _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: /* End_of_format */0,
-                                                              _1: ""
-                                                            }
+                                                            TAG: /* Break */0,
+                                                            _0: "@ ",
+                                                            _1: 1,
+                                                            _2: 0
                                                           },
                                                           _1: {
                                                             TAG: /* String_literal */11,
-                                                            _0: "The abbreviation",
+                                                            _0: "where",
                                                             _1: {
                                                               TAG: /* Formatting_lit */17,
                                                               _0: {
@@ -81039,1106 +81533,612 @@ register_error_of_exn(function (err) {
                                                                   },
                                                                   _1: {
                                                                     TAG: /* String_literal */11,
-                                                                    _0: "expands to type",
-                                                                    _1: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: {
-                                                                        TAG: /* Break */0,
-                                                                        _0: "@ ",
-                                                                        _1: 1,
-                                                                        _2: 0
-                                                                      },
-                                                                      _1: {
-                                                                        TAG: /* Alpha */15,
-                                                                        _0: {
-                                                                          TAG: /* Formatting_lit */17,
-                                                                          _0: {
-                                                                            TAG: /* Break */0,
-                                                                            _0: "@ ",
-                                                                            _1: 1,
-                                                                            _2: 0
-                                                                          },
-                                                                          _1: {
-                                                                            TAG: /* String_literal */11,
-                                                                            _0: "but is used with type",
-                                                                            _1: {
-                                                                              TAG: /* Formatting_lit */17,
-                                                                              _0: {
-                                                                                TAG: /* Break */0,
-                                                                                _0: "@ ",
-                                                                                _1: 1,
-                                                                                _2: 0
-                                                                              },
-                                                                              _1: {
-                                                                                TAG: /* Alpha */15,
-                                                                                _0: {
-                                                                                  TAG: /* Formatting_lit */17,
-                                                                                  _0: /* Close_box */0,
-                                                                                  _1: /* End_of_format */0
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
+                                                                    _0: "is unbound",
+                                                                    _1: /* End_of_format */0
                                                                   }
                                                                 }
                                                               }
                                                             }
                                                           }
-                                                        },
-                                                        _1: "@[The abbreviation@ %a@ expands to type@ %a@ but is used with type@ %a@]"
-                                                      }), type_expr$1, abbrev, type_expr$1, actual, type_expr$1, expected);
-                                    case /* Constructor_type_mismatch */9 :
-                                        const c = param$1._0;
-                                        return report_unification_error(param, env, undefined, param$1._1, (function (ppf) {
-                                                      Curry._1(Stdlib__Format.fprintf(ppf)({
-                                                                TAG: /* Format */0,
-                                                                _0: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "The expression \"new ",
-                                                                  _1: {
-                                                                    TAG: /* String */2,
-                                                                    _0: /* No_padding */0,
-                                                                    _1: {
-                                                                      TAG: /* String_literal */11,
-                                                                      _0: "\" has type",
-                                                                      _1: /* End_of_format */0
-                                                                    }
-                                                                  }
-                                                                },
-                                                                _1: "The expression \"new %s\" has type"
-                                                              }), c);
-                                                    }), (function (ppf) {
-                                                      Stdlib__Format.fprintf(ppf)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "but is used with type",
-                                                              _1: /* End_of_format */0
-                                                            },
-                                                            _1: "but is used with type"
-                                                          });
-                                                    }));
-                                    case /* Virtual_class */10 :
-                                        const vals = param$1._3;
-                                        const mets = param$1._2;
-                                        const imm = param$1._1;
-                                        const cl = param$1._0;
-                                        const print_mets = function (ppf, mets) {
-                                          Stdlib__List.iter((function (met) {
-                                                  Curry._1(Stdlib__Format.fprintf(ppf)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: /* End_of_format */0
-                                                              }
-                                                            },
-                                                            _1: "@ %s"
-                                                          }), met);
-                                                }), mets);
-                                        };
-                                        const missings = mets ? (
-                                            vals ? "methods and variables" : "methods"
-                                          ) : "variables";
-                                        const print_msg = function (ppf) {
-                                          if (imm) {
-                                            return Curry._1(Stdlib__Format.fprintf(ppf)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "This object has virtual ",
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: /* End_of_format */0
-                                                              }
-                                                            },
-                                                            _1: "This object has virtual %s"
-                                                          }), missings);
-                                          } else if (cl) {
-                                            return Stdlib__Format.fprintf(ppf)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "This class should be virtual",
-                                                          _1: /* End_of_format */0
-                                                        },
-                                                        _1: "This class should be virtual"
-                                                      });
-                                          } else {
-                                            return Stdlib__Format.fprintf(ppf)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "This class type should be virtual",
-                                                          _1: /* End_of_format */0
-                                                        },
-                                                        _1: "This class type should be virtual"
-                                                      });
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
                                           }
-                                        };
-                                        return Curry._4(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
+                                        },
+                                        _1: "The %s %s@ has type@;<1 2>%a@ where@ %a@ is unbound"
+                                      }), kind, lab, type_expr$1, ty, type_expr$1, ty0);
+                            };
+                            const print_reason = function (ppf, param) {
+                              if (param.TAG === /* CC_Method */0) {
+                                return print_common(ppf, "method", param._0, param._1, param._2, param._3);
+                              } else {
+                                return print_common(ppf, "instance variable", param._0, param._1, param._2, param._3);
+                              }
+                            };
+                            reset(undefined);
+                            return Curry._3(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: "<v>",
+                                              _1: /* End_of_format */0
+                                            },
+                                            _1: "<v>"
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "Some type variables are unbound in this type:",
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@;<1 2>",
+                                                _1: 1,
+                                                _2: 2
+                                              },
+                                              _1: {
+                                                TAG: /* Theta */16,
+                                                _0: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: /* Close_box */0,
+                                                  _1: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: {
+                                                      TAG: /* Break */0,
+                                                      _0: "@ ",
+                                                      _1: 1,
+                                                      _2: 0
+                                                    },
+                                                    _1: {
+                                                      TAG: /* Formatting_gen */18,
+                                                      _0: {
+                                                        TAG: /* Open_box */1,
                                                         _0: {
-                                                          TAG: /* Formatting_gen */18,
-                                                          _0: {
-                                                            TAG: /* Open_box */1,
-                                                            _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: /* End_of_format */0,
-                                                              _1: ""
-                                                            }
-                                                          },
+                                                          TAG: /* Format */0,
+                                                          _0: /* End_of_format */0,
+                                                          _1: ""
+                                                        }
+                                                      },
+                                                      _1: {
+                                                        TAG: /* Alpha */15,
+                                                        _0: {
+                                                          TAG: /* Formatting_lit */17,
+                                                          _0: /* Close_box */0,
                                                           _1: {
-                                                            TAG: /* Theta */16,
-                                                            _0: {
-                                                              TAG: /* Char_literal */12,
-                                                              _0: /* '.' */46,
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Formatting_gen */18,
-                                                                  _0: {
-                                                                    TAG: /* Open_box */1,
-                                                                    _0: {
-                                                                      TAG: /* Format */0,
-                                                                      _0: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: "<2>",
-                                                                        _1: /* End_of_format */0
-                                                                      },
-                                                                      _1: "<2>"
-                                                                    }
-                                                                  },
-                                                                  _1: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: "The following ",
-                                                                    _1: {
-                                                                      TAG: /* String */2,
-                                                                      _0: /* No_padding */0,
-                                                                      _1: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: " are undefined :",
-                                                                        _1: {
-                                                                          TAG: /* Alpha */15,
-                                                                          _0: {
-                                                                            TAG: /* Formatting_lit */17,
-                                                                            _0: /* Close_box */0,
-                                                                            _1: {
-                                                                              TAG: /* Formatting_lit */17,
-                                                                              _0: /* Close_box */0,
-                                                                              _1: /* End_of_format */0
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        },
-                                                        _1: "@[%t.@ @[<2>The following %s are undefined :%a@]@]"
-                                                      }), print_msg, missings, print_mets, Stdlib.$at(mets, vals));
-                                    case /* Parameter_arity_mismatch */11 :
-                                        return Curry._4(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* Formatting_gen */18,
-                                                          _0: {
-                                                            TAG: /* Open_box */1,
-                                                            _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: /* End_of_format */0,
-                                                              _1: ""
-                                                            }
-                                                          },
-                                                          _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The class constructor ",
-                                                            _1: {
-                                                              TAG: /* Alpha */15,
-                                                              _0: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "expects ",
-                                                                  _1: {
-                                                                    TAG: /* Int */4,
-                                                                    _0: /* Int_i */3,
-                                                                    _1: /* No_padding */0,
-                                                                    _2: /* No_precision */0,
-                                                                    _3: {
-                                                                      TAG: /* String_literal */11,
-                                                                      _0: " type argument(s),",
-                                                                      _1: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: {
-                                                                          TAG: /* Break */0,
-                                                                          _0: "@ ",
-                                                                          _1: 1,
-                                                                          _2: 0
-                                                                        },
-                                                                        _1: {
-                                                                          TAG: /* String_literal */11,
-                                                                          _0: "but is here applied to ",
-                                                                          _1: {
-                                                                            TAG: /* Int */4,
-                                                                            _0: /* Int_i */3,
-                                                                            _1: /* No_padding */0,
-                                                                            _2: /* No_precision */0,
-                                                                            _3: {
-                                                                              TAG: /* String_literal */11,
-                                                                              _0: " type argument(s)",
-                                                                              _1: {
-                                                                                TAG: /* Formatting_lit */17,
-                                                                                _0: /* Close_box */0,
-                                                                                _1: /* End_of_format */0
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        },
-                                                        _1: "@[The class constructor %a@ expects %i type argument(s),@ but is here applied to %i type argument(s)@]"
-                                                      }), longident, param$1._0, param$1._1, param$1._2);
-                                    case /* Parameter_mismatch */12 :
-                                        return report_unification_error(param, env, undefined, param$1._0, (function (ppf) {
-                                                      Stdlib__Format.fprintf(ppf)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "The type parameter",
-                                                              _1: /* End_of_format */0
-                                                            },
-                                                            _1: "The type parameter"
-                                                          });
-                                                    }), (function (ppf) {
-                                                      Stdlib__Format.fprintf(ppf)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "does not meet its constraint: it should be",
-                                                              _1: /* End_of_format */0
-                                                            },
-                                                            _1: "does not meet its constraint: it should be"
-                                                          });
-                                                    }));
-                                    case /* Bad_parameters */13 :
-                                        const cstrs = param$1._2;
-                                        const params = param$1._1;
-                                        reset_and_mark_loops_list({
-                                              hd: params,
-                                              tl: {
-                                                hd: cstrs,
-                                                tl: /* [] */0
-                                              }
-                                            });
-                                        return Curry._6(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* Formatting_gen */18,
-                                                          _0: {
-                                                            TAG: /* Open_box */1,
-                                                            _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: /* End_of_format */0,
-                                                              _1: ""
-                                                            }
-                                                          },
-                                                          _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The abbreviation ",
-                                                            _1: {
-                                                              TAG: /* Alpha */15,
-                                                              _0: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "is used with parameters",
-                                                                  _1: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: {
-                                                                      TAG: /* Break */0,
-                                                                      _0: "@ ",
-                                                                      _1: 1,
-                                                                      _2: 0
-                                                                    },
-                                                                    _1: {
-                                                                      TAG: /* Alpha */15,
-                                                                      _0: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: {
-                                                                          TAG: /* Break */0,
-                                                                          _0: "@ ",
-                                                                          _1: 1,
-                                                                          _2: 0
-                                                                        },
-                                                                        _1: {
-                                                                          TAG: /* String_literal */11,
-                                                                          _0: "wich are incompatible with constraints",
-                                                                          _1: {
-                                                                            TAG: /* Formatting_lit */17,
-                                                                            _0: {
-                                                                              TAG: /* Break */0,
-                                                                              _0: "@ ",
-                                                                              _1: 1,
-                                                                              _2: 0
-                                                                            },
-                                                                            _1: {
-                                                                              TAG: /* Alpha */15,
-                                                                              _0: {
-                                                                                TAG: /* Formatting_lit */17,
-                                                                                _0: /* Close_box */0,
-                                                                                _1: /* End_of_format */0
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        },
-                                                        _1: "@[The abbreviation %a@ is used with parameters@ %a@ wich are incompatible with constraints@ %a@]"
-                                                      }), ident$3, param$1._0, type_expr$1, params, type_expr$1, cstrs);
-                                    case /* Class_match_failure */14 :
-                                        return report_error$3(param, param$1._0);
-                                    case /* Unbound_val */15 :
-                                        return Curry._1(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "Unbound instance variable ",
-                                                          _1: {
-                                                            TAG: /* String */2,
-                                                            _0: /* No_padding */0,
+                                                            TAG: /* Formatting_lit */17,
+                                                            _0: /* Close_box */0,
                                                             _1: /* End_of_format */0
                                                           }
-                                                        },
-                                                        _1: "Unbound instance variable %s"
-                                                      }), param$1._0);
-                                    case /* Unbound_type_var */16 :
-                                        const print_common = function (ppf, kind, ty0, real, lab, ty) {
-                                          const ty1 = real ? ty0 : newty2(100000000, {
-                                                  TAG: /* Tobject */4,
-                                                  _0: ty0,
-                                                  _1: {
-                                                    contents: undefined
-                                                  }
-                                                });
-                                          mark_loops(ty1);
-                                          Curry._6(Stdlib__Format.fprintf(ppf)({
-                                                    TAG: /* Format */0,
-                                                    _0: {
-                                                      TAG: /* String_literal */11,
-                                                      _0: "The ",
-                                                      _1: {
-                                                        TAG: /* String */2,
-                                                        _0: /* No_padding */0,
-                                                        _1: {
-                                                          TAG: /* Char_literal */12,
-                                                          _0: /* ' ' */32,
-                                                          _1: {
-                                                            TAG: /* String */2,
-                                                            _0: /* No_padding */0,
-                                                            _1: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "has type",
-                                                                _1: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: {
-                                                                    TAG: /* Break */0,
-                                                                    _0: "@;<1 2>",
-                                                                    _1: 1,
-                                                                    _2: 2
-                                                                  },
-                                                                  _1: {
-                                                                    TAG: /* Alpha */15,
-                                                                    _0: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: {
-                                                                        TAG: /* Break */0,
-                                                                        _0: "@ ",
-                                                                        _1: 1,
-                                                                        _2: 0
-                                                                      },
-                                                                      _1: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: "where",
-                                                                        _1: {
-                                                                          TAG: /* Formatting_lit */17,
-                                                                          _0: {
-                                                                            TAG: /* Break */0,
-                                                                            _0: "@ ",
-                                                                            _1: 1,
-                                                                            _2: 0
-                                                                          },
-                                                                          _1: {
-                                                                            TAG: /* Alpha */15,
-                                                                            _0: {
-                                                                              TAG: /* Formatting_lit */17,
-                                                                              _0: {
-                                                                                TAG: /* Break */0,
-                                                                                _0: "@ ",
-                                                                                _1: 1,
-                                                                                _2: 0
-                                                                              },
-                                                                              _1: {
-                                                                                TAG: /* String_literal */11,
-                                                                                _0: "is unbound",
-                                                                                _1: /* End_of_format */0
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
                                                         }
                                                       }
-                                                    },
-                                                    _1: "The %s %s@ has type@;<1 2>%a@ where@ %a@ is unbound"
-                                                  }), kind, lab, type_expr$1, ty, type_expr$1, ty0);
-                                        };
-                                        const print_reason = function (ppf, param) {
-                                          if (param.TAG === /* CC_Method */0) {
-                                            return print_common(ppf, "method", param._0, param._1, param._2, param._3);
-                                          } else {
-                                            return print_common(ppf, "instance variable", param._0, param._1, param._2, param._3);
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
                                           }
-                                        };
-                                        reset(undefined);
-                                        return Curry._3(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* Formatting_gen */18,
-                                                          _0: {
-                                                            TAG: /* Open_box */1,
-                                                            _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "<v>",
-                                                                _1: /* End_of_format */0
-                                                              },
-                                                              _1: "<v>"
-                                                            }
-                                                          },
-                                                          _1: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "Some type variables are unbound in this type:",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@;<1 2>",
-                                                                  _1: 1,
-                                                                  _2: 2
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Theta */16,
-                                                                  _0: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: /* Close_box */0,
-                                                                    _1: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: {
-                                                                        TAG: /* Break */0,
-                                                                        _0: "@ ",
-                                                                        _1: 1,
-                                                                        _2: 0
-                                                                      },
-                                                                      _1: {
-                                                                        TAG: /* Formatting_gen */18,
-                                                                        _0: {
-                                                                          TAG: /* Open_box */1,
-                                                                          _0: {
-                                                                            TAG: /* Format */0,
-                                                                            _0: /* End_of_format */0,
-                                                                            _1: ""
-                                                                          }
-                                                                        },
-                                                                        _1: {
-                                                                          TAG: /* Alpha */15,
-                                                                          _0: {
-                                                                            TAG: /* Formatting_lit */17,
-                                                                            _0: /* Close_box */0,
-                                                                            _1: {
-                                                                              TAG: /* Formatting_lit */17,
-                                                                              _0: /* Close_box */0,
-                                                                              _1: /* End_of_format */0
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        },
-                                                        _1: "@[<v>@[Some type variables are unbound in this type:@;<1 2>%t@]@ @[%a@]@]"
-                                                      }), param$1._0, print_reason, param$1._1);
-                                    case /* Make_nongen_seltype */17 :
-                                        return Curry._2(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* Formatting_gen */18,
-                                                          _0: {
-                                                            TAG: /* Open_box */1,
-                                                            _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "<v>",
-                                                                _1: /* End_of_format */0
-                                                              },
-                                                              _1: "<v>"
-                                                            }
-                                                          },
-                                                          _1: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "Self type should not occur in the non-generic type",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@;<1 2>",
-                                                                  _1: 1,
-                                                                  _2: 2
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Alpha */15,
-                                                                  _0: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: /* Close_box */0,
-                                                                    _1: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: {
-                                                                        TAG: /* Break */0,
-                                                                        _0: "@,",
-                                                                        _1: 0,
-                                                                        _2: 0
-                                                                      },
-                                                                      _1: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: "It would escape the scope of its class",
-                                                                        _1: {
-                                                                          TAG: /* Formatting_lit */17,
-                                                                          _0: /* Close_box */0,
-                                                                          _1: /* End_of_format */0
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        },
-                                                        _1: "@[<v>@[Self type should not occur in the non-generic type@;<1 2>%a@]@,It would escape the scope of its class@]"
-                                                      }), type_scheme, param$1._0);
-                                    case /* Non_generalizable_class */18 :
-                                        const id = param$1._0;
-                                        return Curry._2(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* Formatting_gen */18,
-                                                          _0: {
-                                                            TAG: /* Open_box */1,
-                                                            _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: /* End_of_format */0,
-                                                              _1: ""
-                                                            }
-                                                          },
-                                                          _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The type of this class,",
-                                                            _1: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: {
-                                                                  TAG: /* Char_literal */12,
-                                                                  _0: /* ',' */44,
-                                                                  _1: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: {
-                                                                      TAG: /* Break */0,
-                                                                      _0: "@ ",
-                                                                      _1: 1,
-                                                                      _2: 0
-                                                                    },
-                                                                    _1: {
-                                                                      TAG: /* String_literal */11,
-                                                                      _0: "contains type variables that cannot be generalized",
-                                                                      _1: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: /* Close_box */0,
-                                                                        _1: /* End_of_format */0
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        },
-                                                        _1: "@[The type of this class,@ %a,@ contains type variables that cannot be generalized@]"
-                                                      }), (function (param, param$1) {
-                                                      return class_declaration$1(id, param, param$1);
-                                                    }), param$1._1);
-                                    case /* Cannot_coerce_self */19 :
-                                        return Curry._2(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* Formatting_gen */18,
-                                                          _0: {
-                                                            TAG: /* Open_box */1,
-                                                            _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: /* End_of_format */0,
-                                                              _1: ""
-                                                            }
-                                                          },
-                                                          _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The type of self cannot be coerced to",
-                                                            _1: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "the type of the current class:",
-                                                                _1: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: {
-                                                                    TAG: /* Break */0,
-                                                                    _0: "@ ",
-                                                                    _1: 1,
-                                                                    _2: 0
-                                                                  },
-                                                                  _1: {
-                                                                    TAG: /* Alpha */15,
-                                                                    _0: {
-                                                                      TAG: /* Char_literal */12,
-                                                                      _0: /* '.' */46,
-                                                                      _1: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: /* Flush_newline */4,
-                                                                        _1: {
-                                                                          TAG: /* String_literal */11,
-                                                                          _0: "Some occurrences are contravariant",
-                                                                          _1: {
-                                                                            TAG: /* Formatting_lit */17,
-                                                                            _0: /* Close_box */0,
-                                                                            _1: /* End_of_format */0
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        },
-                                                        _1: "@[The type of self cannot be coerced to@ the type of the current class:@ %a.@.Some occurrences are contravariant@]"
-                                                      }), type_scheme, param$1._0);
-                                    case /* Non_collapsable_conjunction */20 :
-                                        const id$1 = param$1._0;
-                                        Curry._2(Stdlib__Format.fprintf(param)({
-                                                  TAG: /* Format */0,
-                                                  _0: {
-                                                    TAG: /* Formatting_gen */18,
+                                        }
+                                      },
+                                      _1: "@[<v>@[Some type variables are unbound in this type:@;<1 2>%t@]@ @[%a@]@]"
+                                    }), param$1._0, print_reason, param$1._1);
+                        case /* Make_nongen_seltype */17 :
+                            return Curry._2(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: "<v>",
+                                              _1: /* End_of_format */0
+                                            },
+                                            _1: "<v>"
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "Self type should not occur in the non-generic type",
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@;<1 2>",
+                                                _1: 1,
+                                                _2: 2
+                                              },
+                                              _1: {
+                                                TAG: /* Alpha */15,
+                                                _0: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: /* Close_box */0,
+                                                  _1: {
+                                                    TAG: /* Formatting_lit */17,
                                                     _0: {
-                                                      TAG: /* Open_box */1,
-                                                      _0: {
-                                                        TAG: /* Format */0,
-                                                        _0: /* End_of_format */0,
-                                                        _1: ""
-                                                      }
+                                                      TAG: /* Break */0,
+                                                      _0: "@,",
+                                                      _1: 0,
+                                                      _2: 0
                                                     },
                                                     _1: {
                                                       TAG: /* String_literal */11,
-                                                      _0: "The type of this class,",
+                                                      _0: "It would escape the scope of its class",
                                                       _1: {
                                                         TAG: /* Formatting_lit */17,
-                                                        _0: {
-                                                          TAG: /* Break */0,
-                                                          _0: "@ ",
-                                                          _1: 1,
-                                                          _2: 0
-                                                        },
-                                                        _1: {
-                                                          TAG: /* Alpha */15,
-                                                          _0: {
-                                                            TAG: /* Char_literal */12,
-                                                            _0: /* ',' */44,
-                                                            _1: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "contains non-collapsible conjunctive types in constraints",
-                                                                _1: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: /* Close_box */0,
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
+                                                        _0: /* Close_box */0,
+                                                        _1: /* End_of_format */0
                                                       }
                                                     }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      },
+                                      _1: "@[<v>@[Self type should not occur in the non-generic type@;<1 2>%a@]@,It would escape the scope of its class@]"
+                                    }), type_scheme, param$1._0);
+                        case /* Non_generalizable_class */18 :
+                            const id = param$1._0;
+                            return Curry._2(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: /* End_of_format */0,
+                                            _1: ""
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The type of this class,",
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: {
+                                                TAG: /* Char_literal */12,
+                                                _0: /* ',' */44,
+                                                _1: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: {
+                                                    TAG: /* Break */0,
+                                                    _0: "@ ",
+                                                    _1: 1,
+                                                    _2: 0
                                                   },
-                                                  _1: "@[The type of this class,@ %a,@ contains non-collapsible conjunctive types in constraints@]"
-                                                }), (function (param, param$1) {
-                                                return class_declaration$1(id$1, param, param$1);
-                                              }), param$1._1);
-                                        return report_unification_error(param, env, undefined, param$1._2, (function (ppf) {
-                                                      Stdlib__Format.fprintf(ppf)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "Type",
-                                                              _1: /* End_of_format */0
-                                                            },
-                                                            _1: "Type"
-                                                          });
-                                                    }), (function (ppf) {
-                                                      Stdlib__Format.fprintf(ppf)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "is not compatible with type",
-                                                              _1: /* End_of_format */0
-                                                            },
-                                                            _1: "is not compatible with type"
-                                                          });
-                                                    }));
-                                    case /* Final_self_clash */21 :
-                                        return report_unification_error(param, env, undefined, param$1._0, (function (ppf) {
-                                                      Stdlib__Format.fprintf(ppf)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "This object is expected to have type",
-                                                              _1: /* End_of_format */0
-                                                            },
-                                                            _1: "This object is expected to have type"
-                                                          });
-                                                    }), (function (ppf) {
-                                                      Stdlib__Format.fprintf(ppf)({
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "but actually has type",
-                                                              _1: /* End_of_format */0
-                                                            },
-                                                            _1: "but actually has type"
-                                                          });
-                                                    }));
-                                    case /* Mutability_mismatch */22 :
-                                        const match = param$1._1 === /* Immutable */0 ? [
-                                            "mutable",
-                                            "immutable"
-                                          ] : [
-                                            "immutable",
-                                            "mutable"
-                                          ];
-                                        return Curry._2(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* Formatting_gen */18,
-                                                          _0: {
-                                                            TAG: /* Open_box */1,
-                                                            _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: /* End_of_format */0,
-                                                              _1: ""
-                                                            }
-                                                          },
-                                                          _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The instance variable is ",
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: {
-                                                                TAG: /* Char_literal */12,
-                                                                _0: /* ';' */59,
-                                                                _1: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: {
-                                                                    TAG: /* Break */0,
-                                                                    _0: "@ ",
-                                                                    _1: 1,
-                                                                    _2: 0
-                                                                  },
-                                                                  _1: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: "it cannot be redefined as ",
-                                                                    _1: {
-                                                                      TAG: /* String */2,
-                                                                      _0: /* No_padding */0,
-                                                                      _1: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: /* Close_box */0,
-                                                                        _1: /* End_of_format */0
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        },
-                                                        _1: "@[The instance variable is %s;@ it cannot be redefined as %s@]"
-                                                      }), match[0], match[1]);
-                                    case /* No_overriding */23 :
-                                        if (param$1._1 === "") {
-                                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "This inheritance does not override any method",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* String */2,
-                                                                  _0: /* No_padding */0,
-                                                                  _1: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: /* Close_box */0,
-                                                                    _1: /* End_of_format */0
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[This inheritance does not override any method@ %s@]"
-                                                        }), "instance variable");
-                                        } else {
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "The ",
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: " `",
-                                                                  _1: {
-                                                                    TAG: /* String */2,
-                                                                    _0: /* No_padding */0,
-                                                                    _1: {
-                                                                      TAG: /* Char_literal */12,
-                                                                      _0: /* '\'' */39,
-                                                                      _1: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: {
-                                                                          TAG: /* Break */0,
-                                                                          _0: "@ ",
-                                                                          _1: 1,
-                                                                          _2: 0
-                                                                        },
-                                                                        _1: {
-                                                                          TAG: /* String_literal */11,
-                                                                          _0: "has no previous definition",
-                                                                          _1: {
-                                                                            TAG: /* Formatting_lit */17,
-                                                                            _0: /* Close_box */0,
-                                                                            _1: /* End_of_format */0
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[The %s `%s'@ has no previous definition@]"
-                                                        }), param$1._0, param$1._1);
+                                                  _1: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: "contains type variables that cannot be generalized",
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: /* Close_box */0,
+                                                      _1: /* End_of_format */0
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
                                         }
-                                    case /* Duplicate */24 :
-                                        return Curry._2(Stdlib__Format.fprintf(param)({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* Formatting_gen */18,
-                                                          _0: {
-                                                            TAG: /* Open_box */1,
-                                                            _0: {
-                                                              TAG: /* Format */0,
-                                                              _0: /* End_of_format */0,
-                                                              _1: ""
-                                                            }
-                                                          },
-                                                          _1: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The ",
-                                                            _1: {
-                                                              TAG: /* String */2,
-                                                              _0: /* No_padding */0,
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: " `",
-                                                                _1: {
-                                                                  TAG: /* String */2,
-                                                                  _0: /* No_padding */0,
-                                                                  _1: {
-                                                                    TAG: /* Char_literal */12,
-                                                                    _0: /* '\'' */39,
-                                                                    _1: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: {
-                                                                        TAG: /* Break */0,
-                                                                        _0: "@ ",
-                                                                        _1: 1,
-                                                                        _2: 0
-                                                                      },
-                                                                      _1: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: "has multiple definitions in this object",
-                                                                        _1: {
-                                                                          TAG: /* Formatting_lit */17,
-                                                                          _0: /* Close_box */0,
-                                                                          _1: /* End_of_format */0
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        },
-                                                        _1: "@[The %s `%s'@ has multiple definitions in this object@]"
-                                                      }), param$1._0, param$1._1);
-                                    
-                                  }
-                                }));
-                  }), err._3);
+                                      },
+                                      _1: "@[The type of this class,@ %a,@ contains type variables that cannot be generalized@]"
+                                    }), (function (param, param$1) {
+                                    return class_declaration$1(id, param, param$1);
+                                  }), param$1._1);
+                        case /* Cannot_coerce_self */19 :
+                            return Curry._2(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: /* End_of_format */0,
+                                            _1: ""
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The type of self cannot be coerced to",
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: "the type of the current class:",
+                                              _1: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: {
+                                                  TAG: /* Break */0,
+                                                  _0: "@ ",
+                                                  _1: 1,
+                                                  _2: 0
+                                                },
+                                                _1: {
+                                                  TAG: /* Alpha */15,
+                                                  _0: {
+                                                    TAG: /* Char_literal */12,
+                                                    _0: /* '.' */46,
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: /* Flush_newline */4,
+                                                      _1: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: "Some occurrences are contravariant",
+                                                        _1: {
+                                                          TAG: /* Formatting_lit */17,
+                                                          _0: /* Close_box */0,
+                                                          _1: /* End_of_format */0
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      },
+                                      _1: "@[The type of self cannot be coerced to@ the type of the current class:@ %a.@.Some occurrences are contravariant@]"
+                                    }), type_scheme, param$1._0);
+                        case /* Non_collapsable_conjunction */20 :
+                            const id$1 = param$1._0;
+                            Curry._2(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: /* End_of_format */0,
+                                            _1: ""
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The type of this class,",
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: {
+                                                TAG: /* Char_literal */12,
+                                                _0: /* ',' */44,
+                                                _1: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: {
+                                                    TAG: /* Break */0,
+                                                    _0: "@ ",
+                                                    _1: 1,
+                                                    _2: 0
+                                                  },
+                                                  _1: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: "contains non-collapsible conjunctive types in constraints",
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: /* Close_box */0,
+                                                      _1: /* End_of_format */0
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      },
+                                      _1: "@[The type of this class,@ %a,@ contains non-collapsible conjunctive types in constraints@]"
+                                    }), (function (param, param$1) {
+                                    return class_declaration$1(id$1, param, param$1);
+                                  }), param$1._1);
+                            return report_unification_error(param, env, undefined, param$1._2, (function (ppf) {
+                                    Stdlib__Format.fprintf(ppf)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "Type",
+                                            _1: /* End_of_format */0
+                                          },
+                                          _1: "Type"
+                                        });
+                                  }), (function (ppf) {
+                                    Stdlib__Format.fprintf(ppf)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "is not compatible with type",
+                                            _1: /* End_of_format */0
+                                          },
+                                          _1: "is not compatible with type"
+                                        });
+                                  }));
+                        case /* Final_self_clash */21 :
+                            return report_unification_error(param, env, undefined, param$1._0, (function (ppf) {
+                                    Stdlib__Format.fprintf(ppf)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "This object is expected to have type",
+                                            _1: /* End_of_format */0
+                                          },
+                                          _1: "This object is expected to have type"
+                                        });
+                                  }), (function (ppf) {
+                                    Stdlib__Format.fprintf(ppf)({
+                                          TAG: /* Format */0,
+                                          _0: {
+                                            TAG: /* String_literal */11,
+                                            _0: "but actually has type",
+                                            _1: /* End_of_format */0
+                                          },
+                                          _1: "but actually has type"
+                                        });
+                                  }));
+                        case /* Mutability_mismatch */22 :
+                            const match = param$1._1 === /* Immutable */0 ? [
+                                "mutable",
+                                "immutable"
+                              ] : [
+                                "immutable",
+                                "mutable"
+                              ];
+                            return Curry._2(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: /* End_of_format */0,
+                                            _1: ""
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The instance variable is ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* Char_literal */12,
+                                              _0: /* ';' */59,
+                                              _1: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: {
+                                                  TAG: /* Break */0,
+                                                  _0: "@ ",
+                                                  _1: 1,
+                                                  _2: 0
+                                                },
+                                                _1: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "it cannot be redefined as ",
+                                                  _1: {
+                                                    TAG: /* String */2,
+                                                    _0: /* No_padding */0,
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: /* Close_box */0,
+                                                      _1: /* End_of_format */0
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      },
+                                      _1: "@[The instance variable is %s;@ it cannot be redefined as %s@]"
+                                    }), match[0], match[1]);
+                        case /* No_overriding */23 :
+                            if (param$1._1 === "") {
+                              return Curry._1(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "This inheritance does not override any method",
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* String */2,
+                                                _0: /* No_padding */0,
+                                                _1: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: /* Close_box */0,
+                                                  _1: /* End_of_format */0
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[This inheritance does not override any method@ %s@]"
+                                      }), "instance variable");
+                            } else {
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "The ",
+                                            _1: {
+                                              TAG: /* String */2,
+                                              _0: /* No_padding */0,
+                                              _1: {
+                                                TAG: /* String_literal */11,
+                                                _0: " `",
+                                                _1: {
+                                                  TAG: /* String */2,
+                                                  _0: /* No_padding */0,
+                                                  _1: {
+                                                    TAG: /* Char_literal */12,
+                                                    _0: /* '\'' */39,
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: {
+                                                        TAG: /* Break */0,
+                                                        _0: "@ ",
+                                                        _1: 1,
+                                                        _2: 0
+                                                      },
+                                                      _1: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: "has no previous definition",
+                                                        _1: {
+                                                          TAG: /* Formatting_lit */17,
+                                                          _0: /* Close_box */0,
+                                                          _1: /* End_of_format */0
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[The %s `%s'@ has no previous definition@]"
+                                      }), param$1._0, param$1._1);
+                            }
+                        case /* Duplicate */24 :
+                            return Curry._2(Stdlib__Format.fprintf(param)({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* Formatting_gen */18,
+                                        _0: {
+                                          TAG: /* Open_box */1,
+                                          _0: {
+                                            TAG: /* Format */0,
+                                            _0: /* End_of_format */0,
+                                            _1: ""
+                                          }
+                                        },
+                                        _1: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The ",
+                                          _1: {
+                                            TAG: /* String */2,
+                                            _0: /* No_padding */0,
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: " `",
+                                              _1: {
+                                                TAG: /* String */2,
+                                                _0: /* No_padding */0,
+                                                _1: {
+                                                  TAG: /* Char_literal */12,
+                                                  _0: /* '\'' */39,
+                                                  _1: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: {
+                                                      TAG: /* Break */0,
+                                                      _0: "@ ",
+                                                      _1: 1,
+                                                      _2: 0
+                                                    },
+                                                    _1: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: "has multiple definitions in this object",
+                                                      _1: {
+                                                        TAG: /* Formatting_lit */17,
+                                                        _0: /* Close_box */0,
+                                                        _1: /* End_of_format */0
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      },
+                                      _1: "@[The %s `%s'@ has multiple definitions in this object@]"
+                                    }), param$1._0, param$1._1);
+                        
+                      }
+                    }));
+            }), err._3);
     });
 
 const $$Error$10 = /* @__PURE__ */Caml_exceptions.create("Ocaml_typedtree_test.Typemod.Error");
@@ -82153,30 +82153,30 @@ function path_concat(head, p) {
   switch (p.TAG) {
     case /* Pident */0 :
         return {
-                TAG: /* Pdot */1,
-                _0: {
-                  TAG: /* Pident */0,
-                  _0: head
-                },
-                _1: p._0.name,
-                _2: 0
-              };
+          TAG: /* Pdot */1,
+          _0: {
+            TAG: /* Pident */0,
+            _0: head
+          },
+          _1: p._0.name,
+          _2: 0
+        };
     case /* Pdot */1 :
         return {
-                TAG: /* Pdot */1,
-                _0: path_concat(head, p._0),
-                _1: p._1,
-                _2: p._2
-              };
+          TAG: /* Pdot */1,
+          _0: path_concat(head, p._0),
+          _1: p._1,
+          _2: p._2
+        };
     case /* Papply */2 :
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/ocaml_typedtree_test.ml",
-                    50016,
-                    16
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/ocaml_typedtree_test.ml",
+                50016,
+                16
+              ]
+            });
     
   }
 }
@@ -82187,11 +82187,11 @@ function extract_sig(env, loc, mty) {
     return sg._0;
   }
   throw new Caml_js_exceptions.MelangeError($$Error$10, {
-            MEL_EXN_ID: $$Error$10,
-            _1: loc,
-            _2: env,
-            _3: /* Signature_expected */0
-          });
+        MEL_EXN_ID: $$Error$10,
+        _1: loc,
+        _2: env,
+        _3: /* Signature_expected */0
+      });
 }
 
 function extract_sig_open(env, loc, mty) {
@@ -82200,14 +82200,14 @@ function extract_sig_open(env, loc, mty) {
     return sg._0;
   }
   throw new Caml_js_exceptions.MelangeError($$Error$10, {
-            MEL_EXN_ID: $$Error$10,
-            _1: loc,
-            _2: env,
-            _3: {
-              TAG: /* Structure_expected */3,
-              _0: mty
-            }
-          });
+        MEL_EXN_ID: $$Error$10,
+        _1: loc,
+        _2: env,
+        _3: {
+          TAG: /* Structure_expected */3,
+          _0: mty
+        }
+      });
 }
 
 function type_open_(toplevel, ovf, env, loc, lid) {
@@ -82215,9 +82215,9 @@ function type_open_(toplevel, ovf, env, loc, lid) {
   const path = match[0];
   const sg = extract_sig_open(env, lid.loc, match[1].md_type);
   return [
-          path,
-          open_signature$1(loc, toplevel, ovf, path, sg, env)
-        ];
+    path,
+    open_signature$1(loc, toplevel, ovf, path, sg, env)
+  ];
 }
 
 function type_open$1(toplevel, env, sod) {
@@ -82235,22 +82235,22 @@ function type_open$1(toplevel, env, sod) {
     open_attributes: od_open_attributes
   };
   return [
-          path,
-          match[1],
-          od
-        ];
+    path,
+    match[1],
+    od
+  ];
 }
 
 const type_module_type_of_fwd = {
   contents: (function (env, m) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/ocaml_typedtree_test.ml",
-                  50061,
-                  22
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/ocaml_typedtree_test.ml",
+              50061,
+              22
+            ]
+          });
     })
 };
 
@@ -82307,14 +82307,14 @@ function update_rec_next(rs, rem) {
               return rem;
           case /* Trec_next */2 :
               return {
-                      hd: {
-                        TAG: /* Sig_type */1,
-                        _0: match._0,
-                        _1: match._1,
-                        _2: rs
-                      },
-                      tl: rem.tl
-                    };
+                hd: {
+                  TAG: /* Sig_type */1,
+                  _0: match._0,
+                  _1: match._1,
+                  _2: rs
+                },
+                tl: rem.tl
+              };
           
         }
     case /* Sig_module */3 :
@@ -82324,14 +82324,14 @@ function update_rec_next(rs, rem) {
               return rem;
           case /* Trec_next */2 :
               return {
-                      hd: {
-                        TAG: /* Sig_module */3,
-                        _0: match._0,
-                        _1: match._1,
-                        _2: rs
-                      },
-                      tl: rem.tl
-                    };
+                hd: {
+                  TAG: /* Sig_module */3,
+                  _0: match._0,
+                  _1: match._1,
+                  _2: rs
+                },
+                tl: rem.tl
+              };
           
         }
     default:
@@ -82395,9 +82395,9 @@ function merge_constraint(initial_env, loc, sg, constr) {
                         if (id.name === s && is_fixed_type(sdecl)) {
                           const decl_row_type_params = Stdlib__List.map((function (param) {
                                   return newty2(100000000, {
-                                              TAG: /* Tvar */0,
-                                              _0: undefined
-                                            });
+                                        TAG: /* Tvar */0,
+                                        _0: undefined
+                                      });
                                 }), sdecl.ptype_params);
                           const decl_row_type_arity = Stdlib__List.length(sdecl.ptype_params);
                           const decl_row_type_variance = Stdlib__List.map((function (param) {
@@ -82465,35 +82465,35 @@ function merge_constraint(initial_env, loc, sg, constr) {
                           };
                           const rs$p = rs === /* Trec_first */1 ? /* Trec_not */0 : rs;
                           return [
-                                  [
-                                    {
-                                      TAG: /* Pident */0,
-                                      _0: id
-                                    },
-                                    lid,
-                                    {
-                                      TAG: /* Twith_type */0,
-                                      _0: tdecl
-                                    }
-                                  ],
-                                  {
-                                    hd: {
-                                      TAG: /* Sig_type */1,
-                                      _0: id_row,
-                                      _1: decl_row$1,
-                                      _2: rs$p
-                                    },
-                                    tl: {
-                                      hd: {
-                                        TAG: /* Sig_type */1,
-                                        _0: id,
-                                        _1: newdecl,
-                                        _2: rs
-                                      },
-                                      tl: rem
-                                    }
-                                  }
-                                ];
+                            [
+                              {
+                                TAG: /* Pident */0,
+                                _0: id
+                              },
+                              lid,
+                              {
+                                TAG: /* Twith_type */0,
+                                _0: tdecl
+                              }
+                            ],
+                            {
+                              hd: {
+                                TAG: /* Sig_type */1,
+                                _0: id_row,
+                                _1: decl_row$1,
+                                _2: rs$p
+                              },
+                              tl: {
+                                hd: {
+                                  TAG: /* Sig_type */1,
+                                  _0: id,
+                                  _1: newdecl,
+                                  _2: rs
+                                },
+                                tl: rem
+                              }
+                            }
+                          ];
                         }
                         exit$1 = 3;
                       } else {
@@ -82505,27 +82505,27 @@ function merge_constraint(initial_env, loc, sg, constr) {
                           const newdecl$1 = tdecl$1.typ_type;
                           check_type_decl(env, sdecl.ptype_loc, id, row_id, newdecl$1, decl, rs, rem);
                           return [
-                                  [
-                                    {
-                                      TAG: /* Pident */0,
-                                      _0: id
-                                    },
-                                    lid,
-                                    {
-                                      TAG: /* Twith_type */0,
-                                      _0: tdecl$1
-                                    }
-                                  ],
-                                  {
-                                    hd: {
-                                      TAG: /* Sig_type */1,
-                                      _0: id,
-                                      _1: newdecl$1,
-                                      _2: rs
-                                    },
-                                    tl: rem
-                                  }
-                                ];
+                            [
+                              {
+                                TAG: /* Pident */0,
+                                _0: id
+                              },
+                              lid,
+                              {
+                                TAG: /* Twith_type */0,
+                                _0: tdecl$1
+                              }
+                            ],
+                            {
+                              hd: {
+                                TAG: /* Sig_type */1,
+                                _0: id,
+                                _1: newdecl$1,
+                                _2: rs
+                              },
+                              tl: rem
+                            }
+                          ];
                         }
                         exit = 2;
                       }
@@ -82552,19 +82552,19 @@ function merge_constraint(initial_env, loc, sg, constr) {
                       check_type_decl(env, sdecl$1.ptype_loc, id, row_id, newdecl$2, decl, rs, rem);
                       real_id.contents = id;
                       return [
-                              [
-                                {
-                                  TAG: /* Pident */0,
-                                  _0: id
-                                },
-                                lid,
-                                {
-                                  TAG: /* Twith_typesubst */2,
-                                  _0: tdecl$2
-                                }
-                              ],
-                              update_rec_next(rs, rem)
-                            ];
+                        [
+                          {
+                            TAG: /* Pident */0,
+                            _0: id
+                          },
+                          lid,
+                          {
+                            TAG: /* Twith_typesubst */2,
+                            _0: tdecl$2
+                          }
+                        ],
+                        update_rec_next(rs, rem)
+                      ];
                     }
                     
                   }
@@ -82602,28 +82602,28 @@ function merge_constraint(initial_env, loc, sg, constr) {
                           const newmd = strengthen_decl(env, md$p$p, path);
                           modtypes$1(env, newmd.md_type, md.md_type);
                           return [
-                                  [
-                                    {
-                                      TAG: /* Pident */0,
-                                      _0: id$1
-                                    },
-                                    lid,
-                                    {
-                                      TAG: /* Twith_module */1,
-                                      _0: path,
-                                      _1: lid$p
-                                    }
-                                  ],
-                                  {
-                                    hd: {
-                                      TAG: /* Sig_module */3,
-                                      _0: id$1,
-                                      _1: newmd,
-                                      _2: rs$1
-                                    },
-                                    tl: rem$1
-                                  }
-                                ];
+                            [
+                              {
+                                TAG: /* Pident */0,
+                                _0: id$1
+                              },
+                              lid,
+                              {
+                                TAG: /* Twith_module */1,
+                                _0: path,
+                                _1: lid$p
+                              }
+                            ],
+                            {
+                              hd: {
+                                TAG: /* Sig_module */3,
+                                _0: id$1,
+                                _1: newmd,
+                                _2: rs$1
+                              },
+                              tl: rem$1
+                            }
+                          ];
                         }
                         exit$2 = 2;
                         break;
@@ -82640,20 +82640,20 @@ function merge_constraint(initial_env, loc, sg, constr) {
                           modtypes$1(env, newmd$1.md_type, md.md_type);
                           real_id.contents = id$1;
                           return [
-                                  [
-                                    {
-                                      TAG: /* Pident */0,
-                                      _0: id$1
-                                    },
-                                    lid,
-                                    {
-                                      TAG: /* Twith_modsubst */3,
-                                      _0: path$1,
-                                      _1: lid$p$1
-                                    }
-                                  ],
-                                  update_rec_next(rs$1, rem$1)
-                                ];
+                            [
+                              {
+                                TAG: /* Pident */0,
+                                _0: id$1
+                              },
+                              lid,
+                              {
+                                TAG: /* Twith_modsubst */3,
+                                _0: path$1,
+                                _1: lid$p$1
+                              }
+                            ],
+                            update_rec_next(rs$1, rem$1)
+                          ];
                         }
                         exit$2 = 2;
                         break;
@@ -82664,28 +82664,28 @@ function merge_constraint(initial_env, loc, sg, constr) {
                   const match$2 = merge(env, extract_sig(env, loc, md.md_type), namelist.tl, undefined);
                   const match$3 = match$2[0];
                   return [
-                          [
-                            path_concat(id$1, match$3[0]),
-                            lid,
-                            match$3[2]
-                          ],
-                          {
-                            hd: {
-                              TAG: /* Sig_module */3,
-                              _0: id$1,
-                              _1: {
-                                md_type: {
-                                  TAG: /* Mty_signature */1,
-                                  _0: match$2[1]
-                                },
-                                md_attributes: md.md_attributes,
-                                md_loc: md.md_loc
-                              },
-                              _2: rs$1
-                            },
-                            tl: rem$1
-                          }
-                        ];
+                    [
+                      path_concat(id$1, match$3[0]),
+                      lid,
+                      match$3[2]
+                    ],
+                    {
+                      hd: {
+                        TAG: /* Sig_module */3,
+                        _0: id$1,
+                        _1: {
+                          md_type: {
+                            TAG: /* Mty_signature */1,
+                            _0: match$2[1]
+                          },
+                          md_attributes: md.md_attributes,
+                          md_loc: md.md_loc
+                        },
+                        _2: rs$1
+                      },
+                      tl: rem$1
+                    }
+                  ];
                 }
                 
               }
@@ -82695,22 +82695,22 @@ function merge_constraint(initial_env, loc, sg, constr) {
         }
         const match$4 = merge(add_item(item, env), sg.tl, namelist, row_id);
         return [
-                match$4[0],
-                {
-                  hd: item,
-                  tl: match$4[1]
-                }
-              ];
+          match$4[0],
+          {
+            hd: item,
+            tl: match$4[1]
+          }
+        ];
       }
       throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                MEL_EXN_ID: $$Error$10,
-                _1: loc,
-                _2: env,
-                _3: {
-                  TAG: /* With_no_component */4,
-                  _0: lid.txt
-                }
-              });
+            MEL_EXN_ID: $$Error$10,
+            _1: loc,
+            _2: env,
+            _3: {
+              TAG: /* With_no_component */4,
+              _0: lid.txt
+            }
+          });
     };
   };
   try {
@@ -82732,13 +82732,13 @@ function merge_constraint(initial_env, loc, sg, constr) {
               id$1 = id;
             } else {
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          50208,
-                          38
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/ocaml_typedtree_test.ml",
+                      50208,
+                      38
+                    ]
+                  });
             }
             let lid$1;
             try {
@@ -82747,8 +82747,8 @@ function merge_constraint(initial_env, loc, sg, constr) {
                 const match$2 = match$1.ptyp_desc;
                 if (/* tag */typeof match$2 === "number" || typeof match$2 === "string") {
                   throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                            MEL_EXN_ID: Stdlib.Exit
-                          });
+                        MEL_EXN_ID: Stdlib.Exit
+                      });
                 }
                 if (match$2.TAG === /* Ptyp_constr */3) {
                   const stl = match$2._1;
@@ -82757,59 +82757,59 @@ function merge_constraint(initial_env, loc, sg, constr) {
                             const sx = x.ptyp_desc;
                             if (/* tag */typeof sx === "number" || typeof sx === "string") {
                               throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                        MEL_EXN_ID: Stdlib.Exit
-                                      });
+                                    MEL_EXN_ID: Stdlib.Exit
+                                  });
                             }
                             if (sx.TAG === /* Ptyp_var */0) {
                               const sy = param[0].ptyp_desc;
                               if (/* tag */typeof sy === "number" || typeof sy === "string") {
                                 throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                          MEL_EXN_ID: Stdlib.Exit
-                                        });
+                                      MEL_EXN_ID: Stdlib.Exit
+                                    });
                               }
                               if (sy.TAG === /* Ptyp_var */0) {
                                 if (sx._0 === sy._0) {
                                   return ;
                                 }
                                 throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                          MEL_EXN_ID: Stdlib.Exit
-                                        });
+                                      MEL_EXN_ID: Stdlib.Exit
+                                    });
                               }
                               throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                        MEL_EXN_ID: Stdlib.Exit
-                                      });
+                                    MEL_EXN_ID: Stdlib.Exit
+                                  });
                             } else {
                               throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                                        MEL_EXN_ID: Stdlib.Exit
-                                      });
+                                    MEL_EXN_ID: Stdlib.Exit
+                                  });
                             }
                           }), stl, sdecl.ptype_params);
                     lid$1 = match$2._0;
                   } else {
                     throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                              MEL_EXN_ID: Stdlib.Exit
-                            });
+                          MEL_EXN_ID: Stdlib.Exit
+                        });
                   }
                 } else {
                   throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                            MEL_EXN_ID: Stdlib.Exit
-                          });
+                        MEL_EXN_ID: Stdlib.Exit
+                      });
                 }
               } else {
                 throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                          MEL_EXN_ID: Stdlib.Exit
-                        });
+                      MEL_EXN_ID: Stdlib.Exit
+                    });
               }
             }
             catch (raw_exn){
               const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
               if (exn.MEL_EXN_ID === Stdlib.Exit) {
                 throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                          MEL_EXN_ID: $$Error$10,
-                          _1: sdecl.ptype_loc,
-                          _2: initial_env,
-                          _3: /* With_need_typeconstr */2
-                        });
+                      MEL_EXN_ID: $$Error$10,
+                      _1: sdecl.ptype_loc,
+                      _2: initial_env,
+                      _3: /* With_need_typeconstr */2
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
             }
@@ -82821,13 +82821,13 @@ function merge_constraint(initial_env, loc, sg, constr) {
               const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
               if (exn$1.MEL_EXN_ID === Stdlib.Not_found) {
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/ocaml_typedtree_test.ml",
-                            50225,
-                            68
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/ocaml_typedtree_test.ml",
+                        50225,
+                        68
+                      ]
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
             }
@@ -82841,13 +82841,13 @@ function merge_constraint(initial_env, loc, sg, constr) {
               id$3 = id$2;
             } else {
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/ocaml_typedtree_test.ml",
-                          50231,
-                          38
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/ocaml_typedtree_test.ml",
+                      50231,
+                      38
+                    ]
+                  });
             }
             const path = lookup_module$1(undefined, initial_env, loc, constr._1.txt);
             const sub$1 = add_module(id$3, path, identity);
@@ -82859,23 +82859,23 @@ function merge_constraint(initial_env, loc, sg, constr) {
       sg$2 = sg$1;
     }
     return [
-            match[0],
-            sg$2
-          ];
+      match[0],
+      sg$2
+    ];
   }
   catch (raw_explanation){
     const explanation = Caml_js_exceptions.internalToOCamlException(raw_explanation);
     if (explanation.MEL_EXN_ID === $$Error$5) {
       throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                MEL_EXN_ID: $$Error$10,
-                _1: loc,
-                _2: initial_env,
-                _3: {
-                  TAG: /* With_mismatch */5,
-                  _0: lid.txt,
-                  _1: explanation._1
-                }
-              });
+            MEL_EXN_ID: $$Error$10,
+            _1: loc,
+            _2: initial_env,
+            _3: {
+              TAG: /* With_mismatch */5,
+              _0: lid.txt,
+              _1: explanation._1
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(explanation.MEL_EXN_ID, explanation);
   }
@@ -82884,9 +82884,9 @@ function merge_constraint(initial_env, loc, sg, constr) {
 function map_rec(fn, decls, rem) {
   if (decls) {
     return {
-            hd: Curry._2(fn, /* Trec_first */1, decls.hd),
-            tl: map_end(Curry._1(fn, /* Trec_next */2), decls.tl, rem)
-          };
+      hd: Curry._2(fn, /* Trec_first */1, decls.hd),
+      tl: map_end(Curry._1(fn, /* Trec_next */2), decls.tl, rem)
+    };
   } else {
     return rem;
   }
@@ -82899,9 +82899,9 @@ function map_rec_type(rec_flag, fn, decls, rem) {
   let first;
   first = rec_flag === /* Nonrecursive */0 ? /* Trec_not */0 : /* Trec_first */1;
   return {
-          hd: Curry._2(fn, first, decls.hd),
-          tl: map_end(Curry._1(fn, /* Trec_next */2), decls.tl, rem)
-        };
+    hd: Curry._2(fn, first, decls.hd),
+    tl: map_end(Curry._1(fn, /* Trec_next */2), decls.tl, rem)
+  };
 }
 
 function map_rec_type_with_row_types(rec_flag, fn, decls, rem) {
@@ -82911,9 +82911,9 @@ function map_rec_type_with_row_types(rec_flag, fn, decls, rem) {
   const d1 = decls.hd;
   if (is_row_name(d1.typ_id.name)) {
     return {
-            hd: Curry._2(fn, /* Trec_not */0, d1),
-            tl: map_rec_type_with_row_types(rec_flag, fn, decls.tl, rem)
-          };
+      hd: Curry._2(fn, /* Trec_not */0, d1),
+      tl: map_rec_type_with_row_types(rec_flag, fn, decls.tl, rem)
+    };
   } else {
     return map_rec_type(rec_flag, fn, decls, rem);
   }
@@ -82922,8 +82922,8 @@ function map_rec_type_with_row_types(rec_flag, fn, decls, rem) {
 function rec_flag_of_ptype_declarations(tds) {
   const is_nonrec = Stdlib__List.exists((function (td) {
           return Stdlib__List.exists((function (param) {
-                        return param[0].txt === "nonrec";
-                      }), td.ptype_attributes);
+                  return param[0].txt === "nonrec";
+                }), td.ptype_attributes);
         }), tds);
   if (is_nonrec) {
     return /* Nonrecursive */0;
@@ -82935,9 +82935,9 @@ function rec_flag_of_ptype_declarations(tds) {
 function map_ext(fn, exts, rem) {
   if (exts) {
     return {
-            hd: Curry._2(fn, /* Text_first */0, exts.hd),
-            tl: map_end(Curry._1(fn, /* Text_next */1), exts.tl, rem)
-          };
+      hd: Curry._2(fn, /* Text_first */0, exts.hd),
+      tl: map_end(Curry._1(fn, /* Text_next */1), exts.tl, rem)
+    };
   } else {
     return rem;
   }
@@ -82951,29 +82951,29 @@ function approx_modtype(env, _smty) {
       case /* Pmty_ident */0 :
           const match = find_modtype$1(env, smty.pmty_loc, lid._0.txt);
           return {
-                  TAG: /* Mty_ident */0,
-                  _0: match[0]
-                };
+            TAG: /* Mty_ident */0,
+            _0: match[0]
+          };
       case /* Pmty_signature */1 :
           return {
-                  TAG: /* Mty_signature */1,
-                  _0: approx_sig(env, lid._0)
-                };
+            TAG: /* Mty_signature */1,
+            _0: approx_sig(env, lid._0)
+          };
       case /* Pmty_functor */2 :
           const arg = may_map((function (param) {
                   return approx_modtype(env, param);
                 }), lid._1);
           const match$1 = enter_module(true, lid._0.txt, arg !== undefined ? arg : ({
-                    TAG: /* Mty_signature */1,
-                    _0: /* [] */0
-                  }), env);
+                  TAG: /* Mty_signature */1,
+                  _0: /* [] */0
+                }), env);
           const res = approx_modtype(match$1[1], lid._2);
           return {
-                  TAG: /* Mty_functor */2,
-                  _0: match$1[0],
-                  _1: arg,
-                  _2: res
-                };
+            TAG: /* Mty_functor */2,
+            _0: match$1[0],
+            _1: arg,
+            _2: res
+          };
       case /* Pmty_with */3 :
           _smty = lid._0;
           continue ;
@@ -82981,15 +82981,15 @@ function approx_modtype(env, _smty) {
           return Curry._2(type_module_type_of_fwd.contents, env, lid._0)[1];
       case /* Pmty_extension */5 :
           throw new Caml_js_exceptions.MelangeError(Error_forward$3, {
-                    MEL_EXN_ID: Error_forward$3,
-                    _1: error_of_extension(lid._0)
-                  });
+                MEL_EXN_ID: Error_forward$3,
+                _1: error_of_extension(lid._0)
+              });
       case /* Pmty_alias */6 :
           const path = lookup_module$1(undefined, env, smty.pmty_loc, lid._0.txt);
           return {
-                  TAG: /* Mty_alias */3,
-                  _0: path
-                };
+            TAG: /* Mty_alias */3,
+            _0: path
+          };
       
     }
   };
@@ -82997,10 +82997,10 @@ function approx_modtype(env, _smty) {
 
 function approx_module_declaration(env, pmd) {
   return {
-          md_type: approx_modtype(env, pmd.pmd_type),
-          md_attributes: pmd.pmd_attributes,
-          md_loc: pmd.pmd_loc
-        };
+    md_type: approx_modtype(env, pmd.pmd_type),
+    md_attributes: pmd.pmd_attributes,
+    md_loc: pmd.pmd_loc
+  };
 }
 
 function approx_sig(_env, _ssg) {
@@ -83019,56 +83019,56 @@ function approx_sig(_env, _ssg) {
           const decls = approx_type_decl(env, sdecls$1);
           const rem = approx_sig(env, srem);
           return map_rec_type(rec_flag, (function (rs, param) {
-                        return {
-                                TAG: /* Sig_type */1,
-                                _0: param[0],
-                                _1: param[1],
-                                _2: rs
-                              };
-                      }), decls, rem);
+                  return {
+                    TAG: /* Sig_type */1,
+                    _0: param[0],
+                    _1: param[1],
+                    _2: rs
+                  };
+                }), decls, rem);
       case /* Psig_module */4 :
           const pmd = sdecls._0;
           const md = approx_module_declaration(env, pmd);
           const match = enter_module_declaration(undefined, pmd.pmd_name.txt, md, env);
           return {
-                  hd: {
-                    TAG: /* Sig_module */3,
-                    _0: match[0],
-                    _1: md,
-                    _2: /* Trec_not */0
-                  },
-                  tl: approx_sig(match[1], srem)
-                };
+            hd: {
+              TAG: /* Sig_module */3,
+              _0: match[0],
+              _1: md,
+              _2: /* Trec_not */0
+            },
+            tl: approx_sig(match[1], srem)
+          };
       case /* Psig_recmodule */5 :
           const decls$1 = Stdlib__List.map((function (pmd) {
                   return [
-                          create(pmd.pmd_name.txt),
-                          approx_module_declaration(env, pmd)
-                        ];
+                    create(pmd.pmd_name.txt),
+                    approx_module_declaration(env, pmd)
+                  ];
                 }), sdecls._0);
           const newenv = Stdlib__List.fold_left((function (env, param) {
                   return add_module_declaration(undefined, param[0], param[1], env);
                 }), env, decls$1);
           return map_rec((function (rs, param) {
-                        return {
-                                TAG: /* Sig_module */3,
-                                _0: param[0],
-                                _1: param[1],
-                                _2: rs
-                              };
-                      }), decls$1, approx_sig(newenv, srem));
+                  return {
+                    TAG: /* Sig_module */3,
+                    _0: param[0],
+                    _1: param[1],
+                    _2: rs
+                  };
+                }), decls$1, approx_sig(newenv, srem));
       case /* Psig_modtype */6 :
           const d = sdecls._0;
           const info = approx_modtype_info(env, d);
           const match$1 = enter_modtype(d.pmtd_name.txt, info, env);
           return {
-                  hd: {
-                    TAG: /* Sig_modtype */4,
-                    _0: match$1[0],
-                    _1: info
-                  },
-                  tl: approx_sig(match$1[1], srem)
-                };
+            hd: {
+              TAG: /* Sig_modtype */4,
+              _0: match$1[0],
+              _1: info
+            },
+            tl: approx_sig(match$1[1], srem)
+          };
       case /* Psig_open */7 :
           const match$2 = type_open$1(undefined, env, sdecls._0);
           _ssg = srem;
@@ -83090,46 +83090,46 @@ function approx_sig(_env, _ssg) {
     const decls$2 = approx_class_declarations(env, sdecls._0);
     const rem$1 = approx_sig(env, srem);
     return Stdlib__List.flatten(map_rec((function (rs, param) {
-                      return {
-                              hd: {
-                                TAG: /* Sig_class_type */6,
-                                _0: param[0],
-                                _1: param[2],
-                                _2: rs
-                              },
-                              tl: {
-                                hd: {
-                                  TAG: /* Sig_type */1,
-                                  _0: param[3],
-                                  _1: param[4],
-                                  _2: rs
-                                },
-                                tl: {
-                                  hd: {
-                                    TAG: /* Sig_type */1,
-                                    _0: param[5],
-                                    _1: param[6],
-                                    _2: rs
-                                  },
-                                  tl: /* [] */0
-                                }
-                              }
-                            };
-                    }), decls$2, {
-                    hd: rem$1,
-                    tl: /* [] */0
-                  }));
+                return {
+                  hd: {
+                    TAG: /* Sig_class_type */6,
+                    _0: param[0],
+                    _1: param[2],
+                    _2: rs
+                  },
+                  tl: {
+                    hd: {
+                      TAG: /* Sig_type */1,
+                      _0: param[3],
+                      _1: param[4],
+                      _2: rs
+                    },
+                    tl: {
+                      hd: {
+                        TAG: /* Sig_type */1,
+                        _0: param[5],
+                        _1: param[6],
+                        _2: rs
+                      },
+                      tl: /* [] */0
+                    }
+                  }
+                };
+              }), decls$2, {
+              hd: rem$1,
+              tl: /* [] */0
+            }));
   };
 }
 
 function approx_modtype_info(env, sinfo) {
   return {
-          mtd_type: may_map((function (param) {
-                  return approx_modtype(env, param);
-                }), sinfo.pmtd_type),
-          mtd_attributes: sinfo.pmtd_attributes,
-          mtd_loc: sinfo.pmtd_loc
-        };
+    mtd_type: may_map((function (param) {
+            return approx_modtype(env, param);
+          }), sinfo.pmtd_type),
+    mtd_attributes: sinfo.pmtd_attributes,
+    mtd_loc: sinfo.pmtd_loc
+  };
 }
 
 function check_recmod_typedecls(env, sdecls, decls) {
@@ -83141,8 +83141,8 @@ function check_recmod_typedecls(env, sdecls, decls) {
                   let decl = find_type_full(path, env)[0];
                   const to_check = function (path) {
                     return Stdlib__List.exists((function (id) {
-                                  return isfree(id, path);
-                                }), recmod_ids);
+                            return isfree(id, path);
+                          }), recmod_ids);
                   };
                   check_well_founded_decl(env, loc, path, decl, to_check);
                   check_recursion(env, loc, path, decl, to_check);
@@ -83173,12 +83173,12 @@ function create$13(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r.h;
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$12(l, v, r) {
@@ -83189,9 +83189,9 @@ function bal$12(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const lr = l.r;
     const lv = l.v;
@@ -83203,24 +83203,24 @@ function bal$12(l, v, r) {
       return create$13(create$13(ll, lv, lr.l), lr.v, create$13(lr.r, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   const rr = r.r;
   const rv = r.v;
@@ -83232,20 +83232,20 @@ function bal$12(l, v, r) {
     return create$13(create$13(l, v, rl.l), rl.v, create$13(rl.r, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Set.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Set.bal"
+      });
 }
 
 function add$14(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = t.r;
   const v = t.v;
@@ -83288,15 +83288,15 @@ function mem$7(x, _param) {
 function check(cl, loc, set_ref, name) {
   if (Curry._2(mem$7, name, set_ref.contents)) {
     throw new Caml_js_exceptions.MelangeError($$Error$10, {
-              MEL_EXN_ID: $$Error$10,
-              _1: loc,
-              _2: empty,
-              _3: {
-                TAG: /* Repeated_name */6,
-                _0: cl,
-                _1: name
-              }
-            });
+          MEL_EXN_ID: $$Error$10,
+          _1: loc,
+          _2: empty,
+          _3: {
+            TAG: /* Repeated_name */6,
+            _0: cl,
+            _1: name
+          }
+        });
   }
   set_ref.contents = Curry._2(add$14, name, set_ref.contents);
 }
@@ -83392,9 +83392,9 @@ function remove_duplicates(val_ids, ext_ids, _param) {
         
     }
     return {
-            hd: f,
-            tl: remove_duplicates(val_ids, ext_ids, param.tl)
-          };
+      hd: f,
+      tl: remove_duplicates(val_ids, ext_ids, param.tl)
+    };
   };
 }
 
@@ -83407,9 +83407,9 @@ function get_values(_param) {
     const f = param.hd;
     if (f.TAG === /* Sig_value */0) {
       return {
-              hd: f._0,
-              tl: get_values(param.tl)
-            };
+        hd: f._0,
+        tl: get_values(param.tl)
+      };
     }
     _param = param.tl;
     continue ;
@@ -83425,9 +83425,9 @@ function get_extension_constructors(_param) {
     const f = param.hd;
     if (f.TAG === /* Sig_typext */2) {
       return {
-              hd: f._0,
-              tl: get_extension_constructors(param.tl)
-            };
+        hd: f._0,
+        tl: get_extension_constructors(param.tl)
+      };
     }
     _param = param.tl;
     continue ;
@@ -83478,22 +83478,22 @@ function transl_modtype$1(env, smty) {
         const lid$1 = lid._0;
         const path = transl_modtype_longident$1(loc, env, lid$1.txt);
         return mkmty$1({
-                    TAG: /* Tmty_ident */0,
-                    _0: path,
-                    _1: lid$1
-                  }, {
-                    TAG: /* Mty_ident */0,
-                    _0: path
-                  }, env, loc, smty.pmty_attributes);
+              TAG: /* Tmty_ident */0,
+              _0: path,
+              _1: lid$1
+            }, {
+              TAG: /* Mty_ident */0,
+              _0: path
+            }, env, loc, smty.pmty_attributes);
     case /* Pmty_signature */1 :
         const sg = transl_signature(env, lid._0);
         return mkmty$1({
-                    TAG: /* Tmty_signature */1,
-                    _0: sg
-                  }, {
-                    TAG: /* Mty_signature */1,
-                    _0: sg.sig_type
-                  }, env, loc, smty.pmty_attributes);
+              TAG: /* Tmty_signature */1,
+              _0: sg
+            }, {
+              TAG: /* Mty_signature */1,
+              _0: sg.sig_type
+            }, env, loc, smty.pmty_attributes);
     case /* Pmty_functor */2 :
         const param = lid._0;
         const arg = may_map((function (param) {
@@ -83503,24 +83503,24 @@ function transl_modtype$1(env, smty) {
                 return m.mty_type;
               }), arg);
         const match = enter_module(true, param.txt, ty_arg !== undefined ? ty_arg : ({
-                  TAG: /* Mty_signature */1,
-                  _0: /* [] */0
-                }), env);
+                TAG: /* Mty_signature */1,
+                _0: /* [] */0
+              }), env);
         const id = match[0];
         init_def(currentstamp.contents);
         const res = transl_modtype$1(match[1], lid._2);
         return mkmty$1({
-                    TAG: /* Tmty_functor */2,
-                    _0: id,
-                    _1: param,
-                    _2: arg,
-                    _3: res
-                  }, {
-                    TAG: /* Mty_functor */2,
-                    _0: id,
-                    _1: ty_arg,
-                    _2: res.mty_type
-                  }, env, loc, smty.pmty_attributes);
+              TAG: /* Tmty_functor */2,
+              _0: id,
+              _1: param,
+              _2: arg,
+              _3: res
+            }, {
+              TAG: /* Mty_functor */2,
+              _0: id,
+              _1: ty_arg,
+              _2: res.mty_type
+            }, env, loc, smty.pmty_attributes);
     case /* Pmty_with */3 :
         const sbody = lid._0;
         const body = transl_modtype$1(env, sbody);
@@ -83528,46 +83528,46 @@ function transl_modtype$1(env, smty) {
         const match$1 = Stdlib__List.fold_left((function (param, sdecl) {
                 const match = merge_constraint(env, smty.pmty_loc, param[1], sdecl);
                 return [
-                        {
-                          hd: match[0],
-                          tl: param[0]
-                        },
-                        match[1]
-                      ];
+                  {
+                    hd: match[0],
+                    tl: param[0]
+                  },
+                  match[1]
+                ];
               }), [
               /* [] */0,
               init_sg
             ], lid._1);
         return mkmty$1({
-                    TAG: /* Tmty_with */3,
-                    _0: body,
-                    _1: Stdlib__List.rev(match$1[0])
-                  }, modtype(identity, {
-                        TAG: /* Mty_signature */1,
-                        _0: match$1[1]
-                      }), env, loc, smty.pmty_attributes);
+              TAG: /* Tmty_with */3,
+              _0: body,
+              _1: Stdlib__List.rev(match$1[0])
+            }, modtype(identity, {
+                  TAG: /* Mty_signature */1,
+                  _0: match$1[1]
+                }), env, loc, smty.pmty_attributes);
     case /* Pmty_typeof */4 :
         const match$2 = Curry._2(type_module_type_of_fwd.contents, env, lid._0);
         return mkmty$1({
-                    TAG: /* Tmty_typeof */4,
-                    _0: match$2[0]
-                  }, match$2[1], env, loc, smty.pmty_attributes);
+              TAG: /* Tmty_typeof */4,
+              _0: match$2[0]
+            }, match$2[1], env, loc, smty.pmty_attributes);
     case /* Pmty_extension */5 :
         throw new Caml_js_exceptions.MelangeError(Error_forward$3, {
-                  MEL_EXN_ID: Error_forward$3,
-                  _1: error_of_extension(lid._0)
-                });
+              MEL_EXN_ID: Error_forward$3,
+              _1: error_of_extension(lid._0)
+            });
     case /* Pmty_alias */6 :
         const lid$2 = lid._0;
         const path$1 = transl_module_alias(loc, env, lid$2.txt);
         return mkmty$1({
-                    TAG: /* Tmty_alias */5,
-                    _0: path$1,
-                    _1: lid$2
-                  }, {
-                    TAG: /* Mty_alias */3,
-                    _0: path$1
-                  }, env, loc, smty.pmty_attributes);
+              TAG: /* Tmty_alias */5,
+              _0: path$1,
+              _1: lid$2
+            }, {
+              TAG: /* Mty_alias */3,
+              _0: path$1
+            }, env, loc, smty.pmty_attributes);
     
   }
 }
@@ -83586,10 +83586,10 @@ function transl_signature(env, sg) {
     init_def(currentstamp.contents);
     if (!sg) {
       return [
-              /* [] */0,
-              /* [] */0,
-              env
-            ];
+        /* [] */0,
+        /* [] */0,
+        env
+      ];
     }
     const srem = sg.tl;
     const item = sg.hd;
@@ -83603,25 +83603,25 @@ function transl_signature(env, sg) {
           const rem = match$1[1];
           const partial_arg = tdesc.val_id;
           return [
-                  {
-                    hd: mksig$1({
-                          TAG: /* Tsig_value */0,
-                          _0: tdesc
-                        }, env, loc),
-                    tl: match$1[0]
-                  },
-                  Stdlib__List.exists((function (param) {
-                          return equal(partial_arg, param);
-                        }), get_values(rem)) ? rem : ({
-                        hd: {
-                          TAG: /* Sig_value */0,
-                          _0: tdesc.val_id,
-                          _1: tdesc.val_val
-                        },
-                        tl: rem
-                      }),
-                  match$1[2]
-                ];
+            {
+              hd: mksig$1({
+                    TAG: /* Tsig_value */0,
+                    _0: tdesc
+                  }, env, loc),
+              tl: match$1[0]
+            },
+            Stdlib__List.exists((function (param) {
+                    return equal(partial_arg, param);
+                  }), get_values(rem)) ? rem : ({
+                hd: {
+                  TAG: /* Sig_value */0,
+                  _0: tdesc.val_id,
+                  _1: tdesc.val_val
+                },
+                tl: rem
+              }),
+            match$1[2]
+          ];
       case /* Psig_type */1 :
           const sdecls = sdesc._0;
           const rec_flag = rec_flag_of_ptype_declarations(sdecls);
@@ -83632,23 +83632,23 @@ function transl_signature(env, sg) {
           const decls = match$2[0];
           const match$3 = transl_sig(match$2[1], srem);
           return [
-                  {
-                    hd: mksig$1({
-                          TAG: /* Tsig_type */1,
-                          _0: decls
-                        }, env, loc),
-                    tl: match$3[0]
-                  },
-                  map_rec_type_with_row_types(rec_flag, (function (rs, td) {
-                          return {
-                                  TAG: /* Sig_type */1,
-                                  _0: td.typ_id,
-                                  _1: td.typ_type,
-                                  _2: rs
-                                };
-                        }), decls, match$3[1]),
-                  match$3[2]
-                ];
+            {
+              hd: mksig$1({
+                    TAG: /* Tsig_type */1,
+                    _0: decls
+                  }, env, loc),
+              tl: match$3[0]
+            },
+            map_rec_type_with_row_types(rec_flag, (function (rs, td) {
+                    return {
+                      TAG: /* Sig_type */1,
+                      _0: td.typ_id,
+                      _1: td.typ_type,
+                      _2: rs
+                    };
+                  }), decls, match$3[1]),
+            match$3[2]
+          ];
       case /* Psig_typext */2 :
           const match$4 = transl_type_extension(false, env, item.psig_loc, sdesc._0);
           const tyext = match$4[0];
@@ -83657,27 +83657,27 @@ function transl_signature(env, sg) {
           const constructors = Stdlib__List.filter((function (ext) {
                   const partial_arg = ext.ext_id;
                   return !Stdlib__List.exists((function (param) {
-                                return equal(partial_arg, param);
-                              }), get_extension_constructors(rem$1));
+                          return equal(partial_arg, param);
+                        }), get_extension_constructors(rem$1));
                 }), tyext.tyext_constructors);
           return [
-                  {
-                    hd: mksig$1({
-                          TAG: /* Tsig_typext */2,
-                          _0: tyext
-                        }, env, loc),
-                    tl: match$5[0]
-                  },
-                  map_ext((function (es, ext) {
-                          return {
-                                  TAG: /* Sig_typext */2,
-                                  _0: ext.ext_id,
-                                  _1: ext.ext_type,
-                                  _2: es
-                                };
-                        }), constructors, rem$1),
-                  match$5[2]
-                ];
+            {
+              hd: mksig$1({
+                    TAG: /* Tsig_typext */2,
+                    _0: tyext
+                  }, env, loc),
+              tl: match$5[0]
+            },
+            map_ext((function (es, ext) {
+                    return {
+                      TAG: /* Sig_typext */2,
+                      _0: ext.ext_id,
+                      _1: ext.ext_type,
+                      _2: es
+                    };
+                  }), constructors, rem$1),
+            match$5[2]
+          ];
       case /* Psig_exception */3 :
           const match$6 = transl_exception(env, sdesc._0);
           const ext = match$6[0];
@@ -83688,24 +83688,24 @@ function transl_signature(env, sg) {
                   return equal(partial_arg$1, param);
                 }), get_extension_constructors(rem$2));
           return [
-                  {
-                    hd: mksig$1({
-                          TAG: /* Tsig_exception */3,
-                          _0: ext
-                        }, env, loc),
-                    tl: match$7[0]
-                  },
-                  shadowed ? rem$2 : ({
-                        hd: {
-                          TAG: /* Sig_typext */2,
-                          _0: ext.ext_id,
-                          _1: ext.ext_type,
-                          _2: /* Text_exception */2
-                        },
-                        tl: rem$2
-                      }),
-                  match$7[2]
-                ];
+            {
+              hd: mksig$1({
+                    TAG: /* Tsig_exception */3,
+                    _0: ext
+                  }, env, loc),
+              tl: match$7[0]
+            },
+            shadowed ? rem$2 : ({
+                hd: {
+                  TAG: /* Sig_typext */2,
+                  _0: ext.ext_id,
+                  _1: ext.ext_type,
+                  _2: /* Text_exception */2
+                },
+                tl: rem$2
+              }),
+            match$7[2]
+          ];
       case /* Psig_module */4 :
           const pmd = sdesc._0;
           check_name("module", module_names, pmd.pmd_name);
@@ -83722,30 +83722,30 @@ function transl_signature(env, sg) {
           const id = match$8[0];
           const match$9 = transl_sig(match$8[1], srem);
           return [
-                  {
-                    hd: mksig$1({
-                          TAG: /* Tsig_module */4,
-                          _0: {
-                            md_id: id,
-                            md_name: pmd.pmd_name,
-                            md_type: tmty,
-                            md_attributes: pmd.pmd_attributes,
-                            md_loc: pmd.pmd_loc
-                          }
-                        }, env, loc),
-                    tl: match$9[0]
-                  },
-                  {
-                    hd: {
-                      TAG: /* Sig_module */3,
-                      _0: id,
-                      _1: md,
-                      _2: /* Trec_not */0
-                    },
-                    tl: match$9[1]
-                  },
-                  match$9[2]
-                ];
+            {
+              hd: mksig$1({
+                    TAG: /* Tsig_module */4,
+                    _0: {
+                      md_id: id,
+                      md_name: pmd.pmd_name,
+                      md_type: tmty,
+                      md_attributes: pmd.pmd_attributes,
+                      md_loc: pmd.pmd_loc
+                    }
+                  }, env, loc),
+              tl: match$9[0]
+            },
+            {
+              hd: {
+                TAG: /* Sig_module */3,
+                _0: id,
+                _1: md,
+                _2: /* Trec_not */0
+              },
+              tl: match$9[1]
+            },
+            match$9[2]
+          ];
       case /* Psig_recmodule */5 :
           const sdecls$1 = sdesc._0;
           Stdlib__List.iter((function (pmd) {
@@ -83755,62 +83755,62 @@ function transl_signature(env, sg) {
           const decls$1 = match$10[0];
           const match$11 = transl_sig(match$10[1], srem);
           return [
-                  {
-                    hd: mksig$1({
-                          TAG: /* Tsig_recmodule */5,
-                          _0: decls$1
-                        }, env, loc),
-                    tl: match$11[0]
-                  },
-                  map_rec((function (rs, md) {
-                          const d_md_type = md.md_type.mty_type;
-                          const d_md_attributes = md.md_attributes;
-                          const d_md_loc = md.md_loc;
-                          const d = {
-                            md_type: d_md_type,
-                            md_attributes: d_md_attributes,
-                            md_loc: d_md_loc
-                          };
-                          return {
-                                  TAG: /* Sig_module */3,
-                                  _0: md.md_id,
-                                  _1: d,
-                                  _2: rs
-                                };
-                        }), decls$1, match$11[1]),
-                  match$11[2]
-                ];
+            {
+              hd: mksig$1({
+                    TAG: /* Tsig_recmodule */5,
+                    _0: decls$1
+                  }, env, loc),
+              tl: match$11[0]
+            },
+            map_rec((function (rs, md) {
+                    const d_md_type = md.md_type.mty_type;
+                    const d_md_attributes = md.md_attributes;
+                    const d_md_loc = md.md_loc;
+                    const d = {
+                      md_type: d_md_type,
+                      md_attributes: d_md_attributes,
+                      md_loc: d_md_loc
+                    };
+                    return {
+                      TAG: /* Sig_module */3,
+                      _0: md.md_id,
+                      _1: d,
+                      _2: rs
+                    };
+                  }), decls$1, match$11[1]),
+            match$11[2]
+          ];
       case /* Psig_modtype */6 :
           const match$12 = transl_modtype_decl(modtype_names, env, item.psig_loc, sdesc._0);
           const match$13 = transl_sig(match$12[0], srem);
           return [
-                  {
-                    hd: mksig$1({
-                          TAG: /* Tsig_modtype */6,
-                          _0: match$12[1]
-                        }, env, loc),
-                    tl: match$13[0]
-                  },
-                  {
-                    hd: match$12[2],
-                    tl: match$13[1]
-                  },
-                  match$13[2]
-                ];
+            {
+              hd: mksig$1({
+                    TAG: /* Tsig_modtype */6,
+                    _0: match$12[1]
+                  }, env, loc),
+              tl: match$13[0]
+            },
+            {
+              hd: match$12[2],
+              tl: match$13[1]
+            },
+            match$13[2]
+          ];
       case /* Psig_open */7 :
           const match$14 = type_open$1(undefined, env, sdesc._0);
           const match$15 = transl_sig(match$14[1], srem);
           return [
-                  {
-                    hd: mksig$1({
-                          TAG: /* Tsig_open */7,
-                          _0: match$14[2]
-                        }, env, loc),
-                    tl: match$15[0]
-                  },
-                  match$15[1],
-                  match$15[2]
-                ];
+            {
+              hd: mksig$1({
+                    TAG: /* Tsig_open */7,
+                    _0: match$14[2]
+                  }, env, loc),
+              tl: match$15[0]
+            },
+            match$15[1],
+            match$15[2]
+          ];
       case /* Psig_include */8 :
           const sincl = sdesc._0;
           const smty = sincl.pincl_mod;
@@ -83833,16 +83833,16 @@ function transl_signature(env, sg) {
           const match$16 = transl_sig(newenv, srem);
           const rem$3 = match$16[1];
           return [
-                  {
-                    hd: mksig$1({
-                          TAG: /* Tsig_include */8,
-                          _0: incl
-                        }, env, loc),
-                    tl: match$16[0]
-                  },
-                  Stdlib.$at(remove_duplicates(get_values(rem$3), get_extension_constructors(rem$3), sg$1), rem$3),
-                  match$16[2]
-                ];
+            {
+              hd: mksig$1({
+                    TAG: /* Tsig_include */8,
+                    _0: incl
+                  }, env, loc),
+              tl: match$16[0]
+            },
+            Stdlib.$at(remove_duplicates(get_values(rem$3), get_extension_constructors(rem$3), sg$1), rem$3),
+            match$16[2]
+          ];
       case /* Psig_class */9 :
           const cl = sdesc._0;
           Stdlib__List.iter((function (param) {
@@ -83852,55 +83852,55 @@ function transl_signature(env, sg) {
           const classes = match$17[0];
           const match$18 = transl_sig(match$17[1], srem);
           return [
-                  {
-                    hd: mksig$1({
-                          TAG: /* Tsig_class */9,
-                          _0: Stdlib__List.map2((function (pcl, tcl) {
-                                  return tcl[11];
-                                }), cl, classes)
-                        }, env, loc),
-                    tl: match$18[0]
-                  },
-                  Stdlib__List.flatten(map_rec((function (rs, param) {
-                              return {
-                                      hd: {
-                                        TAG: /* Sig_class */5,
-                                        _0: param[0],
-                                        _1: param[2],
-                                        _2: rs
-                                      },
-                                      tl: {
-                                        hd: {
-                                          TAG: /* Sig_class_type */6,
-                                          _0: param[3],
-                                          _1: param[4],
-                                          _2: rs
-                                        },
-                                        tl: {
-                                          hd: {
-                                            TAG: /* Sig_type */1,
-                                            _0: param[5],
-                                            _1: param[6],
-                                            _2: rs
-                                          },
-                                          tl: {
-                                            hd: {
-                                              TAG: /* Sig_type */1,
-                                              _0: param[7],
-                                              _1: param[8],
-                                              _2: rs
-                                            },
-                                            tl: /* [] */0
-                                          }
-                                        }
-                                      }
-                                    };
-                            }), classes, {
-                            hd: match$18[1],
-                            tl: /* [] */0
-                          })),
-                  match$18[2]
-                ];
+            {
+              hd: mksig$1({
+                    TAG: /* Tsig_class */9,
+                    _0: Stdlib__List.map2((function (pcl, tcl) {
+                            return tcl[11];
+                          }), cl, classes)
+                  }, env, loc),
+              tl: match$18[0]
+            },
+            Stdlib__List.flatten(map_rec((function (rs, param) {
+                        return {
+                          hd: {
+                            TAG: /* Sig_class */5,
+                            _0: param[0],
+                            _1: param[2],
+                            _2: rs
+                          },
+                          tl: {
+                            hd: {
+                              TAG: /* Sig_class_type */6,
+                              _0: param[3],
+                              _1: param[4],
+                              _2: rs
+                            },
+                            tl: {
+                              hd: {
+                                TAG: /* Sig_type */1,
+                                _0: param[5],
+                                _1: param[6],
+                                _2: rs
+                              },
+                              tl: {
+                                hd: {
+                                  TAG: /* Sig_type */1,
+                                  _0: param[7],
+                                  _1: param[8],
+                                  _2: rs
+                                },
+                                tl: /* [] */0
+                              }
+                            }
+                          }
+                        };
+                      }), classes, {
+                      hd: match$18[1],
+                      tl: /* [] */0
+                    })),
+            match$18[2]
+          ];
       case /* Psig_class_type */10 :
           const cl$1 = sdesc._0;
           Stdlib__List.iter((function (param) {
@@ -83910,47 +83910,47 @@ function transl_signature(env, sg) {
           const classes$1 = match$19[0];
           const match$20 = transl_sig(match$19[1], srem);
           return [
-                  {
-                    hd: mksig$1({
-                          TAG: /* Tsig_class_type */10,
-                          _0: Stdlib__List.map2((function (pcl, tcl) {
-                                  return tcl[7];
-                                }), cl$1, classes$1)
-                        }, env, loc),
-                    tl: match$20[0]
-                  },
-                  Stdlib__List.flatten(map_rec((function (rs, param) {
-                              return {
-                                      hd: {
-                                        TAG: /* Sig_class_type */6,
-                                        _0: param[0],
-                                        _1: param[2],
-                                        _2: rs
-                                      },
-                                      tl: {
-                                        hd: {
-                                          TAG: /* Sig_type */1,
-                                          _0: param[3],
-                                          _1: param[4],
-                                          _2: rs
-                                        },
-                                        tl: {
-                                          hd: {
-                                            TAG: /* Sig_type */1,
-                                            _0: param[5],
-                                            _1: param[6],
-                                            _2: rs
-                                          },
-                                          tl: /* [] */0
-                                        }
-                                      }
-                                    };
-                            }), classes$1, {
-                            hd: match$20[1],
-                            tl: /* [] */0
-                          })),
-                  match$20[2]
-                ];
+            {
+              hd: mksig$1({
+                    TAG: /* Tsig_class_type */10,
+                    _0: Stdlib__List.map2((function (pcl, tcl) {
+                            return tcl[7];
+                          }), cl$1, classes$1)
+                  }, env, loc),
+              tl: match$20[0]
+            },
+            Stdlib__List.flatten(map_rec((function (rs, param) {
+                        return {
+                          hd: {
+                            TAG: /* Sig_class_type */6,
+                            _0: param[0],
+                            _1: param[2],
+                            _2: rs
+                          },
+                          tl: {
+                            hd: {
+                              TAG: /* Sig_type */1,
+                              _0: param[3],
+                              _1: param[4],
+                              _2: rs
+                            },
+                            tl: {
+                              hd: {
+                                TAG: /* Sig_type */1,
+                                _0: param[5],
+                                _1: param[6],
+                                _2: rs
+                              },
+                              tl: /* [] */0
+                            }
+                          }
+                        };
+                      }), classes$1, {
+                      hd: match$20[1],
+                      tl: /* [] */0
+                    })),
+            match$20[2]
+          ];
       case /* Psig_attribute */11 :
           const x = sdesc._0;
           warning_attribute({
@@ -83959,21 +83959,21 @@ function transl_signature(env, sg) {
               });
           const match$21 = transl_sig(env, srem);
           return [
-                  {
-                    hd: mksig$1({
-                          TAG: /* Tsig_attribute */11,
-                          _0: x
-                        }, env, loc),
-                    tl: match$21[0]
-                  },
-                  match$21[1],
-                  match$21[2]
-                ];
+            {
+              hd: mksig$1({
+                    TAG: /* Tsig_attribute */11,
+                    _0: x
+                  }, env, loc),
+              tl: match$21[0]
+            },
+            match$21[1],
+            match$21[2]
+          ];
       case /* Psig_extension */12 :
           throw new Caml_js_exceptions.MelangeError(Error_forward$3, {
-                    MEL_EXN_ID: Error_forward$3,
-                    _1: error_of_extension(sdesc._0)
-                  });
+                MEL_EXN_ID: Error_forward$3,
+                _1: error_of_extension(sdesc._0)
+              });
       
     }
   };
@@ -84025,35 +84025,35 @@ function transl_modtype_decl(modtype_names, env, loc, param) {
     mtd_loc: pmtd_loc
   };
   return [
-          match[1],
-          mtd,
-          {
-            TAG: /* Sig_modtype */4,
-            _0: id,
-            _1: decl
-          }
-        ];
+    match[1],
+    mtd,
+    {
+      TAG: /* Sig_modtype */4,
+      _0: id,
+      _1: decl
+    }
+  ];
 }
 
 function transl_recmodule_modtypes(loc, env, sdecls) {
   const make_env = function (curr) {
     return Stdlib__List.fold_left((function (env, param) {
-                  return add_module$1(true, param[0], param[2], env);
-                }), env, curr);
+            return add_module$1(true, param[0], param[2], env);
+          }), env, curr);
   };
   const make_env2 = function (curr) {
     return Stdlib__List.fold_left((function (env, param) {
-                  return add_module$1(true, param[0], param[2].mty_type, env);
-                }), env, curr);
+            return add_module$1(true, param[0], param[2].mty_type, env);
+          }), env, curr);
   };
   const transition = function (env_c, curr) {
     return Stdlib__List.map2((function (pmd, param) {
-                  return [
-                          param[0],
-                          param[1],
-                          transl_modtype$1(env_c, pmd.pmd_type)
-                        ];
-                }), sdecls, curr);
+            return [
+              param[0],
+              param[1],
+              transl_modtype$1(env_c, pmd.pmd_type)
+            ];
+          }), sdecls, curr);
   };
   const ids = Stdlib__List.map((function (x) {
           return create(x.pmd_name.txt);
@@ -84070,10 +84070,10 @@ function transl_recmodule_modtypes(loc, env, sdecls) {
         }), env, ids);
   const init = Stdlib__List.map2((function (id, pmd) {
           return [
-                  id,
-                  pmd.pmd_name,
-                  approx_modtype(approx_env, pmd.pmd_type)
-                ];
+            id,
+            pmd.pmd_name,
+            approx_modtype(approx_env, pmd.pmd_type)
+          ];
         }), ids, sdecls);
   const env0 = make_env(init);
   const dcl1 = transition(env0, init);
@@ -84084,27 +84084,27 @@ function transl_recmodule_modtypes(loc, env, sdecls) {
   check_recmod_typedecls(env2, sdecls, dcl2);
   const dcl2$1 = Stdlib__List.map2((function (pmd, param) {
           return {
-                  md_id: param[0],
-                  md_name: param[1],
-                  md_type: param[2],
-                  md_attributes: pmd.pmd_attributes,
-                  md_loc: pmd.pmd_loc
-                };
+            md_id: param[0],
+            md_name: param[1],
+            md_type: param[2],
+            md_attributes: pmd.pmd_attributes,
+            md_loc: pmd.pmd_loc
+          };
         }), sdecls, dcl2);
   return [
-          dcl2$1,
-          env2
-        ];
+    dcl2$1,
+    env2
+  ];
 }
 
 function simplify_signature(sg) {
   const aux = function (param) {
     if (!param) {
       return [
-              /* [] */0,
-              /* Empty */0,
-              /* Empty */0
-            ];
+        /* [] */0,
+        /* Empty */0,
+        /* Empty */0
+      ];
     }
     const component = param.hd;
     switch (component.TAG) {
@@ -84116,13 +84116,13 @@ function simplify_signature(sg) {
             return k;
           } else {
             return [
-                    {
-                      hd: component,
-                      tl: k[0]
-                    },
-                    Curry._2(add$14, name, val_names),
-                    k[2]
-                  ];
+              {
+                hd: component,
+                tl: k[0]
+              },
+              Curry._2(add$14, name, val_names),
+              k[2]
+            ];
           }
       case /* Sig_typext */2 :
           const k$1 = aux(param.tl);
@@ -84132,13 +84132,13 @@ function simplify_signature(sg) {
           const name$1 = component._0.name;
           if (!Curry._2(mem$7, name$1, ext_names)) {
             return [
-                    {
-                      hd: component,
-                      tl: sg
-                    },
-                    val_names$1,
-                    Curry._2(add$14, name$1, ext_names)
-                  ];
+              {
+                hd: component,
+                tl: sg
+              },
+              val_names$1,
+              Curry._2(add$14, name$1, ext_names)
+            ];
           }
           switch (component._2) {
             case /* Text_first */0 :
@@ -84152,18 +84152,18 @@ function simplify_signature(sg) {
                 switch (match._2) {
                   case /* Text_next */1 :
                       return [
-                              {
-                                hd: {
-                                  TAG: /* Sig_typext */2,
-                                  _0: match._0,
-                                  _1: match._1,
-                                  _2: /* Text_first */0
-                                },
-                                tl: sg.tl
-                              },
-                              val_names$1,
-                              ext_names
-                            ];
+                        {
+                          hd: {
+                            TAG: /* Sig_typext */2,
+                            _0: match._0,
+                            _1: match._1,
+                            _2: /* Text_first */0
+                          },
+                          tl: sg.tl
+                        },
+                        val_names$1,
+                        ext_names
+                      ];
                   case /* Text_first */0 :
                   case /* Text_exception */2 :
                       return k$1;
@@ -84177,13 +84177,13 @@ function simplify_signature(sg) {
       default:
         const match$1 = aux(param.tl);
         return [
-                {
-                  hd: component,
-                  tl: match$1[0]
-                },
-                match$1[1],
-                match$1[2]
-              ];
+          {
+            hd: component,
+            tl: match$1[0]
+          },
+          match$1[1],
+          match$1[2]
+        ];
     }
   };
   return aux(sg)[0];
@@ -84201,21 +84201,21 @@ function path_of_module(_mexp) {
       case /* Tmod_apply */3 :
           if (applicative_functors.contents) {
             return {
-                    TAG: /* Papply */2,
-                    _0: path_of_module(match._0),
-                    _1: path_of_module(match._1)
-                  };
+              TAG: /* Papply */2,
+              _0: path_of_module(match._0),
+              _1: path_of_module(match._1)
+            };
           }
           throw new Caml_js_exceptions.MelangeError(Not_a_path, {
-                    MEL_EXN_ID: Not_a_path
-                  });
+                MEL_EXN_ID: Not_a_path
+              });
       case /* Tmod_constraint */4 :
           _mexp = match._0;
           continue ;
       default:
         throw new Caml_js_exceptions.MelangeError(Not_a_path, {
-                  MEL_EXN_ID: Not_a_path
-                });
+              MEL_EXN_ID: Not_a_path
+            });
     }
   };
 }
@@ -84264,11 +84264,11 @@ function closed_signature_item(param) {
 function anchor_submodule(name, anchor) {
   if (anchor !== undefined) {
     return {
-            TAG: /* Pdot */1,
-            _0: anchor,
-            _1: name,
-            _2: -1
-          };
+      TAG: /* Pdot */1,
+      _0: anchor,
+      _1: name,
+      _2: -1
+    };
   }
   
 }
@@ -84276,15 +84276,15 @@ function anchor_submodule(name, anchor) {
 function enrich_type_decls(anchor, decls, oldenv, newenv) {
   if (anchor !== undefined) {
     return Stdlib__List.fold_left((function (e, info) {
-                  const id = info.typ_id;
-                  const info$p = enrich_typedecl(oldenv, {
-                        TAG: /* Pdot */1,
-                        _0: anchor,
-                        _1: id.name,
-                        _2: -1
-                      }, info.typ_type);
-                  return add_type$1(true, id, info$p, e);
-                }), oldenv, decls);
+            const id = info.typ_id;
+            const info$p = enrich_typedecl(oldenv, {
+                  TAG: /* Pdot */1,
+                  _0: anchor,
+                  _1: id.name,
+                  _2: -1
+                }, info.typ_type);
+            return add_type$1(true, id, info$p, e);
+          }), oldenv, decls);
   } else {
     return newenv;
   }
@@ -84293,11 +84293,11 @@ function enrich_type_decls(anchor, decls, oldenv, newenv) {
 function enrich_module_type(anchor, name, mty, env) {
   if (anchor !== undefined) {
     return enrich_modtype(env, {
-                TAG: /* Pdot */1,
-                _0: anchor,
-                _1: name,
-                _2: -1
-              }, mty);
+          TAG: /* Pdot */1,
+          _0: anchor,
+          _1: name,
+          _2: -1
+        }, mty);
   } else {
     return mty;
   }
@@ -84306,9 +84306,9 @@ function enrich_module_type(anchor, name, mty, env) {
 function check_recmodule_inclusion(env, bindings) {
   const subst_and_strengthen = function (env, s, id, mty) {
     return strengthen$1(env, modtype(s, mty), module_path(s, {
-                    TAG: /* Pident */0,
-                    _0: id
-                  }));
+              TAG: /* Pident */0,
+              _0: id
+            }));
   };
   let _first_time = true;
   let _n = Stdlib__List.length(bindings);
@@ -84323,10 +84323,10 @@ function check_recmodule_inclusion(env, bindings) {
       const bindings1 = Stdlib__List.map((function (param) {
               const id = param[0];
               return [
-                      id,
-                      rename(id),
-                      param[4]
-                    ];
+                id,
+                rename(id),
+                param[4]
+              ];
             }), bindings);
       const env$p = Stdlib__List.fold_left((function (env, param) {
               const mty_actual = param[2];
@@ -84335,9 +84335,9 @@ function check_recmodule_inclusion(env, bindings) {
             }), env$1, bindings1);
       const s$p = Stdlib__List.fold_left((function (s, param) {
               return add_module(param[0], {
-                          TAG: /* Pident */0,
-                          _0: param[1]
-                        }, s);
+                    TAG: /* Pident */0,
+                    _0: param[1]
+                  }, s);
             }), identity, bindings1);
       _s = s$p;
       _env = env$p;
@@ -84359,14 +84359,14 @@ function check_recmodule_inclusion(env, bindings) {
         const msg = Caml_js_exceptions.internalToOCamlException(raw_msg);
         if (msg.MEL_EXN_ID === $$Error$5) {
           throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                    MEL_EXN_ID: $$Error$10,
-                    _1: modl.mod_loc,
-                    _2: env$1,
-                    _3: {
-                      TAG: /* Not_included */1,
-                      _0: msg._1
-                    }
-                  });
+                MEL_EXN_ID: $$Error$10,
+                _1: modl.mod_loc,
+                _2: env$1,
+                _3: {
+                  TAG: /* Not_included */1,
+                  _0: msg._1
+                }
+              });
         }
         throw new Caml_js_exceptions.MelangeError(msg.MEL_EXN_ID, msg);
       }
@@ -84390,12 +84390,12 @@ function check_recmodule_inclusion(env, bindings) {
         mod_attributes: /* [] */0
       };
       return {
-              mb_id: id,
-              mb_name: param[1],
-              mb_expr: modl$p,
-              mb_attributes: param[5],
-              mb_loc: param[6]
-            };
+        mb_id: id,
+        mb_name: param[1],
+        mb_expr: modl$p,
+        mb_attributes: param[5],
+        mb_loc: param[6]
+      };
     };
     return Stdlib__List.map(check_inclusion, bindings);
   };
@@ -84425,21 +84425,21 @@ function package_constraints(env, loc, mty, constrs) {
                       tl: /* [] */0
                     }, constrs);
                 return {
-                        TAG: /* Sig_type */1,
-                        _0: id,
-                        _1: {
-                          type_params: td.type_params,
-                          type_arity: td.type_arity,
-                          type_kind: td.type_kind,
-                          type_private: td.type_private,
-                          type_manifest: ty,
-                          type_variance: td.type_variance,
-                          type_newtype_level: td.type_newtype_level,
-                          type_loc: td.type_loc,
-                          type_attributes: td.type_attributes
-                        },
-                        _2: item._2
-                      };
+                  TAG: /* Sig_type */1,
+                  _0: id,
+                  _1: {
+                    type_params: td.type_params,
+                    type_arity: td.type_arity,
+                    type_kind: td.type_kind,
+                    type_private: td.type_private,
+                    type_manifest: ty,
+                    type_variance: td.type_variance,
+                    type_newtype_level: td.type_newtype_level,
+                    type_loc: td.type_loc,
+                    type_attributes: td.type_attributes
+                  },
+                  _2: item._2
+                };
             case /* Sig_module */3 :
                 const md = item._1;
                 const id$1 = item._0;
@@ -84456,12 +84456,12 @@ function package_constraints(env, loc, mty, constrs) {
                       if (l) {
                         if (match$1.hd === id$1.name) {
                           return {
-                                  hd: [
-                                    l,
-                                    match[1]
-                                  ],
-                                  tl: aux(param.tl)
-                                };
+                            hd: [
+                              l,
+                              match[1]
+                            ],
+                            tl: aux(param.tl)
+                          };
                         }
                         _param = param.tl;
                         continue ;
@@ -84482,19 +84482,19 @@ function package_constraints(env, loc, mty, constrs) {
                   md_loc: md_md_loc
                 };
                 return {
-                        TAG: /* Sig_module */3,
-                        _0: id$1,
-                        _1: md$1,
-                        _2: item._2
-                      };
+                  TAG: /* Sig_module */3,
+                  _0: id$1,
+                  _1: md$1,
+                  _2: item._2
+                };
             default:
               return item;
           }
         }), sg);
   return {
-          TAG: /* Mty_signature */1,
-          _0: sg$p
-        };
+    TAG: /* Mty_signature */1,
+    _0: sg$p
+  };
 }
 
 function modtype_of_package(env, loc, p, nl, tl) {
@@ -84512,16 +84512,16 @@ function modtype_of_package(env, loc, p, nl, tl) {
     if (exit === 1) {
       if (Caml_obj.caml_equal(nl, /* [] */0)) {
         return {
-                TAG: /* Mty_ident */0,
-                _0: p
-              };
+          TAG: /* Mty_ident */0,
+          _0: p
+        };
       }
       throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                MEL_EXN_ID: $$Error$10,
-                _1: loc,
-                _2: env,
-                _3: /* Signature_expected */0
-              });
+            MEL_EXN_ID: $$Error$10,
+            _1: loc,
+            _2: env,
+            _3: /* Signature_expected */0
+          });
     }
     
   }
@@ -84533,11 +84533,11 @@ function modtype_of_package(env, loc, p, nl, tl) {
         _0: lid_of_path(undefined, p)
       };
       throw new Caml_js_exceptions.MelangeError($$Error$6, {
-                MEL_EXN_ID: $$Error$6,
-                _1: loc,
-                _2: env,
-                _3: error
-              });
+            MEL_EXN_ID: $$Error$6,
+            _1: loc,
+            _2: env,
+            _3: error
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -84576,30 +84576,30 @@ function wrap_constraint(env, arg, mty, explicit) {
     const msg = Caml_js_exceptions.internalToOCamlException(raw_msg);
     if (msg.MEL_EXN_ID === $$Error$5) {
       throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                MEL_EXN_ID: $$Error$10,
-                _1: arg.mod_loc,
-                _2: env,
-                _3: {
-                  TAG: /* Not_included */1,
-                  _0: msg._1
-                }
-              });
+            MEL_EXN_ID: $$Error$10,
+            _1: arg.mod_loc,
+            _2: env,
+            _3: {
+              TAG: /* Not_included */1,
+              _0: msg._1
+            }
+          });
     }
     throw new Caml_js_exceptions.MelangeError(msg.MEL_EXN_ID, msg);
   }
   return {
-          mod_desc: {
-            TAG: /* Tmod_constraint */4,
-            _0: arg,
-            _1: mty,
-            _2: explicit,
-            _3: coercion
-          },
-          mod_loc: arg.mod_loc,
-          mod_type: mty,
-          mod_env: env,
-          mod_attributes: /* [] */0
-        };
+    mod_desc: {
+      TAG: /* Tmod_constraint */4,
+      _0: arg,
+      _1: mty,
+      _2: explicit,
+      _3: coercion
+    },
+    mod_loc: arg.mod_loc,
+    mod_type: mty,
+    mod_env: env,
+    mod_attributes: /* [] */0
+  };
 }
 
 function type_module$1(aliasOpt, sttn, funct_body, anchor, env, smod) {
@@ -84703,9 +84703,9 @@ function type_module$1(aliasOpt, sttn, funct_body, anchor, env, smod) {
           return node$1;
         } else {
           return wrap_constraint(implicit_coercion(env), node$1, {
-                      TAG: /* Mty_signature */1,
-                      _0: sg$p
-                    }, /* Tmodtype_implicit */0);
+                TAG: /* Mty_signature */1,
+                _0: sg$p
+              }, /* Tmodtype_implicit */0);
         }
     case /* Pmod_functor */2 :
         const name = lid._0;
@@ -84768,28 +84768,28 @@ function type_module$1(aliasOpt, sttn, funct_body, anchor, env, smod) {
           const param = mty_functor._0;
           const generative = mty_param === undefined;
           const mty_param$1 = mty_param !== undefined ? mty_param : ({
-                TAG: /* Mty_signature */1,
-                _0: /* [] */0
-              });
+              TAG: /* Mty_signature */1,
+              _0: /* [] */0
+            });
           if (generative) {
             if (Caml_obj.caml_notequal(sarg.pmod_desc, {
                     TAG: /* Pmod_structure */1,
                     _0: /* [] */0
                   })) {
               throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                        MEL_EXN_ID: $$Error$10,
-                        _1: sfunct.pmod_loc,
-                        _2: env,
-                        _3: /* Apply_generative */4
-                      });
+                    MEL_EXN_ID: $$Error$10,
+                    _1: sfunct.pmod_loc,
+                    _2: env,
+                    _3: /* Apply_generative */4
+                  });
             }
             if (funct_body && contains_type$1(env, funct.mod_type)) {
               throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                        MEL_EXN_ID: $$Error$10,
-                        _1: smod.pmod_loc,
-                        _2: env,
-                        _3: /* Not_allowed_in_functor_body */1
-                      });
+                    MEL_EXN_ID: $$Error$10,
+                    _1: smod.pmod_loc,
+                    _2: env,
+                    _3: /* Not_allowed_in_functor_body */1
+                  });
             }
             
           }
@@ -84801,14 +84801,14 @@ function type_module$1(aliasOpt, sttn, funct_body, anchor, env, smod) {
             const msg = Caml_js_exceptions.internalToOCamlException(raw_msg);
             if (msg.MEL_EXN_ID === $$Error$5) {
               throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                        MEL_EXN_ID: $$Error$10,
-                        _1: sarg.pmod_loc,
-                        _2: env,
-                        _3: {
-                          TAG: /* Not_included */1,
-                          _0: msg._1
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$10,
+                    _1: sarg.pmod_loc,
+                    _2: env,
+                    _3: {
+                      TAG: /* Not_included */1,
+                      _0: msg._1
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(msg.MEL_EXN_ID, msg);
           }
@@ -84825,14 +84825,14 @@ function type_module$1(aliasOpt, sttn, funct_body, anchor, env, smod) {
               const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
               if (exn.MEL_EXN_ID === Stdlib.Not_found) {
                 throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                          MEL_EXN_ID: $$Error$10,
-                          _1: smod.pmod_loc,
-                          _2: env,
-                          _3: {
-                            TAG: /* Cannot_eliminate_dependency */2,
-                            _0: mty_functor
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$10,
+                      _1: smod.pmod_loc,
+                      _2: env,
+                      _3: {
+                        TAG: /* Cannot_eliminate_dependency */2,
+                        _0: mty_functor
+                      }
+                    });
               }
               throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
             }
@@ -84859,14 +84859,14 @@ function type_module$1(aliasOpt, sttn, funct_body, anchor, env, smod) {
           return node$3;
         }
         throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                  MEL_EXN_ID: $$Error$10,
-                  _1: sfunct.pmod_loc,
-                  _2: env,
-                  _3: {
-                    TAG: /* Cannot_apply */0,
-                    _0: funct.mod_type
-                  }
-                });
+              MEL_EXN_ID: $$Error$10,
+              _1: sfunct.pmod_loc,
+              _2: env,
+              _3: {
+                TAG: /* Cannot_apply */0,
+                _0: funct.mod_type
+              }
+            });
     case /* Pmod_constraint */4 :
         const arg$1 = type_module$1(alias, true, funct_body, anchor, env, lid._0);
         const mty$3 = transl_modtype$1(env, lid._1);
@@ -84910,25 +84910,25 @@ function type_module$1(aliasOpt, sttn, funct_body, anchor, env, smod) {
           switch (match$4.TAG) {
             case /* Tvar */0 :
                 throw new Caml_js_exceptions.MelangeError($$Error$7, {
-                          MEL_EXN_ID: $$Error$7,
-                          _1: smod.pmod_loc,
-                          _2: env,
-                          _3: /* Cannot_infer_signature */3
-                        });
+                      MEL_EXN_ID: $$Error$7,
+                      _1: smod.pmod_loc,
+                      _2: env,
+                      _3: /* Cannot_infer_signature */3
+                    });
             case /* Tpackage */11 :
                 const tl = match$4._2;
                 if (Stdlib__List.exists((function (t) {
                           return Caml_obj.caml_notequal(free_variables$1(undefined, t), /* [] */0);
                         }), tl)) {
                   throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                            MEL_EXN_ID: $$Error$10,
-                            _1: smod.pmod_loc,
-                            _2: env,
-                            _3: {
-                              TAG: /* Incomplete_packed_module */13,
-                              _0: exp.exp_type
-                            }
-                          });
+                        MEL_EXN_ID: $$Error$10,
+                        _1: smod.pmod_loc,
+                        _2: env,
+                        _3: {
+                          TAG: /* Incomplete_packed_module */13,
+                          _0: exp.exp_type
+                        }
+                      });
                 }
                 if (principal.contents && !generalizable(99999999, exp.exp_type)) {
                   prerr_warning(smod.pmod_loc, {
@@ -84944,22 +84944,22 @@ function type_module$1(aliasOpt, sttn, funct_body, anchor, env, smod) {
         }
         if (exit$1 === 1) {
           throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                    MEL_EXN_ID: $$Error$10,
-                    _1: smod.pmod_loc,
-                    _2: env,
-                    _3: {
-                      TAG: /* Not_a_packed_module */12,
-                      _0: exp.exp_type
-                    }
-                  });
+                MEL_EXN_ID: $$Error$10,
+                _1: smod.pmod_loc,
+                _2: env,
+                _3: {
+                  TAG: /* Not_a_packed_module */12,
+                  _0: exp.exp_type
+                }
+              });
         }
         if (funct_body && contains_type$1(env, mty$4)) {
           throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                    MEL_EXN_ID: $$Error$10,
-                    _1: smod.pmod_loc,
-                    _2: env,
-                    _3: /* Not_allowed_in_functor_body */1
-                  });
+                MEL_EXN_ID: $$Error$10,
+                _1: smod.pmod_loc,
+                _2: env,
+                _3: /* Not_allowed_in_functor_body */1
+              });
         }
         const node_mod_desc$4 = {
           TAG: /* Tmod_unpack */5,
@@ -84982,9 +84982,9 @@ function type_module$1(aliasOpt, sttn, funct_body, anchor, env, smod) {
         return node$5;
     case /* Pmod_extension */6 :
         throw new Caml_js_exceptions.MelangeError(Error_forward$3, {
-                  MEL_EXN_ID: Error_forward$3,
-                  _1: error_of_extension(lid._0)
-                });
+              MEL_EXN_ID: Error_forward$3,
+              _1: error_of_extension(lid._0)
+            });
     
   }
 }
@@ -85007,14 +85007,14 @@ function type_structure(toplevelOpt, funct_body, anchor, env, sstr, scope) {
       case /* Pstr_eval */0 :
           const expr = type_expression(env, desc._0);
           return [
-                  {
-                    TAG: /* Tstr_eval */0,
-                    _0: expr,
-                    _1: desc._1
-                  },
-                  /* [] */0,
-                  env
-                ];
+            {
+              TAG: /* Tstr_eval */0,
+              _0: expr,
+              _1: desc._1
+            },
+            /* [] */0,
+            env
+          ];
       case /* Pstr_value */1 :
           const rec_flag = desc._0;
           let scope$1;
@@ -85042,41 +85042,41 @@ function type_structure(toplevelOpt, funct_body, anchor, env, sstr, scope) {
           const newenv = match[1];
           const defs = match[0];
           return [
-                  {
-                    TAG: /* Tstr_value */1,
-                    _0: rec_flag,
-                    _1: defs
-                  },
-                  Stdlib__List.map((function (id) {
-                          return {
-                                  TAG: /* Sig_value */0,
-                                  _0: id,
-                                  _1: find_value({
-                                        TAG: /* Pident */0,
-                                        _0: id
-                                      }, newenv)
-                                };
-                        }), let_bound_idents(defs)),
-                  newenv
-                ];
+            {
+              TAG: /* Tstr_value */1,
+              _0: rec_flag,
+              _1: defs
+            },
+            Stdlib__List.map((function (id) {
+                    return {
+                      TAG: /* Sig_value */0,
+                      _0: id,
+                      _1: find_value({
+                            TAG: /* Pident */0,
+                            _0: id
+                          }, newenv)
+                    };
+                  }), let_bound_idents(defs)),
+            newenv
+          ];
       case /* Pstr_primitive */2 :
           const match$1 = transl_value_decl(env, loc, desc._0);
           const desc$1 = match$1[0];
           return [
-                  {
-                    TAG: /* Tstr_primitive */2,
-                    _0: desc$1
-                  },
-                  {
-                    hd: {
-                      TAG: /* Sig_value */0,
-                      _0: desc$1.val_id,
-                      _1: desc$1.val_val
-                    },
-                    tl: /* [] */0
-                  },
-                  match$1[1]
-                ];
+            {
+              TAG: /* Tstr_primitive */2,
+              _0: desc$1
+            },
+            {
+              hd: {
+                TAG: /* Sig_value */0,
+                _0: desc$1.val_id,
+                _1: desc$1.val_val
+              },
+              tl: /* [] */0
+            },
+            match$1[1]
+          ];
       case /* Pstr_type */3 :
           const sdecls = desc._0;
           const rec_flag$1 = rec_flag_of_ptype_declarations(sdecls);
@@ -85086,57 +85086,57 @@ function type_structure(toplevelOpt, funct_body, anchor, env, sstr, scope) {
           const match$2 = transl_type_decl(env, rec_flag$1, sdecls);
           const decls = match$2[0];
           return [
-                  {
-                    TAG: /* Tstr_type */3,
-                    _0: decls
-                  },
-                  map_rec_type_with_row_types(rec_flag$1, (function (rs, info) {
-                          return {
-                                  TAG: /* Sig_type */1,
-                                  _0: info.typ_id,
-                                  _1: info.typ_type,
-                                  _2: rs
-                                };
-                        }), decls, /* [] */0),
-                  enrich_type_decls(anchor, decls, env, match$2[1])
-                ];
+            {
+              TAG: /* Tstr_type */3,
+              _0: decls
+            },
+            map_rec_type_with_row_types(rec_flag$1, (function (rs, info) {
+                    return {
+                      TAG: /* Sig_type */1,
+                      _0: info.typ_id,
+                      _1: info.typ_type,
+                      _2: rs
+                    };
+                  }), decls, /* [] */0),
+            enrich_type_decls(anchor, decls, env, match$2[1])
+          ];
       case /* Pstr_typext */4 :
           const match$3 = transl_type_extension(true, env, loc, desc._0);
           const tyext = match$3[0];
           return [
-                  {
-                    TAG: /* Tstr_typext */4,
-                    _0: tyext
-                  },
-                  map_ext((function (es, ext) {
-                          return {
-                                  TAG: /* Sig_typext */2,
-                                  _0: ext.ext_id,
-                                  _1: ext.ext_type,
-                                  _2: es
-                                };
-                        }), tyext.tyext_constructors, /* [] */0),
-                  match$3[1]
-                ];
+            {
+              TAG: /* Tstr_typext */4,
+              _0: tyext
+            },
+            map_ext((function (es, ext) {
+                    return {
+                      TAG: /* Sig_typext */2,
+                      _0: ext.ext_id,
+                      _1: ext.ext_type,
+                      _2: es
+                    };
+                  }), tyext.tyext_constructors, /* [] */0),
+            match$3[1]
+          ];
       case /* Pstr_exception */5 :
           const match$4 = transl_exception(env, desc._0);
           const ext = match$4[0];
           return [
-                  {
-                    TAG: /* Tstr_exception */5,
-                    _0: ext
-                  },
-                  {
-                    hd: {
-                      TAG: /* Sig_typext */2,
-                      _0: ext.ext_id,
-                      _1: ext.ext_type,
-                      _2: /* Text_exception */2
-                    },
-                    tl: /* [] */0
-                  },
-                  match$4[1]
-                ];
+            {
+              TAG: /* Tstr_exception */5,
+              _0: ext
+            },
+            {
+              hd: {
+                TAG: /* Sig_typext */2,
+                _0: ext.ext_id,
+                _1: ext.ext_type,
+                _2: /* Text_exception */2
+              },
+              tl: /* [] */0
+            },
+            match$4[1]
+          ];
       case /* Pstr_module */6 :
           const match$5 = desc._0;
           const pmb_loc = match$5.pmb_loc;
@@ -85153,60 +85153,60 @@ function type_structure(toplevelOpt, funct_body, anchor, env, sstr, scope) {
           const match$6 = enter_module_declaration(undefined, name.txt, md, env);
           const id = match$6[0];
           return [
-                  {
-                    TAG: /* Tstr_module */6,
-                    _0: {
-                      mb_id: id,
-                      mb_name: name,
-                      mb_expr: modl,
-                      mb_attributes: attrs,
-                      mb_loc: pmb_loc
-                    }
-                  },
-                  {
-                    hd: {
-                      TAG: /* Sig_module */3,
-                      _0: id,
-                      _1: {
-                        md_type: modl.mod_type,
-                        md_attributes: attrs,
-                        md_loc: pmb_loc
-                      },
-                      _2: /* Trec_not */0
-                    },
-                    tl: /* [] */0
-                  },
-                  match$6[1]
-                ];
+            {
+              TAG: /* Tstr_module */6,
+              _0: {
+                mb_id: id,
+                mb_name: name,
+                mb_expr: modl,
+                mb_attributes: attrs,
+                mb_loc: pmb_loc
+              }
+            },
+            {
+              hd: {
+                TAG: /* Sig_module */3,
+                _0: id,
+                _1: {
+                  md_type: modl.mod_type,
+                  md_attributes: attrs,
+                  md_loc: pmb_loc
+                },
+                _2: /* Trec_not */0
+              },
+              tl: /* [] */0
+            },
+            match$6[1]
+          ];
       case /* Pstr_recmodule */7 :
           const sbind = Stdlib__List.map((function (mb) {
                   const match = mb.pmb_expr.pmod_desc;
                   if (match.TAG === /* Pmod_constraint */4) {
                     return [
-                            mb.pmb_name,
-                            match._1,
-                            match._0,
-                            mb.pmb_attributes,
-                            mb.pmb_loc
-                          ];
+                      mb.pmb_name,
+                      match._1,
+                      match._0,
+                      mb.pmb_attributes,
+                      mb.pmb_loc
+                    ];
                   }
                   throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                            MEL_EXN_ID: $$Error$10,
-                            _1: mb.pmb_expr.pmod_loc,
-                            _2: env,
-                            _3: /* Recursive_module_require_explicit_type */3
-                          });
+                        MEL_EXN_ID: $$Error$10,
+                        _1: mb.pmb_expr.pmod_loc,
+                        _2: env,
+                        _3: /* Recursive_module_require_explicit_type */3
+                      });
                 }), desc._0);
           Stdlib__List.iter((function (param) {
                   check_name("module", module_names, param[0]);
                 }), sbind);
           const match$7 = transl_recmodule_modtypes(loc, env, Stdlib__List.map((function (param) {
                       return {
-                              pmd_name: param[0],
-                              pmd_type: param[1],
-                              pmd_attributes: param[3],
-                              pmd_loc: param[4]
-                            };
+                        pmd_name: param[0],
+                        pmd_type: param[1],
+                        pmd_attributes: param[3],
+                        pmd_loc: param[4]
+                      };
                     }), sbind));
           const newenv$1 = match$7[1];
           const decls$1 = match$7[0];
@@ -85218,14 +85218,14 @@ function type_structure(toplevelOpt, funct_body, anchor, env, sstr, scope) {
                       }, newenv$1, param$1[2]);
                   const mty$p = enrich_module_type(anchor, id.name, modl.mod_type, newenv$1);
                   return [
-                          id,
-                          param$1[0],
-                          param.md_type,
-                          modl,
-                          mty$p,
-                          param$1[3],
-                          param$1[4]
-                        ];
+                    id,
+                    param$1[0],
+                    param.md_type,
+                    modl,
+                    mty$p,
+                    param$1[3],
+                    param$1[4]
+                  ];
                 }), decls$1, sbind);
           const newenv$2 = Stdlib__List.fold_left((function (env, md) {
                   const mdecl_md_type = md.md_type.mty_type;
@@ -85240,47 +85240,47 @@ function type_structure(toplevelOpt, funct_body, anchor, env, sstr, scope) {
                 }), env, decls$1);
           const bindings2 = check_recmodule_inclusion(newenv$2, bindings1);
           return [
-                  {
-                    TAG: /* Tstr_recmodule */7,
-                    _0: bindings2
-                  },
-                  map_rec((function (rs, mb) {
-                          return {
-                                  TAG: /* Sig_module */3,
-                                  _0: mb.mb_id,
-                                  _1: {
-                                    md_type: mb.mb_expr.mod_type,
-                                    md_attributes: mb.mb_attributes,
-                                    md_loc: mb.mb_loc
-                                  },
-                                  _2: rs
-                                };
-                        }), bindings2, /* [] */0),
-                  newenv$2
-                ];
+            {
+              TAG: /* Tstr_recmodule */7,
+              _0: bindings2
+            },
+            map_rec((function (rs, mb) {
+                    return {
+                      TAG: /* Sig_module */3,
+                      _0: mb.mb_id,
+                      _1: {
+                        md_type: mb.mb_expr.mod_type,
+                        md_attributes: mb.mb_attributes,
+                        md_loc: mb.mb_loc
+                      },
+                      _2: rs
+                    };
+                  }), bindings2, /* [] */0),
+            newenv$2
+          ];
       case /* Pstr_modtype */8 :
           const match$8 = transl_modtype_decl(modtype_names, env, loc, desc._0);
           return [
-                  {
-                    TAG: /* Tstr_modtype */8,
-                    _0: match$8[1]
-                  },
-                  {
-                    hd: match$8[2],
-                    tl: /* [] */0
-                  },
-                  match$8[0]
-                ];
+            {
+              TAG: /* Tstr_modtype */8,
+              _0: match$8[1]
+            },
+            {
+              hd: match$8[2],
+              tl: /* [] */0
+            },
+            match$8[0]
+          ];
       case /* Pstr_open */9 :
           const match$9 = type_open$1(toplevel, env, desc._0);
           return [
-                  {
-                    TAG: /* Tstr_open */9,
-                    _0: match$9[2]
-                  },
-                  /* [] */0,
-                  match$9[1]
-                ];
+            {
+              TAG: /* Tstr_open */9,
+              _0: match$9[2]
+            },
+            /* [] */0,
+            match$9[1]
+          ];
       case /* Pstr_class */10 :
           const cl = desc._0;
           Stdlib__List.iter((function (param) {
@@ -85289,54 +85289,54 @@ function type_structure(toplevelOpt, funct_body, anchor, env, sstr, scope) {
           const match$10 = class_declarations$2(env, cl);
           const classes = match$10[0];
           return [
-                  {
-                    TAG: /* Tstr_class */10,
-                    _0: Stdlib__List.map((function (param) {
-                            const vf = param[2].cty_new === undefined ? /* Virtual */0 : /* Concrete */1;
-                            return [
-                                    param[11],
-                                    param[10],
-                                    vf
-                                  ];
-                          }), classes)
-                  },
-                  Stdlib__List.flatten(map_rec((function (rs, param) {
-                              return {
-                                      hd: {
-                                        TAG: /* Sig_class */5,
-                                        _0: param[0],
-                                        _1: param[2],
-                                        _2: rs
-                                      },
-                                      tl: {
-                                        hd: {
-                                          TAG: /* Sig_class_type */6,
-                                          _0: param[3],
-                                          _1: param[4],
-                                          _2: rs
-                                        },
-                                        tl: {
-                                          hd: {
-                                            TAG: /* Sig_type */1,
-                                            _0: param[5],
-                                            _1: param[6],
-                                            _2: rs
-                                          },
-                                          tl: {
-                                            hd: {
-                                              TAG: /* Sig_type */1,
-                                              _0: param[7],
-                                              _1: param[8],
-                                              _2: rs
-                                            },
-                                            tl: /* [] */0
-                                          }
-                                        }
-                                      }
-                                    };
-                            }), classes, /* [] */0)),
-                  match$10[1]
-                ];
+            {
+              TAG: /* Tstr_class */10,
+              _0: Stdlib__List.map((function (param) {
+                      const vf = param[2].cty_new === undefined ? /* Virtual */0 : /* Concrete */1;
+                      return [
+                        param[11],
+                        param[10],
+                        vf
+                      ];
+                    }), classes)
+            },
+            Stdlib__List.flatten(map_rec((function (rs, param) {
+                        return {
+                          hd: {
+                            TAG: /* Sig_class */5,
+                            _0: param[0],
+                            _1: param[2],
+                            _2: rs
+                          },
+                          tl: {
+                            hd: {
+                              TAG: /* Sig_class_type */6,
+                              _0: param[3],
+                              _1: param[4],
+                              _2: rs
+                            },
+                            tl: {
+                              hd: {
+                                TAG: /* Sig_type */1,
+                                _0: param[5],
+                                _1: param[6],
+                                _2: rs
+                              },
+                              tl: {
+                                hd: {
+                                  TAG: /* Sig_type */1,
+                                  _0: param[7],
+                                  _1: param[8],
+                                  _2: rs
+                                },
+                                tl: /* [] */0
+                              }
+                            }
+                          }
+                        };
+                      }), classes, /* [] */0)),
+            match$10[1]
+          ];
       case /* Pstr_class_type */11 :
           const cl$1 = desc._0;
           Stdlib__List.iter((function (param) {
@@ -85345,45 +85345,45 @@ function type_structure(toplevelOpt, funct_body, anchor, env, sstr, scope) {
           const match$11 = class_type_declarations$2(env, cl$1);
           const classes$1 = match$11[0];
           return [
-                  {
-                    TAG: /* Tstr_class_type */11,
-                    _0: Stdlib__List.map((function (param) {
-                            return [
-                                    param[0],
-                                    param[1],
-                                    param[7]
-                                  ];
-                          }), classes$1)
-                  },
-                  Stdlib__List.flatten(map_rec((function (rs, param) {
-                              return {
-                                      hd: {
-                                        TAG: /* Sig_class_type */6,
-                                        _0: param[0],
-                                        _1: param[2],
-                                        _2: rs
-                                      },
-                                      tl: {
-                                        hd: {
-                                          TAG: /* Sig_type */1,
-                                          _0: param[3],
-                                          _1: param[4],
-                                          _2: rs
-                                        },
-                                        tl: {
-                                          hd: {
-                                            TAG: /* Sig_type */1,
-                                            _0: param[5],
-                                            _1: param[6],
-                                            _2: rs
-                                          },
-                                          tl: /* [] */0
-                                        }
-                                      }
-                                    };
-                            }), classes$1, /* [] */0)),
-                  match$11[1]
-                ];
+            {
+              TAG: /* Tstr_class_type */11,
+              _0: Stdlib__List.map((function (param) {
+                      return [
+                        param[0],
+                        param[1],
+                        param[7]
+                      ];
+                    }), classes$1)
+            },
+            Stdlib__List.flatten(map_rec((function (rs, param) {
+                        return {
+                          hd: {
+                            TAG: /* Sig_class_type */6,
+                            _0: param[0],
+                            _1: param[2],
+                            _2: rs
+                          },
+                          tl: {
+                            hd: {
+                              TAG: /* Sig_type */1,
+                              _0: param[3],
+                              _1: param[4],
+                              _2: rs
+                            },
+                            tl: {
+                              hd: {
+                                TAG: /* Sig_type */1,
+                                _0: param[5],
+                                _1: param[6],
+                                _2: rs
+                              },
+                              tl: /* [] */0
+                            }
+                          }
+                        };
+                      }), classes$1, /* [] */0)),
+            match$11[1]
+          ];
       case /* Pstr_include */12 :
           const sincl = desc._0;
           const smodl = sincl.pincl_mod;
@@ -85418,23 +85418,23 @@ function type_structure(toplevelOpt, funct_body, anchor, env, sstr, scope) {
                             const n = pos.contents;
                             pos.contents = pos.contents + 1 | 0;
                             return {
-                                    TAG: /* Sig_module */3,
-                                    _0: id,
-                                    _1: {
-                                      md_type: {
-                                        TAG: /* Mty_alias */3,
-                                        _0: {
-                                          TAG: /* Pdot */1,
-                                          _0: p,
-                                          _1: id.name,
-                                          _2: n
-                                        }
-                                      },
-                                      md_attributes: md.md_attributes,
-                                      md_loc: md.md_loc
-                                    },
-                                    _2: it._2
-                                  };
+                              TAG: /* Sig_module */3,
+                              _0: id,
+                              _1: {
+                                md_type: {
+                                  TAG: /* Mty_alias */3,
+                                  _0: {
+                                    TAG: /* Pdot */1,
+                                    _0: p,
+                                    _1: id.name,
+                                    _2: n
+                                  }
+                                },
+                                md_attributes: md.md_attributes,
+                                md_loc: md.md_loc
+                              },
+                              _2: it._2
+                            };
                         case /* Sig_typext */2 :
                         case /* Sig_class */5 :
                             pos.contents = pos.contents + 1 | 0;
@@ -85460,13 +85460,13 @@ function type_structure(toplevelOpt, funct_body, anchor, env, sstr, scope) {
             incl_attributes: incl_incl_attributes
           };
           return [
-                  {
-                    TAG: /* Tstr_include */12,
-                    _0: incl
-                  },
-                  sg$1,
-                  new_env
-                ];
+            {
+              TAG: /* Tstr_include */12,
+              _0: incl
+            },
+            sg$1,
+            new_env
+          ];
       case /* Pstr_attribute */13 :
           const x = desc._0;
           warning_attribute({
@@ -85474,18 +85474,18 @@ function type_structure(toplevelOpt, funct_body, anchor, env, sstr, scope) {
                 tl: /* [] */0
               });
           return [
-                  {
-                    TAG: /* Tstr_attribute */13,
-                    _0: x
-                  },
-                  /* [] */0,
-                  env
-                ];
+            {
+              TAG: /* Tstr_attribute */13,
+              _0: x
+            },
+            /* [] */0,
+            env
+          ];
       case /* Pstr_extension */14 :
           throw new Caml_js_exceptions.MelangeError(Error_forward$3, {
-                    MEL_EXN_ID: Error_forward$3,
-                    _1: error_of_extension(desc._0)
-                  });
+                MEL_EXN_ID: Error_forward$3,
+                _1: error_of_extension(desc._0)
+              });
       
     }
   };
@@ -85493,10 +85493,10 @@ function type_structure(toplevelOpt, funct_body, anchor, env, sstr, scope) {
     init_def(currentstamp.contents);
     if (!sstr) {
       return [
-              /* [] */0,
-              /* [] */0,
-              env
-            ];
+        /* [] */0,
+        /* [] */0,
+        env
+      ];
     }
     const srem = sstr.tl;
     const pstr = sstr.hd;
@@ -85518,13 +85518,13 @@ function type_structure(toplevelOpt, funct_body, anchor, env, sstr, scope) {
     };
     const match$1 = type_struct(match[2], srem);
     return [
-            {
-              hd: str,
-              tl: match$1[0]
-            },
-            Stdlib.$at(match[1], match$1[1]),
-            match$1[2]
-          ];
+      {
+        hd: str,
+        tl: match$1[0]
+      },
+      Stdlib.$at(match[1], match$1[1]),
+      match$1[2]
+    ];
   };
   if (annotations.contents) {
     Stdlib__List.iter((function (param) {
@@ -85559,10 +85559,10 @@ function type_structure(toplevelOpt, funct_body, anchor, env, sstr, scope) {
     tl: previous_saved_types
   };
   return [
-          str,
-          sg,
-          final_env
-        ];
+    str,
+    sg,
+    final_env
+  ];
 }
 
 function type_module$2(param, param$1) {
@@ -85576,29 +85576,29 @@ function type_structure$1(param, param$1, param$2) {
 function normalize_signature(env) {
   return function (param) {
     return Stdlib__List.iter((function (param) {
-                  switch (param.TAG) {
-                    case /* Sig_value */0 :
-                        return normalize_type(env, param._1.val_type);
-                    case /* Sig_module */3 :
-                        let _p = param._1.md_type;
-                        while(true) {
-                          const p = _p;
-                          switch (p.TAG) {
-                            case /* Mty_signature */1 :
-                                return normalize_signature(env)(p._0);
-                            case /* Mty_functor */2 :
-                                _p = p._2;
-                                continue ;
-                            case /* Mty_ident */0 :
-                            case /* Mty_alias */3 :
-                                return ;
-                            
-                          }
-                        };
-                    default:
-                      return ;
-                  }
-                }), param);
+            switch (param.TAG) {
+              case /* Sig_value */0 :
+                  return normalize_type(env, param._1.val_type);
+              case /* Sig_module */3 :
+                  let _p = param._1.md_type;
+                  while(true) {
+                    const p = _p;
+                    switch (p.TAG) {
+                      case /* Mty_signature */1 :
+                          return normalize_signature(env)(p._0);
+                      case /* Mty_functor */2 :
+                          _p = p._2;
+                          continue ;
+                      case /* Mty_ident */0 :
+                      case /* Mty_alias */3 :
+                          return ;
+                      
+                    }
+                  };
+              default:
+                return ;
+            }
+          }), param);
   };
 }
 
@@ -85635,19 +85635,19 @@ function type_module_type_of(env, smod) {
   const mty$1 = remove_aliases$1(env, mty);
   if (!closed_modtype(mty$1)) {
     throw new Caml_js_exceptions.MelangeError($$Error$10, {
-              MEL_EXN_ID: $$Error$10,
-              _1: smod.pmod_loc,
-              _2: env,
-              _3: {
-                TAG: /* Non_generalizable_module */9,
-                _0: mty$1
-              }
-            });
+          MEL_EXN_ID: $$Error$10,
+          _1: smod.pmod_loc,
+          _2: env,
+          _3: {
+            TAG: /* Non_generalizable_module */9,
+            _0: mty$1
+          }
+        });
   }
   return [
-          tmty,
-          mty$1
-        ];
+    tmty,
+    mty$1
+  ];
 }
 
 function type_package$1(env, m, p, nl, tl) {
@@ -85681,49 +85681,49 @@ function type_package$1(env, m, p, nl, tl) {
     switch (name.TAG) {
       case /* Lident */0 :
           return {
-                  TAG: /* Pdot */1,
-                  _0: mp,
-                  _1: name._0,
-                  _2: -1
-                };
+            TAG: /* Pdot */1,
+            _0: mp,
+            _1: name._0,
+            _2: -1
+          };
       case /* Ldot */1 :
           return {
-                  TAG: /* Pdot */1,
-                  _0: mkpath(mp, name._0),
-                  _1: name._1,
-                  _2: -1
-                };
+            TAG: /* Pdot */1,
+            _0: mkpath(mp, name._0),
+            _1: name._1,
+            _2: -1
+          };
       case /* Lapply */2 :
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "jscomp/test/ocaml_typedtree_test.ml",
-                      51527,
-                      11
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/ocaml_typedtree_test.ml",
+                  51527,
+                  11
+                ]
+              });
       
     }
   };
   const tl$p = Stdlib__List.map((function (name) {
           return newty2(100000000, {
-                      TAG: /* Tconstr */3,
-                      _0: mkpath(mp, name),
-                      _1: /* [] */0,
-                      _2: {
-                        contents: /* Mnil */0
-                      }
-                    });
+                TAG: /* Tconstr */3,
+                _0: mkpath(mp, name),
+                _1: /* [] */0,
+                _2: {
+                  contents: /* Mnil */0
+                }
+              });
         }), nl);
   end_def(undefined);
   if (Caml_obj.caml_equal(nl, /* [] */0)) {
     return [
-            wrap_constraint(env$1, modl, {
-                  TAG: /* Mty_ident */0,
-                  _0: p
-                }, /* Tmodtype_implicit */0),
-            /* [] */0
-          ];
+      wrap_constraint(env$1, modl, {
+            TAG: /* Mty_ident */0,
+            _0: p
+          }, /* Tmodtype_implicit */0),
+      /* [] */0
+    ];
   }
   const mty = modtype_of_package(env$1, modl.mod_loc, p, nl, tl$p);
   Stdlib__List.iter2((function (n, ty) {
@@ -85734,23 +85734,23 @@ function type_package$1(env, m, p, nl, tl) {
             const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn.MEL_EXN_ID === Unify) {
               throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                        MEL_EXN_ID: $$Error$10,
-                        _1: m.pmod_loc,
-                        _2: env$1,
-                        _3: {
-                          TAG: /* Scoping_pack */14,
-                          _0: n,
-                          _1: ty
-                        }
-                      });
+                    MEL_EXN_ID: $$Error$10,
+                    _1: m.pmod_loc,
+                    _2: env$1,
+                    _3: {
+                      TAG: /* Scoping_pack */14,
+                      _0: n,
+                      _1: ty
+                    }
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
           }
         }), nl, tl$p);
   return [
-          wrap_constraint(env$1, modl, mty, /* Tmodtype_implicit */0),
-          tl$p
-        ];
+    wrap_constraint(env$1, modl, mty, /* Tmodtype_implicit */0),
+    tl$p
+  ];
 }
 
 type_module.contents = type_module$2;
@@ -85794,11 +85794,11 @@ function type_implementation_more(sourcefile, outputprefix, modulename, initial_
                       }), signature$3, simple_sg);
             }));
       return [
-              str,
-              /* Tcoerce_none */0,
-              finalenv,
-              simple_sg
-            ];
+        str,
+        /* Tcoerce_none */0,
+        finalenv,
+        simple_sg
+      ];
     }
     const sourceintf = chop_extension_if_any(sourcefile) + interface_suffix.contents;
     const mli_status = assume_no_mli.contents;
@@ -85811,14 +85811,14 @@ function type_implementation_more(sourcefile, outputprefix, modulename, initial_
         const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
         if (exn.MEL_EXN_ID === Stdlib.Not_found) {
           throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                    MEL_EXN_ID: $$Error$10,
-                    _1: in_file(sourcefile),
-                    _2: empty,
-                    _3: {
-                      TAG: /* Interface_not_compiled */11,
-                      _0: sourceintf
-                    }
-                  });
+                MEL_EXN_ID: $$Error$10,
+                _1: in_file(sourcefile),
+                _2: empty,
+                _3: {
+                  TAG: /* Interface_not_compiled */11,
+                  _0: sourceintf
+                }
+              });
         }
         throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
       }
@@ -85830,45 +85830,45 @@ function type_implementation_more(sourcefile, outputprefix, modulename, initial_
             _0: str
           }, sourcefile, initial_env, undefined);
       return [
-              str,
-              coercion,
-              finalenv,
-              dclsig
-            ];
+        str,
+        coercion,
+        finalenv,
+        dclsig
+      ];
     }
     Stdlib__List.iter((function (param) {
             const match = param.str_desc;
             switch (match.TAG) {
               case /* Tstr_value */1 :
                   return Stdlib__List.iter((function (param) {
-                                const exp = param.vb_expr;
-                                if (closed_schema(exp.exp_type)) {
-                                  return ;
+                          const exp = param.vb_expr;
+                          if (closed_schema(exp.exp_type)) {
+                            return ;
+                          }
+                          throw new Caml_js_exceptions.MelangeError($$Error$10, {
+                                MEL_EXN_ID: $$Error$10,
+                                _1: exp.exp_loc,
+                                _2: finalenv,
+                                _3: {
+                                  TAG: /* Non_generalizable */7,
+                                  _0: exp.exp_type
                                 }
-                                throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                                          MEL_EXN_ID: $$Error$10,
-                                          _1: exp.exp_loc,
-                                          _2: finalenv,
-                                          _3: {
-                                            TAG: /* Non_generalizable */7,
-                                            _0: exp.exp_type
-                                          }
-                                        });
-                              }), match._1);
+                              });
+                        }), match._1);
               case /* Tstr_module */6 :
                   const md = match._0.mb_expr;
                   if (closed_modtype(md.mod_type)) {
                     return ;
                   }
                   throw new Caml_js_exceptions.MelangeError($$Error$10, {
-                            MEL_EXN_ID: $$Error$10,
-                            _1: md.mod_loc,
-                            _2: finalenv,
-                            _3: {
-                              TAG: /* Non_generalizable_module */9,
-                              _0: md.mod_type
-                            }
-                          });
+                        MEL_EXN_ID: $$Error$10,
+                        _1: md.mod_loc,
+                        _2: finalenv,
+                        _3: {
+                          TAG: /* Non_generalizable_module */9,
+                          _0: md.mod_type
+                        }
+                      });
               default:
                 return ;
             }
@@ -85884,11 +85884,11 @@ function type_implementation_more(sourcefile, outputprefix, modulename, initial_
           }, sourcefile, initial_env, sg$1);
     }
     return [
-            str,
-            coercion$1,
-            finalenv,
-            simple_sg
-          ];
+      str,
+      coercion$1,
+      finalenv,
+      simple_sg
+    ];
   }
   catch (e){
     save_cmt(outputprefix + ".cmt", modulename, {
@@ -85902,9 +85902,9 @@ function type_implementation_more(sourcefile, outputprefix, modulename, initial_
 function type_implementation(sourcefile, outputprefix, modulename, initial_env, ast) {
   const match = type_implementation_more(sourcefile, outputprefix, modulename, initial_env, ast);
   return [
-          match[0],
-          match[1]
-        ];
+    match[0],
+    match[1]
+  ];
 }
 
 register_error_of_exn(function (err) {
@@ -85917,747 +85917,350 @@ register_error_of_exn(function (err) {
       }
       const env = err._2;
       return error_of_printer(err._1, (function (param, param$1) {
-                    return wrap_printing_env(env, (function (param$2) {
-                                  if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
-                                    switch (param$1) {
-                                      case /* Signature_expected */0 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "This module type is not a signature",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "This module type is not a signature"
-                                                    });
-                                      case /* Not_allowed_in_functor_body */1 :
-                                          return Curry._1(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "This expression creates fresh types.",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* String */2,
-                                                                  _0: /* No_padding */0,
-                                                                  _1: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: /* Close_box */0,
-                                                                    _1: /* End_of_format */0
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[This expression creates fresh types.@ %s@]"
-                                                        }), "It is not allowed inside applicative functors.");
-                                      case /* With_need_typeconstr */2 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "Only type constructors with identical parameters can be substituted.",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "Only type constructors with identical parameters can be substituted."
-                                                    });
-                                      case /* Recursive_module_require_explicit_type */3 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "Recursive modules require an explicit module type.",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "Recursive modules require an explicit module type."
-                                                    });
-                                      case /* Apply_generative */4 :
-                                          return Stdlib__Format.fprintf(param)({
-                                                      TAG: /* Format */0,
-                                                      _0: {
-                                                        TAG: /* String_literal */11,
-                                                        _0: "This is a generative functor. It can only be applied to ()",
-                                                        _1: /* End_of_format */0
-                                                      },
-                                                      _1: "This is a generative functor. It can only be applied to ()"
-                                                    });
-                                      
-                                    }
-                                  } else {
-                                    switch (param$1.TAG) {
-                                      case /* Cannot_apply */0 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "This module is not a functor; it has type",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Alpha */15,
-                                                                  _0: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: /* Close_box */0,
-                                                                    _1: /* End_of_format */0
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[This module is not a functor; it has type@ %a@]"
-                                                        }), modtype$1, param$1._0);
-                                      case /* Not_included */1 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "<v>",
-                                                                  _1: /* End_of_format */0
-                                                                },
-                                                                _1: "<v>"
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "Signature mismatch:",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Alpha */15,
-                                                                  _0: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: /* Close_box */0,
-                                                                    _1: /* End_of_format */0
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[<v>Signature mismatch:@ %a@]"
-                                                        }), report_error$4, param$1._0);
-                                      case /* Cannot_eliminate_dependency */2 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "This functor has type",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Alpha */15,
-                                                                  _0: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: {
-                                                                      TAG: /* Break */0,
-                                                                      _0: "@ ",
-                                                                      _1: 1,
-                                                                      _2: 0
-                                                                    },
-                                                                    _1: {
-                                                                      TAG: /* String_literal */11,
-                                                                      _0: "The parameter cannot be eliminated in the result type.",
-                                                                      _1: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: {
-                                                                          TAG: /* Break */0,
-                                                                          _0: "@ ",
-                                                                          _1: 1,
-                                                                          _2: 0
-                                                                        },
-                                                                        _1: {
-                                                                          TAG: /* String_literal */11,
-                                                                          _0: " Please bind the argument to a module identifier.",
-                                                                          _1: {
-                                                                            TAG: /* Formatting_lit */17,
-                                                                            _0: /* Close_box */0,
-                                                                            _1: /* End_of_format */0
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[This functor has type@ %a@ The parameter cannot be eliminated in the result type.@  Please bind the argument to a module identifier.@]"
-                                                        }), modtype$1, param$1._0);
-                                      case /* Structure_expected */3 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "This module is not a structure; it has type",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Alpha */15,
-                                                                  _0: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[This module is not a structure; it has type@ %a"
-                                                        }), modtype$1, param$1._0);
-                                      case /* With_no_component */4 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "The signature constrained by `with' has no component named ",
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: /* Close_box */0,
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[The signature constrained by `with' has no component named %a@]"
-                                                        }), longident, param$1._0);
-                                      case /* With_mismatch */5 :
-                                          return Curry._4(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: "<v>",
-                                                                  _1: /* End_of_format */0
-                                                                },
-                                                                _1: "<v>"
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* Formatting_gen */18,
-                                                              _0: {
-                                                                TAG: /* Open_box */1,
-                                                                _0: {
-                                                                  TAG: /* Format */0,
-                                                                  _0: /* End_of_format */0,
-                                                                  _1: ""
-                                                                }
-                                                              },
-                                                              _1: {
-                                                                TAG: /* String_literal */11,
-                                                                _0: "In this `with' constraint, the new definition of ",
-                                                                _1: {
-                                                                  TAG: /* Alpha */15,
-                                                                  _0: {
-                                                                    TAG: /* Formatting_lit */17,
-                                                                    _0: {
-                                                                      TAG: /* Break */0,
-                                                                      _0: "@ ",
-                                                                      _1: 1,
-                                                                      _2: 0
-                                                                    },
-                                                                    _1: {
-                                                                      TAG: /* String_literal */11,
-                                                                      _0: "does not match its original definition",
-                                                                      _1: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: {
-                                                                          TAG: /* Break */0,
-                                                                          _0: "@ ",
-                                                                          _1: 1,
-                                                                          _2: 0
-                                                                        },
-                                                                        _1: {
-                                                                          TAG: /* String_literal */11,
-                                                                          _0: "in the constrained signature:",
-                                                                          _1: {
-                                                                            TAG: /* Formatting_lit */17,
-                                                                            _0: /* Close_box */0,
-                                                                            _1: {
-                                                                              TAG: /* Formatting_lit */17,
-                                                                              _0: {
-                                                                                TAG: /* Break */0,
-                                                                                _0: "@ ",
-                                                                                _1: 1,
-                                                                                _2: 0
-                                                                              },
-                                                                              _1: {
-                                                                                TAG: /* Alpha */15,
-                                                                                _0: {
-                                                                                  TAG: /* Formatting_lit */17,
-                                                                                  _0: /* Close_box */0,
-                                                                                  _1: /* End_of_format */0
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[<v>@[In this `with' constraint, the new definition of %a@ does not match its original definition@ in the constrained signature:@]@ %a@]"
-                                                        }), longident, param$1._0, report_error$4, param$1._1);
-                                      case /* Repeated_name */6 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "Multiple definition of the ",
-                                                              _1: {
-                                                                TAG: /* String */2,
-                                                                _0: /* No_padding */0,
-                                                                _1: {
-                                                                  TAG: /* String_literal */11,
-                                                                  _0: " name ",
-                                                                  _1: {
-                                                                    TAG: /* String */2,
-                                                                    _0: /* No_padding */0,
-                                                                    _1: {
-                                                                      TAG: /* Char_literal */12,
-                                                                      _0: /* '.' */46,
-                                                                      _1: {
-                                                                        TAG: /* Formatting_lit */17,
-                                                                        _0: {
-                                                                          TAG: /* Break */0,
-                                                                          _0: "@ ",
-                                                                          _1: 1,
-                                                                          _2: 0
-                                                                        },
-                                                                        _1: {
-                                                                          TAG: /* String_literal */11,
-                                                                          _0: "Names must be unique in a given structure or signature.",
-                                                                          _1: {
-                                                                            TAG: /* Formatting_lit */17,
-                                                                            _0: /* Close_box */0,
-                                                                            _1: /* End_of_format */0
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[Multiple definition of the %s name %s.@ Names must be unique in a given structure or signature.@]"
-                                                        }), param$1._0, param$1._1);
-                                      case /* Non_generalizable */7 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "The type of this expression,",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Alpha */15,
-                                                                  _0: {
-                                                                    TAG: /* Char_literal */12,
-                                                                    _0: /* ',' */44,
-                                                                    _1: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: {
-                                                                        TAG: /* Break */0,
-                                                                        _0: "@ ",
-                                                                        _1: 1,
-                                                                        _2: 0
-                                                                      },
-                                                                      _1: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: "contains type variables that cannot be generalized",
-                                                                        _1: {
-                                                                          TAG: /* Formatting_lit */17,
-                                                                          _0: /* Close_box */0,
-                                                                          _1: /* End_of_format */0
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[The type of this expression,@ %a,@ contains type variables that cannot be generalized@]"
-                                                        }), type_scheme, param$1._0);
-                                      case /* Non_generalizable_class */8 :
-                                          const id = param$1._0;
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "The type of this class,",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Alpha */15,
-                                                                  _0: {
-                                                                    TAG: /* Char_literal */12,
-                                                                    _0: /* ',' */44,
-                                                                    _1: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: {
-                                                                        TAG: /* Break */0,
-                                                                        _0: "@ ",
-                                                                        _1: 1,
-                                                                        _2: 0
-                                                                      },
-                                                                      _1: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: "contains type variables that cannot be generalized",
-                                                                        _1: {
-                                                                          TAG: /* Formatting_lit */17,
-                                                                          _0: /* Close_box */0,
-                                                                          _1: /* End_of_format */0
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[The type of this class,@ %a,@ contains type variables that cannot be generalized@]"
-                                                        }), (function (param, param$1) {
-                                                        return class_declaration$1(id, param, param$1);
-                                                      }), param$1._1);
-                                      case /* Non_generalizable_module */9 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "The type of this module,",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Alpha */15,
-                                                                  _0: {
-                                                                    TAG: /* Char_literal */12,
-                                                                    _0: /* ',' */44,
-                                                                    _1: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: {
-                                                                        TAG: /* Break */0,
-                                                                        _0: "@ ",
-                                                                        _1: 1,
-                                                                        _2: 0
-                                                                      },
-                                                                      _1: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: "contains type variables that cannot be generalized",
-                                                                        _1: {
-                                                                          TAG: /* Formatting_lit */17,
-                                                                          _0: /* Close_box */0,
-                                                                          _1: /* End_of_format */0
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[The type of this module,@ %a,@ contains type variables that cannot be generalized@]"
-                                                        }), modtype$1, param$1._0);
-                                      case /* Implementation_is_required */10 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "The interface ",
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: {
-                                                                  TAG: /* Formatting_lit */17,
-                                                                  _0: {
-                                                                    TAG: /* Break */0,
-                                                                    _0: "@ ",
-                                                                    _1: 1,
-                                                                    _2: 0
-                                                                  },
-                                                                  _1: {
-                                                                    TAG: /* String_literal */11,
-                                                                    _0: "declares values, not just types.",
-                                                                    _1: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: {
-                                                                        TAG: /* Break */0,
-                                                                        _0: "@ ",
-                                                                        _1: 1,
-                                                                        _2: 0
-                                                                      },
-                                                                      _1: {
-                                                                        TAG: /* String_literal */11,
-                                                                        _0: "An implementation must be provided.",
-                                                                        _1: {
-                                                                          TAG: /* Formatting_lit */17,
-                                                                          _0: /* Close_box */0,
-                                                                          _1: /* End_of_format */0
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[The interface %a@ declares values, not just types.@ An implementation must be provided.@]"
-                                                        }), print_filename, param$1._0);
-                                      case /* Interface_not_compiled */11 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* Formatting_gen */18,
-                                                            _0: {
-                                                              TAG: /* Open_box */1,
-                                                              _0: {
-                                                                TAG: /* Format */0,
-                                                                _0: /* End_of_format */0,
-                                                                _1: ""
-                                                              }
-                                                            },
-                                                            _1: {
-                                                              TAG: /* String_literal */11,
-                                                              _0: "Could not find the .cmi file for interface",
-                                                              _1: {
-                                                                TAG: /* Formatting_lit */17,
-                                                                _0: {
-                                                                  TAG: /* Break */0,
-                                                                  _0: "@ ",
-                                                                  _1: 1,
-                                                                  _2: 0
-                                                                },
-                                                                _1: {
-                                                                  TAG: /* Alpha */15,
-                                                                  _0: {
-                                                                    TAG: /* Char_literal */12,
-                                                                    _0: /* '.' */46,
-                                                                    _1: {
-                                                                      TAG: /* Formatting_lit */17,
-                                                                      _0: /* Close_box */0,
-                                                                      _1: /* End_of_format */0
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "@[Could not find the .cmi file for interface@ %a.@]"
-                                                        }), print_filename, param$1._0);
-                                      case /* Not_a_packed_module */12 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "This expression is not a packed module. It has type",
-                                                            _1: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: /* End_of_format */0
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "This expression is not a packed module. It has type@ %a"
-                                                        }), type_expr$1, param$1._0);
-                                      case /* Incomplete_packed_module */13 :
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "The type of this packed module contains variables:",
-                                                            _1: {
-                                                              TAG: /* Formatting_lit */17,
-                                                              _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: /* End_of_format */0
-                                                              }
-                                                            }
-                                                          },
-                                                          _1: "The type of this packed module contains variables:@ %a"
-                                                        }), type_expr$1, param$1._0);
-                                      case /* Scoping_pack */14 :
-                                          Curry._2(Stdlib__Format.fprintf(param)({
-                                                    TAG: /* Format */0,
-                                                    _0: {
-                                                      TAG: /* String_literal */11,
-                                                      _0: "The type ",
+              return wrap_printing_env(env, (function (param$2) {
+                      if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
+                        switch (param$1) {
+                          case /* Signature_expected */0 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "This module type is not a signature",
+                                      _1: /* End_of_format */0
+                                    },
+                                    _1: "This module type is not a signature"
+                                  });
+                          case /* Not_allowed_in_functor_body */1 :
+                              return Curry._1(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "This expression creates fresh types.",
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* String */2,
+                                                _0: /* No_padding */0,
+                                                _1: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: /* Close_box */0,
+                                                  _1: /* End_of_format */0
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[This expression creates fresh types.@ %s@]"
+                                      }), "It is not allowed inside applicative functors.");
+                          case /* With_need_typeconstr */2 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "Only type constructors with identical parameters can be substituted.",
+                                      _1: /* End_of_format */0
+                                    },
+                                    _1: "Only type constructors with identical parameters can be substituted."
+                                  });
+                          case /* Recursive_module_require_explicit_type */3 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "Recursive modules require an explicit module type.",
+                                      _1: /* End_of_format */0
+                                    },
+                                    _1: "Recursive modules require an explicit module type."
+                                  });
+                          case /* Apply_generative */4 :
+                              return Stdlib__Format.fprintf(param)({
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* String_literal */11,
+                                      _0: "This is a generative functor. It can only be applied to ()",
+                                      _1: /* End_of_format */0
+                                    },
+                                    _1: "This is a generative functor. It can only be applied to ()"
+                                  });
+                          
+                        }
+                      } else {
+                        switch (param$1.TAG) {
+                          case /* Cannot_apply */0 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "This module is not a functor; it has type",
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* Alpha */15,
+                                                _0: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: /* Close_box */0,
+                                                  _1: /* End_of_format */0
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[This module is not a functor; it has type@ %a@]"
+                                      }), modtype$1, param$1._0);
+                          case /* Not_included */1 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: "<v>",
+                                                _1: /* End_of_format */0
+                                              },
+                                              _1: "<v>"
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "Signature mismatch:",
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* Alpha */15,
+                                                _0: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: /* Close_box */0,
+                                                  _1: /* End_of_format */0
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[<v>Signature mismatch:@ %a@]"
+                                      }), report_error$4, param$1._0);
+                          case /* Cannot_eliminate_dependency */2 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "This functor has type",
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* Alpha */15,
+                                                _0: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: {
+                                                    TAG: /* Break */0,
+                                                    _0: "@ ",
+                                                    _1: 1,
+                                                    _2: 0
+                                                  },
+                                                  _1: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: "The parameter cannot be eliminated in the result type.",
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: {
+                                                        TAG: /* Break */0,
+                                                        _0: "@ ",
+                                                        _1: 1,
+                                                        _2: 0
+                                                      },
                                                       _1: {
-                                                        TAG: /* Alpha */15,
-                                                        _0: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: " in this module cannot be exported.",
+                                                        TAG: /* String_literal */11,
+                                                        _0: " Please bind the argument to a module identifier.",
+                                                        _1: {
+                                                          TAG: /* Formatting_lit */17,
+                                                          _0: /* Close_box */0,
+                                                          _1: /* End_of_format */0
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[This functor has type@ %a@ The parameter cannot be eliminated in the result type.@  Please bind the argument to a module identifier.@]"
+                                      }), modtype$1, param$1._0);
+                          case /* Structure_expected */3 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "This module is not a structure; it has type",
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* Alpha */15,
+                                                _0: /* End_of_format */0
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[This module is not a structure; it has type@ %a"
+                                      }), modtype$1, param$1._0);
+                          case /* With_no_component */4 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "The signature constrained by `with' has no component named ",
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: /* Close_box */0,
+                                                _1: /* End_of_format */0
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[The signature constrained by `with' has no component named %a@]"
+                                      }), longident, param$1._0);
+                          case /* With_mismatch */5 :
+                              return Curry._4(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: {
+                                                TAG: /* String_literal */11,
+                                                _0: "<v>",
+                                                _1: /* End_of_format */0
+                                              },
+                                              _1: "<v>"
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* Formatting_gen */18,
+                                            _0: {
+                                              TAG: /* Open_box */1,
+                                              _0: {
+                                                TAG: /* Format */0,
+                                                _0: /* End_of_format */0,
+                                                _1: ""
+                                              }
+                                            },
+                                            _1: {
+                                              TAG: /* String_literal */11,
+                                              _0: "In this `with' constraint, the new definition of ",
+                                              _1: {
+                                                TAG: /* Alpha */15,
+                                                _0: {
+                                                  TAG: /* Formatting_lit */17,
+                                                  _0: {
+                                                    TAG: /* Break */0,
+                                                    _0: "@ ",
+                                                    _1: 1,
+                                                    _2: 0
+                                                  },
+                                                  _1: {
+                                                    TAG: /* String_literal */11,
+                                                    _0: "does not match its original definition",
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: {
+                                                        TAG: /* Break */0,
+                                                        _0: "@ ",
+                                                        _1: 1,
+                                                        _2: 0
+                                                      },
+                                                      _1: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: "in the constrained signature:",
+                                                        _1: {
+                                                          TAG: /* Formatting_lit */17,
+                                                          _0: /* Close_box */0,
                                                           _1: {
                                                             TAG: /* Formatting_lit */17,
                                                             _0: {
@@ -86666,39 +86269,436 @@ register_error_of_exn(function (err) {
                                                               _1: 1,
                                                               _2: 0
                                                             },
-                                                            _1: /* End_of_format */0
-                                                          }
-                                                        }
-                                                      }
-                                                    },
-                                                    _1: "The type %a in this module cannot be exported.@ "
-                                                  }), longident, param$1._0);
-                                          return Curry._2(Stdlib__Format.fprintf(param)({
-                                                          TAG: /* Format */0,
-                                                          _0: {
-                                                            TAG: /* String_literal */11,
-                                                            _0: "Its type contains local dependencies:",
                                                             _1: {
-                                                              TAG: /* Formatting_lit */17,
+                                                              TAG: /* Alpha */15,
                                                               _0: {
-                                                                TAG: /* Break */0,
-                                                                _0: "@ ",
-                                                                _1: 1,
-                                                                _2: 0
-                                                              },
-                                                              _1: {
-                                                                TAG: /* Alpha */15,
-                                                                _0: /* End_of_format */0
+                                                                TAG: /* Formatting_lit */17,
+                                                                _0: /* Close_box */0,
+                                                                _1: /* End_of_format */0
                                                               }
                                                             }
-                                                          },
-                                                          _1: "Its type contains local dependencies:@ %a"
-                                                        }), type_expr$1, param$1._1);
-                                      
-                                    }
-                                  }
-                                }));
-                  }), err._3);
+                                                          }
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[<v>@[In this `with' constraint, the new definition of %a@ does not match its original definition@ in the constrained signature:@]@ %a@]"
+                                      }), longident, param$1._0, report_error$4, param$1._1);
+                          case /* Repeated_name */6 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "Multiple definition of the ",
+                                            _1: {
+                                              TAG: /* String */2,
+                                              _0: /* No_padding */0,
+                                              _1: {
+                                                TAG: /* String_literal */11,
+                                                _0: " name ",
+                                                _1: {
+                                                  TAG: /* String */2,
+                                                  _0: /* No_padding */0,
+                                                  _1: {
+                                                    TAG: /* Char_literal */12,
+                                                    _0: /* '.' */46,
+                                                    _1: {
+                                                      TAG: /* Formatting_lit */17,
+                                                      _0: {
+                                                        TAG: /* Break */0,
+                                                        _0: "@ ",
+                                                        _1: 1,
+                                                        _2: 0
+                                                      },
+                                                      _1: {
+                                                        TAG: /* String_literal */11,
+                                                        _0: "Names must be unique in a given structure or signature.",
+                                                        _1: {
+                                                          TAG: /* Formatting_lit */17,
+                                                          _0: /* Close_box */0,
+                                                          _1: /* End_of_format */0
+                                                        }
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[Multiple definition of the %s name %s.@ Names must be unique in a given structure or signature.@]"
+                                      }), param$1._0, param$1._1);
+                          case /* Non_generalizable */7 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "The type of this expression,",
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* Alpha */15,
+                                                _0: {
+                                                  TAG: /* Char_literal */12,
+                                                  _0: /* ',' */44,
+                                                  _1: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: {
+                                                      TAG: /* Break */0,
+                                                      _0: "@ ",
+                                                      _1: 1,
+                                                      _2: 0
+                                                    },
+                                                    _1: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: "contains type variables that cannot be generalized",
+                                                      _1: {
+                                                        TAG: /* Formatting_lit */17,
+                                                        _0: /* Close_box */0,
+                                                        _1: /* End_of_format */0
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[The type of this expression,@ %a,@ contains type variables that cannot be generalized@]"
+                                      }), type_scheme, param$1._0);
+                          case /* Non_generalizable_class */8 :
+                              const id = param$1._0;
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "The type of this class,",
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* Alpha */15,
+                                                _0: {
+                                                  TAG: /* Char_literal */12,
+                                                  _0: /* ',' */44,
+                                                  _1: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: {
+                                                      TAG: /* Break */0,
+                                                      _0: "@ ",
+                                                      _1: 1,
+                                                      _2: 0
+                                                    },
+                                                    _1: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: "contains type variables that cannot be generalized",
+                                                      _1: {
+                                                        TAG: /* Formatting_lit */17,
+                                                        _0: /* Close_box */0,
+                                                        _1: /* End_of_format */0
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[The type of this class,@ %a,@ contains type variables that cannot be generalized@]"
+                                      }), (function (param, param$1) {
+                                      return class_declaration$1(id, param, param$1);
+                                    }), param$1._1);
+                          case /* Non_generalizable_module */9 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "The type of this module,",
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* Alpha */15,
+                                                _0: {
+                                                  TAG: /* Char_literal */12,
+                                                  _0: /* ',' */44,
+                                                  _1: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: {
+                                                      TAG: /* Break */0,
+                                                      _0: "@ ",
+                                                      _1: 1,
+                                                      _2: 0
+                                                    },
+                                                    _1: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: "contains type variables that cannot be generalized",
+                                                      _1: {
+                                                        TAG: /* Formatting_lit */17,
+                                                        _0: /* Close_box */0,
+                                                        _1: /* End_of_format */0
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[The type of this module,@ %a,@ contains type variables that cannot be generalized@]"
+                                      }), modtype$1, param$1._0);
+                          case /* Implementation_is_required */10 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "The interface ",
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: {
+                                                  TAG: /* Break */0,
+                                                  _0: "@ ",
+                                                  _1: 1,
+                                                  _2: 0
+                                                },
+                                                _1: {
+                                                  TAG: /* String_literal */11,
+                                                  _0: "declares values, not just types.",
+                                                  _1: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: {
+                                                      TAG: /* Break */0,
+                                                      _0: "@ ",
+                                                      _1: 1,
+                                                      _2: 0
+                                                    },
+                                                    _1: {
+                                                      TAG: /* String_literal */11,
+                                                      _0: "An implementation must be provided.",
+                                                      _1: {
+                                                        TAG: /* Formatting_lit */17,
+                                                        _0: /* Close_box */0,
+                                                        _1: /* End_of_format */0
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[The interface %a@ declares values, not just types.@ An implementation must be provided.@]"
+                                      }), print_filename, param$1._0);
+                          case /* Interface_not_compiled */11 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* Formatting_gen */18,
+                                          _0: {
+                                            TAG: /* Open_box */1,
+                                            _0: {
+                                              TAG: /* Format */0,
+                                              _0: /* End_of_format */0,
+                                              _1: ""
+                                            }
+                                          },
+                                          _1: {
+                                            TAG: /* String_literal */11,
+                                            _0: "Could not find the .cmi file for interface",
+                                            _1: {
+                                              TAG: /* Formatting_lit */17,
+                                              _0: {
+                                                TAG: /* Break */0,
+                                                _0: "@ ",
+                                                _1: 1,
+                                                _2: 0
+                                              },
+                                              _1: {
+                                                TAG: /* Alpha */15,
+                                                _0: {
+                                                  TAG: /* Char_literal */12,
+                                                  _0: /* '.' */46,
+                                                  _1: {
+                                                    TAG: /* Formatting_lit */17,
+                                                    _0: /* Close_box */0,
+                                                    _1: /* End_of_format */0
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "@[Could not find the .cmi file for interface@ %a.@]"
+                                      }), print_filename, param$1._0);
+                          case /* Not_a_packed_module */12 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "This expression is not a packed module. It has type",
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: /* End_of_format */0
+                                            }
+                                          }
+                                        },
+                                        _1: "This expression is not a packed module. It has type@ %a"
+                                      }), type_expr$1, param$1._0);
+                          case /* Incomplete_packed_module */13 :
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The type of this packed module contains variables:",
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: /* End_of_format */0
+                                            }
+                                          }
+                                        },
+                                        _1: "The type of this packed module contains variables:@ %a"
+                                      }), type_expr$1, param$1._0);
+                          case /* Scoping_pack */14 :
+                              Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "The type ",
+                                          _1: {
+                                            TAG: /* Alpha */15,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: " in this module cannot be exported.",
+                                              _1: {
+                                                TAG: /* Formatting_lit */17,
+                                                _0: {
+                                                  TAG: /* Break */0,
+                                                  _0: "@ ",
+                                                  _1: 1,
+                                                  _2: 0
+                                                },
+                                                _1: /* End_of_format */0
+                                              }
+                                            }
+                                          }
+                                        },
+                                        _1: "The type %a in this module cannot be exported.@ "
+                                      }), longident, param$1._0);
+                              return Curry._2(Stdlib__Format.fprintf(param)({
+                                        TAG: /* Format */0,
+                                        _0: {
+                                          TAG: /* String_literal */11,
+                                          _0: "Its type contains local dependencies:",
+                                          _1: {
+                                            TAG: /* Formatting_lit */17,
+                                            _0: {
+                                              TAG: /* Break */0,
+                                              _0: "@ ",
+                                              _1: 1,
+                                              _2: 0
+                                            },
+                                            _1: {
+                                              TAG: /* Alpha */15,
+                                              _0: /* End_of_format */0
+                                            }
+                                          }
+                                        },
+                                        _1: "Its type contains local dependencies:@ %a"
+                                      }), type_expr$1, param$1._1);
+                          
+                        }
+                      }
+                    }));
+            }), err._3);
     });
 
 const suites = {
@@ -86716,10 +86716,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/of_string_test.js b/jscomp/test/dist/jscomp/test/of_string_test.js
index b9ea49fe7..09ccfd912 100644
--- a/jscomp/test/dist/jscomp/test/of_string_test.js
+++ b/jscomp/test/dist/jscomp/test/of_string_test.js
@@ -8,10 +8,10 @@ const suites_0 = [
   "string_of_float_1",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: "10.",
-              _1: Stdlib.string_of_float(10)
-            };
+        TAG: /* Eq */0,
+        _0: "10.",
+        _1: Stdlib.string_of_float(10)
+      };
     })
 ];
 
@@ -20,10 +20,10 @@ const suites_1 = {
     "string_of_int",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: "10",
-                _1: String(10)
-              };
+          TAG: /* Eq */0,
+          _0: "10",
+          _1: String(10)
+        };
       })
   ],
   tl: {
@@ -31,10 +31,10 @@ const suites_1 = {
       "valid_float_lexem",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: "10.",
-                  _1: Stdlib.valid_float_lexem("10")
-                };
+            TAG: /* Eq */0,
+            _0: "10.",
+            _1: Stdlib.valid_float_lexem("10")
+          };
         })
     ],
     tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/offset.js b/jscomp/test/dist/jscomp/test/offset.js
index 9a389e257..70963b9c6 100644
--- a/jscomp/test/dist/jscomp/test/offset.js
+++ b/jscomp/test/dist/jscomp/test/offset.js
@@ -28,12 +28,12 @@ function create(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r.h;
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, v, r) {
@@ -44,9 +44,9 @@ function bal(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const lr = l.r;
     const lv = l.v;
@@ -58,24 +58,24 @@ function bal(l, v, r) {
       return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   const rr = r.r;
   const rv = r.v;
@@ -87,20 +87,20 @@ function bal(l, v, r) {
     return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Set.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Set.bal"
+      });
 }
 
 function add(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = t.r;
   const v = t.v;
@@ -127,12 +127,12 @@ function add(x, t) {
 
 function singleton(x) {
   return {
-          TAG: /* Node */0,
-          l: /* Empty */0,
-          v: x,
-          r: /* Empty */0,
-          h: 1
-        };
+    TAG: /* Node */0,
+    l: /* Empty */0,
+    v: x,
+    r: /* Empty */0,
+    h: 1
+  };
 }
 
 function add_min_element(x, param) {
@@ -174,8 +174,8 @@ function min_elt(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -206,8 +206,8 @@ function max_elt(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
@@ -236,9 +236,9 @@ function max_elt_opt(_param) {
 function remove_min_elt(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.remove_min_elt"
+        });
   }
   const l = param.l;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -261,10 +261,10 @@ function concat(t1, t2) {
 function split(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            false,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      false,
+      /* Empty */0
+    ];
   }
   const r = param.r;
   const v = param.v;
@@ -272,25 +272,25 @@ function split(x, param) {
   const c = Curry._2(funarg.compare, x, v);
   if (c === 0) {
     return [
-            l,
-            true,
-            r
-          ];
+      l,
+      true,
+      r
+    ];
   }
   if (c < 0) {
     const match = split(x, l);
     return [
-            match[0],
-            match[1],
-            join(match[2], v, r)
-          ];
+      match[0],
+      match[1],
+      join(match[2], v, r)
+    ];
   }
   const 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) {
@@ -396,12 +396,12 @@ function inter(s1, s2) {
 function split_bis(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return {
-            TAG: /* NotFound */0,
-            _0: /* Empty */0,
-            _1: (function (param) {
-                return /* Empty */0;
-              })
-          };
+      TAG: /* NotFound */0,
+      _0: /* Empty */0,
+      _1: (function (param) {
+          return /* Empty */0;
+        })
+    };
   }
   const r = param.r;
   const v = param.v;
@@ -417,22 +417,22 @@ function split_bis(x, param) {
     }
     const rl = match._1;
     return {
-            TAG: /* NotFound */0,
-            _0: match._0,
-            _1: (function (param) {
-                return join(Curry._1(rl, undefined), v, r);
-              })
-          };
+      TAG: /* NotFound */0,
+      _0: match._0,
+      _1: (function (param) {
+          return join(Curry._1(rl, undefined), v, r);
+        })
+    };
   }
   const match$1 = split_bis(x, r);
   if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
     return /* Found */0;
   } else {
     return {
-            TAG: /* NotFound */0,
-            _0: join(l, v, match$1._0),
-            _1: match$1._1
-          };
+      TAG: /* NotFound */0,
+      _0: join(l, v, match$1._0),
+      _1: match$1._1
+    };
   }
 }
 
@@ -664,9 +664,9 @@ function filter(p, t) {
 function partition(p, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      /* Empty */0
+    ];
   }
   const v = param.v;
   const match = partition(p, param.l);
@@ -678,14 +678,14 @@ function partition(p, param) {
   const 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)
+    ];
   }
 }
 
@@ -722,8 +722,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     const c = Curry._2(funarg.compare, x, v);
@@ -740,8 +740,8 @@ function find_first(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -804,8 +804,8 @@ function find_last(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -959,21 +959,21 @@ function of_list(l) {
         switch (n) {
           case 0 :
               return [
-                      /* Empty */0,
-                      l
-                    ];
+                /* Empty */0,
+                l
+              ];
           case 1 :
               if (l) {
                 return [
-                        {
-                          TAG: /* Node */0,
-                          l: /* Empty */0,
-                          v: l.hd,
-                          r: /* Empty */0,
-                          h: 1
-                        },
-                        l.tl
-                      ];
+                  {
+                    TAG: /* Node */0,
+                    l: /* Empty */0,
+                    v: l.hd,
+                    r: /* Empty */0,
+                    h: 1
+                  },
+                  l.tl
+                ];
               }
               break;
           case 2 :
@@ -981,21 +981,21 @@ function of_list(l) {
                 const match = l.tl;
                 if (match) {
                   return [
-                          {
-                            TAG: /* Node */0,
-                            l: {
-                              TAG: /* Node */0,
-                              l: /* Empty */0,
-                              v: l.hd,
-                              r: /* Empty */0,
-                              h: 1
-                            },
-                            v: match.hd,
-                            r: /* Empty */0,
-                            h: 2
-                          },
-                          match.tl
-                        ];
+                    {
+                      TAG: /* Node */0,
+                      l: {
+                        TAG: /* Node */0,
+                        l: /* Empty */0,
+                        v: l.hd,
+                        r: /* Empty */0,
+                        h: 1
+                      },
+                      v: match.hd,
+                      r: /* Empty */0,
+                      h: 2
+                    },
+                    match.tl
+                  ];
                 }
                 
               }
@@ -1007,27 +1007,27 @@ function of_list(l) {
                   const match$2 = match$1.tl;
                   if (match$2) {
                     return [
-                            {
-                              TAG: /* Node */0,
-                              l: {
-                                TAG: /* Node */0,
-                                l: /* Empty */0,
-                                v: l.hd,
-                                r: /* Empty */0,
-                                h: 1
-                              },
-                              v: match$1.hd,
-                              r: {
-                                TAG: /* Node */0,
-                                l: /* Empty */0,
-                                v: match$2.hd,
-                                r: /* Empty */0,
-                                h: 1
-                              },
-                              h: 2
-                            },
-                            match$2.tl
-                          ];
+                      {
+                        TAG: /* Node */0,
+                        l: {
+                          TAG: /* Node */0,
+                          l: /* Empty */0,
+                          v: l.hd,
+                          r: /* Empty */0,
+                          h: 1
+                        },
+                        v: match$1.hd,
+                        r: {
+                          TAG: /* Node */0,
+                          l: /* Empty */0,
+                          v: match$2.hd,
+                          r: /* Empty */0,
+                          h: 1
+                        },
+                        h: 2
+                      },
+                      match$2.tl
+                    ];
                   }
                   
                 }
@@ -1043,18 +1043,18 @@ function of_list(l) {
         if (l$1) {
           const 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 new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/stdlib/set.ml",
-                    571,
-                    18
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/stdlib/set.ml",
+                571,
+                18
+              ]
+            });
       };
       return sub(Stdlib__List.length(l$1), l$1)[0];
     } else {
@@ -1067,8 +1067,8 @@ function of_list(l) {
 
 function add_seq(i, m) {
   return Stdlib__Seq.fold_left((function (s, x) {
-                return add(x, s);
-              }), m, i);
+          return add(x, s);
+        }), m, i);
 }
 
 function of_seq(i) {
@@ -1081,12 +1081,12 @@ function seq_of_enum_(c, param) {
   }
   const partial_arg = cons_enum(c._1, c._2);
   return {
-          TAG: /* Cons */0,
-          _0: c._0,
-          _1: (function (param) {
-              return seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: c._0,
+    _1: (function (param) {
+        return seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_seq(c) {
@@ -1120,12 +1120,12 @@ function rev_seq_of_enum_(c, param) {
   }
   const partial_arg = snoc_enum(c._1, c._2);
   return {
-          TAG: /* Cons */0,
-          _0: c._0,
-          _1: (function (param) {
-              return rev_seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: c._0,
+    _1: (function (param) {
+        return rev_seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_rev_seq(c) {
@@ -1148,11 +1148,11 @@ function to_seq_from(low, s) {
       const n = Curry._2(funarg.compare, v, low);
       if (n === 0) {
         return {
-                TAG: /* More */0,
-                _0: v,
-                _1: r,
-                _2: c
-              };
+          TAG: /* More */0,
+          _0: v,
+          _1: r,
+          _2: c
+        };
       }
       if (n < 0) {
         _s = r;
diff --git a/jscomp/test/dist/jscomp/test/oo_js_test_date.js b/jscomp/test/dist/jscomp/test/oo_js_test_date.js
index 988347c9b..bebda81a9 100644
--- a/jscomp/test/dist/jscomp/test/oo_js_test_date.js
+++ b/jscomp/test/dist/jscomp/test/oo_js_test_date.js
@@ -18,10 +18,10 @@ const suites_0 = [
   "getMonth",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: 2,
-              _1: d.getMonth()
-            };
+        TAG: /* Eq */0,
+        _0: 2,
+        _1: d.getMonth()
+      };
     })
 ];
 
@@ -30,18 +30,18 @@ const suites_1 = {
     "getYear",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: [
-                  2016,
-                  2,
-                  1
-                ],
-                _1: [
-                  d3.getFullYear(),
-                  d3.getMonth(),
-                  d3.getDate()
-                ]
-              };
+          TAG: /* Eq */0,
+          _0: [
+            2016,
+            2,
+            1
+          ],
+          _1: [
+            d3.getFullYear(),
+            d3.getMonth(),
+            d3.getDate()
+          ]
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/opr_3576_test.js b/jscomp/test/dist/jscomp/test/opr_3576_test.js
index 886b65d32..7b3c6380d 100644
--- a/jscomp/test/dist/jscomp/test/opr_3576_test.js
+++ b/jscomp/test/dist/jscomp/test/opr_3576_test.js
@@ -81,9 +81,9 @@ function a_init($$class) {
               object_tables.key = env_init;
             }
             return Curry._1(object_tables.key, [
-                        m1,
-                        self$1
-                      ]);
+                  m1,
+                  self$1
+                ]);
           })
       ]);
   return function (env, self) {
diff --git a/jscomp/test/dist/jscomp/test/opr_4560_test.js b/jscomp/test/dist/jscomp/test/opr_4560_test.js
index 83e414eab..6e050b457 100644
--- a/jscomp/test/dist/jscomp/test/opr_4560_test.js
+++ b/jscomp/test/dist/jscomp/test/opr_4560_test.js
@@ -71,9 +71,9 @@ function c1_init($$class) {
                         object_tables$1.key = env_init;
                       }
                       return Curry._1(object_tables$1.key, [
-                                  env$1[0],
-                                  env$1[1]
-                                ]);
+                            env$1[0],
+                            env$1[1]
+                          ]);
                     }),
                   h,
                   (function (self$2) {
@@ -89,9 +89,9 @@ function c1_init($$class) {
             object_tables.key = env_init;
           }
           return Curry._1(object_tables.key, [
-                      b,
-                      self$1
-                    ]);
+                b,
+                self$1
+              ]);
         }));
   return function (env, self) {
     return CamlinternalOO.create_object_opt(self, $$class);
diff --git a/jscomp/test/dist/jscomp/test/option_repr_test.js b/jscomp/test/dist/jscomp/test/option_repr_test.js
index 010faf4cd..170d1dd84 100644
--- a/jscomp/test/dist/jscomp/test/option_repr_test.js
+++ b/jscomp/test/dist/jscomp/test/option_repr_test.js
@@ -114,15 +114,15 @@ const length_10_id = Belt__Belt_List.makeBy(10, (function (x) {
 
 function f13$1(param) {
   return Caml_obj.caml_equal(Belt__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 \"jscomp/test/option_repr_test.ml\", line 94, characters 4-11", Caml_obj.caml_lessthan(undefined, null));
@@ -171,8 +171,8 @@ function neqx(a, b) {
 
 function all_true(xs) {
   return Belt__Belt_List.every(xs, (function (x) {
-                return x;
-              }));
+          return x;
+        }));
 }
 
 const xs_0 = gtx(Caml_option.some(null), Caml_option.some(undefined));
diff --git a/jscomp/test/dist/jscomp/test/optional_ffi_test.js b/jscomp/test/dist/jscomp/test/optional_ffi_test.js
index a0b3c85cc..a1b415d40 100644
--- a/jscomp/test/dist/jscomp/test/optional_ffi_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/parser_api.js b/jscomp/test/dist/jscomp/test/parser_api.js
index e54914123..050d72022 100644
--- a/jscomp/test/dist/jscomp/test/parser_api.js
+++ b/jscomp/test/dist/jscomp/test/parser_api.js
@@ -594,9 +594,9 @@ function std_include_dir(param) {
     return /* [] */0;
   } else {
     return {
-            hd: standard_library,
-            tl: /* [] */0
-          };
+      hd: standard_library,
+      tl: /* [] */0
+    };
   }
 }
 
@@ -780,8 +780,8 @@ function fatal_error(msg) {
   Stdlib.prerr_string(">> Fatal error: ");
   console.error(msg);
   throw new Caml_js_exceptions.MelangeError(Fatal_error, {
-            MEL_EXN_ID: Fatal_error
-          });
+        MEL_EXN_ID: Fatal_error
+      });
 }
 
 function try_finally(work, cleanup) {
@@ -800,9 +800,9 @@ function try_finally(work, cleanup) {
 function map_end(f, l1, l2) {
   if (l1) {
     return {
-            hd: Curry._1(f, l1.hd),
-            tl: map_end(f, l1.tl, l2)
-          };
+      hd: Curry._1(f, l1.hd),
+      tl: map_end(f, l1.tl, l2)
+    };
   } else {
     return l2;
   }
@@ -814,9 +814,9 @@ function map_left_right(f, param) {
   }
   const res = Curry._1(f, param.hd);
   return {
-          hd: res,
-          tl: map_left_right(f, param.tl)
-        };
+    hd: res,
+    tl: map_left_right(f, param.tl)
+  };
 }
 
 function for_all2(pred, _l1, _l2) {
@@ -847,9 +847,9 @@ function replicate_list(elem, n) {
     return /* [] */0;
   } else {
     return {
-            hd: elem,
-            tl: replicate_list(elem, n - 1 | 0)
-          };
+      hd: elem,
+      tl: replicate_list(elem, n - 1 | 0)
+    };
   }
 }
 
@@ -863,9 +863,9 @@ function list_remove(x, param) {
     return tl;
   } else {
     return {
-            hd: hd,
-            tl: list_remove(x, tl)
-          };
+      hd: hd,
+      tl: list_remove(x, tl)
+    };
   }
 }
 
@@ -874,27 +874,27 @@ function split_last(param) {
     const x = param.hd;
     if (!param.tl) {
       return [
-              /* [] */0,
-              x
-            ];
+        /* [] */0,
+        x
+      ];
     }
     const match = split_last(param.tl);
     return [
-            {
-              hd: x,
-              tl: match[0]
-            },
-            match[1]
-          ];
+      {
+        hd: x,
+        tl: match[0]
+      },
+      match[1]
+    ];
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "misc.ml",
-              54,
-              10
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "misc.ml",
+          54,
+          10
+        ]
+      });
 }
 
 function samelist(pred, _l1, _l2) {
@@ -948,16 +948,16 @@ function find_in_path(path, name) {
         continue ;
       }
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     };
   }
   if (Caml_external_polyfill.resolve("caml_sys_file_exists")(name)) {
     return name;
   }
   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-            MEL_EXN_ID: Stdlib.Not_found
-          });
+        MEL_EXN_ID: Stdlib.Not_found
+      });
 }
 
 function find_in_path_rel(path, name) {
@@ -988,8 +988,8 @@ function find_in_path_rel(path, name) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   };
 }
 
@@ -1012,8 +1012,8 @@ function find_in_path_uncap(path, name) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   };
 }
 
@@ -1071,8 +1071,8 @@ function copy_file_chunk(ic, oc, len) {
     const r = Stdlib.input(ic, buff, 0, n < 4096 ? n : 4096);
     if (r === 0) {
       throw new Caml_js_exceptions.MelangeError(Stdlib.End_of_file, {
-                MEL_EXN_ID: Stdlib.End_of_file
-              });
+            MEL_EXN_ID: Stdlib.End_of_file
+          });
     }
     Stdlib.output(oc, buff, 0, r);
     _n = n - r | 0;
@@ -1172,8 +1172,8 @@ function search_substring(pat, str, start) {
     }
     if ((i + j | 0) >= str.length) {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     if (Caml_string.get(str, i + j | 0) === Caml_string.get(pat, j)) {
       _j = j + 1 | 0;
@@ -1199,9 +1199,9 @@ function replace_substring(before, after, str) {
         if (exn.MEL_EXN_ID === Stdlib.Not_found) {
           const suffix = Stdlib__String.sub(str, curr, str.length - curr | 0);
           return Stdlib__List.rev({
-                      hd: suffix,
-                      tl: acc
-                    });
+                hd: suffix,
+                tl: acc
+              });
         }
         throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
       }
@@ -1244,9 +1244,9 @@ function rev_split_words(s) {
       const j = _j;
       if (j >= s.length) {
         return {
-                hd: Stdlib__String.sub(s, i, j - i | 0),
-                tl: res
-              };
+          hd: Stdlib__String.sub(s, i, j - i | 0),
+          tl: res
+        };
       }
       const match = Caml_string.get(s, j);
       if (match > 13 || match < 9) {
@@ -1260,9 +1260,9 @@ function rev_split_words(s) {
         continue ;
       }
       return split1({
-                  hd: Stdlib__String.sub(s, i, j - i | 0),
-                  tl: res
-                }, j + 1 | 0);
+            hd: Stdlib__String.sub(s, i, j - i | 0),
+            tl: res
+          }, j + 1 | 0);
     };
   };
   return split1(/* [] */0, 0);
@@ -1402,9 +1402,9 @@ function split(s, c) {
     const pos = _pos;
     if (pos === len) {
       return Stdlib__List.rev({
-                  hd: "",
-                  tl: to_rev
-                });
+            hd: "",
+            tl: to_rev
+          });
     }
     let pos2;
     try {
@@ -1420,9 +1420,9 @@ function split(s, c) {
     }
     if (pos2 === undefined) {
       return Stdlib__List.rev({
-                  hd: Stdlib__String.sub(s, pos, len - pos | 0),
-                  tl: to_rev
-                });
+            hd: Stdlib__String.sub(s, pos, len - pos | 0),
+            tl: to_rev
+          });
     }
     if (pos2 === pos) {
       _to_rev = {
@@ -1444,9 +1444,9 @@ function split(s, c) {
 function cut_at(s, c) {
   const pos = Stdlib__String.index(s, c);
   return [
-          Stdlib__String.sub(s, 0, pos),
-          Stdlib__String.sub(s, pos + 1 | 0, (s.length - pos | 0) - 1 | 0)
-        ];
+    Stdlib__String.sub(s, 0, pos),
+    Stdlib__String.sub(s, pos + 1 | 0, (s.length - pos | 0) - 1 | 0)
+  ];
 }
 
 function ansi_of_color(param) {
@@ -1541,48 +1541,48 @@ function style_of_tag(s) {
     switch (s._1) {
       case "dim" :
           return {
-                  hd: /* Dim */2,
-                  tl: /* [] */0
-                };
+            hd: /* Dim */2,
+            tl: /* [] */0
+          };
       case "error" :
           return cur_styles.contents.error;
       case "filename" :
           return {
-                  hd: {
-                    TAG: /* FG */0,
-                    _0: /* Cyan */6
-                  },
-                  tl: /* [] */0
-                };
+            hd: {
+              TAG: /* FG */0,
+              _0: /* Cyan */6
+            },
+            tl: /* [] */0
+          };
       case "info" :
           return {
-                  hd: /* Bold */0,
-                  tl: {
-                    hd: {
-                      TAG: /* FG */0,
-                      _0: /* Yellow */3
-                    },
-                    tl: /* [] */0
-                  }
-                };
+            hd: /* Bold */0,
+            tl: {
+              hd: {
+                TAG: /* FG */0,
+                _0: /* Yellow */3
+              },
+              tl: /* [] */0
+            }
+          };
       case "loc" :
           return cur_styles.contents.loc;
       case "warning" :
           return cur_styles.contents.warning;
       default:
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
     }
   } else {
     throw new Caml_js_exceptions.MelangeError("Match_failure", {
-              MEL_EXN_ID: "Match_failure",
-              _1: [
-                "misc.ml",
-                428,
-                19
-              ]
-            });
+          MEL_EXN_ID: "Match_failure",
+          _1: [
+            "misc.ml",
+            428,
+            19
+          ]
+        });
   }
 }
 
@@ -1616,9 +1616,9 @@ function set_color_tag_handling(ppf) {
       style_of_tag(param);
       if (color_enabled.contents) {
         return ansi_of_style_l({
-                    hd: /* Reset */1,
-                    tl: /* [] */0
-                  });
+              hd: /* Reset */1,
+              tl: /* [] */0
+            });
       } else {
         return "";
       }
@@ -1868,9 +1868,9 @@ function loop(i) {
     return /* [] */0;
   } else {
     return {
-            hd: i,
-            tl: loop(i - 1 | 0)
-          };
+      hd: i,
+      tl: loop(i - 1 | 0)
+    };
   }
 }
 
@@ -1882,91 +1882,91 @@ function letter(param) {
         return letter_all;
     case 99 :
         return {
-                hd: 1,
-                tl: {
-                  hd: 2,
-                  tl: /* [] */0
-                }
-              };
+          hd: 1,
+          tl: {
+            hd: 2,
+            tl: /* [] */0
+          }
+        };
     case 100 :
         return {
-                hd: 3,
-                tl: /* [] */0
-              };
+          hd: 3,
+          tl: /* [] */0
+        };
     case 101 :
         return {
-                hd: 4,
-                tl: /* [] */0
-              };
+          hd: 4,
+          tl: /* [] */0
+        };
     case 102 :
         return {
-                hd: 5,
-                tl: /* [] */0
-              };
+          hd: 5,
+          tl: /* [] */0
+        };
     case 107 :
         return {
-                hd: 32,
+          hd: 32,
+          tl: {
+            hd: 33,
+            tl: {
+              hd: 34,
+              tl: {
+                hd: 35,
                 tl: {
-                  hd: 33,
+                  hd: 36,
                   tl: {
-                    hd: 34,
+                    hd: 37,
                     tl: {
-                      hd: 35,
+                      hd: 38,
                       tl: {
-                        hd: 36,
-                        tl: {
-                          hd: 37,
-                          tl: {
-                            hd: 38,
-                            tl: {
-                              hd: 39,
-                              tl: /* [] */0
-                            }
-                          }
-                        }
+                        hd: 39,
+                        tl: /* [] */0
                       }
                     }
                   }
                 }
-              };
+              }
+            }
+          }
+        };
     case 108 :
         return {
-                hd: 6,
-                tl: /* [] */0
-              };
+          hd: 6,
+          tl: /* [] */0
+        };
     case 109 :
         return {
-                hd: 7,
-                tl: /* [] */0
-              };
+          hd: 7,
+          tl: /* [] */0
+        };
     case 112 :
         return {
-                hd: 8,
-                tl: /* [] */0
-              };
+          hd: 8,
+          tl: /* [] */0
+        };
     case 114 :
         return {
-                hd: 9,
-                tl: /* [] */0
-              };
+          hd: 9,
+          tl: /* [] */0
+        };
     case 115 :
         return {
-                hd: 10,
-                tl: /* [] */0
-              };
+          hd: 10,
+          tl: /* [] */0
+        };
     case 117 :
         return {
-                hd: 11,
-                tl: {
-                  hd: 12,
-                  tl: /* [] */0
-                }
-              };
+          hd: 11,
+          tl: {
+            hd: 12,
+            tl: /* [] */0
+          }
+        };
     case 118 :
         return {
-                hd: 13,
-                tl: /* [] */0
-              };
+          hd: 13,
+          tl: /* [] */0
+        };
     case 98 :
     case 103 :
     case 104 :
@@ -1980,35 +1980,32 @@ function letter(param) {
         return /* [] */0;
     case 120 :
         return {
-                hd: 14,
+          hd: 14,
+          tl: {
+            hd: 15,
+            tl: {
+              hd: 16,
+              tl: {
+                hd: 17,
                 tl: {
-                  hd: 15,
+                  hd: 18,
                   tl: {
-                    hd: 16,
+                    hd: 19,
                     tl: {
-                      hd: 17,
+                      hd: 20,
                       tl: {
-                        hd: 18,
+                        hd: 21,
                         tl: {
-                          hd: 19,
+                          hd: 22,
                           tl: {
-                            hd: 20,
+                            hd: 23,
                             tl: {
-                              hd: 21,
+                              hd: 24,
                               tl: {
-                                hd: 22,
+                                hd: 25,
                                 tl: {
-                                  hd: 23,
-                                  tl: {
-                                    hd: 24,
-                                    tl: {
-                                      hd: 25,
-                                      tl: {
-                                        hd: 30,
-                                        tl: /* [] */0
-                                      }
-                                    }
-                                  }
+                                  hd: 30,
+                                  tl: /* [] */0
                                 }
                               }
                             }
@@ -2018,26 +2015,29 @@ function letter(param) {
                     }
                   }
                 }
-              };
+              }
+            }
+          }
+        };
     case 121 :
         return {
-                hd: 26,
-                tl: /* [] */0
-              };
+          hd: 26,
+          tl: /* [] */0
+        };
     case 122 :
         return {
-                hd: 27,
-                tl: /* [] */0
-              };
+          hd: 27,
+          tl: /* [] */0
+        };
     default:
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "warnings.ml",
-                  176,
-                  9
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "warnings.ml",
+              176,
+              9
+            ]
+          });
   }
 }
 
@@ -2081,16 +2081,16 @@ function parse_opt(error, active, flags, s) {
       const n = _n;
       if (i >= s.length) {
         return [
-                i,
-                n
-              ];
+          i,
+          n
+        ];
       }
       const match = Caml_string.get(s, i);
       if (match > 57 || match < 48) {
         return [
-                i,
-                n
-              ];
+          i,
+          n
+        ];
       }
       _i = i + 1 | 0;
       _n = (Math.imul(10, n) + Caml_string.get(s, i) | 0) - /* '0' */48 | 0;
@@ -2103,24 +2103,24 @@ function parse_opt(error, active, flags, s) {
     const i$1 = match[0];
     if (!((i$1 + 2 | 0) < s.length && Caml_string.get(s, i$1) === /* '.' */46 && Caml_string.get(s, i$1 + 1 | 0) === /* '.' */46)) {
       return [
-              i$1,
-              n1,
-              n1
-            ];
+        i$1,
+        n1,
+        n1
+      ];
     }
     const match$1 = get_num(0, i$1 + 2 | 0);
     const n2 = match$1[1];
     if (n2 < n1) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                MEL_EXN_ID: Stdlib__Arg.Bad,
-                _1: "Ill-formed list of warnings"
-              });
+            MEL_EXN_ID: Stdlib__Arg.Bad,
+            _1: "Ill-formed list of warnings"
+          });
     }
     return [
-            match$1[0],
-            n1,
-            n2
-          ];
+      match$1[0],
+      n1,
+      n2
+    ];
   };
   const loop = function (_i) {
     while(true) {
@@ -2133,9 +2133,9 @@ function parse_opt(error, active, flags, s) {
         if (c >= 97) {
           if (c >= 123) {
             throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                      MEL_EXN_ID: Stdlib__Arg.Bad,
-                      _1: "Ill-formed list of warnings"
-                    });
+                  MEL_EXN_ID: Stdlib__Arg.Bad,
+                  _1: "Ill-formed list of warnings"
+                });
           }
           Stdlib__List.iter(clear, letter(Caml_string.get(s, i)));
           _i = i + 1 | 0;
@@ -2143,9 +2143,9 @@ function parse_opt(error, active, flags, s) {
         }
         if (c >= 91) {
           throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                    MEL_EXN_ID: Stdlib__Arg.Bad,
-                    _1: "Ill-formed list of warnings"
-                  });
+                MEL_EXN_ID: Stdlib__Arg.Bad,
+                _1: "Ill-formed list of warnings"
+              });
         }
         Stdlib__List.iter(set, letter(Stdlib__Char.lowercase_ascii(Caml_string.get(s, i))));
         _i = i + 1 | 0;
@@ -2156,9 +2156,9 @@ function parse_opt(error, active, flags, s) {
           return loop_letter_num(set_all, i + 1 | 0);
         }
         throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                  MEL_EXN_ID: Stdlib__Arg.Bad,
-                  _1: "Ill-formed list of warnings"
-                });
+              MEL_EXN_ID: Stdlib__Arg.Bad,
+              _1: "Ill-formed list of warnings"
+            });
       }
       if (c >= 43) {
         switch (c) {
@@ -2166,54 +2166,54 @@ function parse_opt(error, active, flags, s) {
               return loop_letter_num(set, i + 1 | 0);
           case 44 :
               throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                        MEL_EXN_ID: Stdlib__Arg.Bad,
-                        _1: "Ill-formed list of warnings"
-                      });
+                    MEL_EXN_ID: Stdlib__Arg.Bad,
+                    _1: "Ill-formed list of warnings"
+                  });
           case 45 :
               return loop_letter_num(clear, i + 1 | 0);
           
         }
       } else {
         throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                  MEL_EXN_ID: Stdlib__Arg.Bad,
-                  _1: "Ill-formed list of warnings"
-                });
+              MEL_EXN_ID: Stdlib__Arg.Bad,
+              _1: "Ill-formed list of warnings"
+            });
       }
     };
   };
   const loop_letter_num = function (myset, i) {
     if (i >= s.length) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                MEL_EXN_ID: Stdlib__Arg.Bad,
-                _1: "Ill-formed list of warnings"
-              });
+            MEL_EXN_ID: Stdlib__Arg.Bad,
+            _1: "Ill-formed list of warnings"
+          });
     }
     const match = Caml_string.get(s, i);
     if (match >= 65) {
       if (match >= 97) {
         if (match >= 123) {
           throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                    MEL_EXN_ID: Stdlib__Arg.Bad,
-                    _1: "Ill-formed list of warnings"
-                  });
+                MEL_EXN_ID: Stdlib__Arg.Bad,
+                _1: "Ill-formed list of warnings"
+              });
         }
         Stdlib__List.iter(myset, letter(Caml_string.get(s, i)));
         return loop(i + 1 | 0);
       }
       if (match >= 91) {
         throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                  MEL_EXN_ID: Stdlib__Arg.Bad,
-                  _1: "Ill-formed list of warnings"
-                });
+              MEL_EXN_ID: Stdlib__Arg.Bad,
+              _1: "Ill-formed list of warnings"
+            });
       }
       Stdlib__List.iter(myset, letter(Stdlib__Char.lowercase_ascii(Caml_string.get(s, i))));
       return loop(i + 1 | 0);
     }
     if (match > 57 || match < 48) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Arg.Bad, {
-                MEL_EXN_ID: Stdlib__Arg.Bad,
-                _1: "Ill-formed list of warnings"
-              });
+            MEL_EXN_ID: Stdlib__Arg.Bad,
+            _1: "Ill-formed list of warnings"
+          });
     }
     const match$1 = get_range(i);
     for (let n = match$1[1] ,n_finish = Caml.caml_int_min(match$1[2], 104); n <= n_finish; ++n) {
@@ -2298,27 +2298,27 @@ function message(s) {
             const lab = match.hd;
             if (match.tl) {
               return Stdlib__String.concat(" ", {
-                          hd: "the following methods are overridden by the class",
-                          tl: {
-                            hd: lab,
-                            tl: {
-                              hd: ":\n ",
-                              tl: match.tl
-                            }
-                          }
-                        });
+                    hd: "the following methods are overridden by the class",
+                    tl: {
+                      hd: lab,
+                      tl: {
+                        hd: ":\n ",
+                        tl: match.tl
+                      }
+                    }
+                  });
             } else {
               return "the method " + (lab + " is overridden.");
             }
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "warnings.ml",
-                      283,
-                      26
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "warnings.ml",
+                  283,
+                  26
+                ]
+              });
       case /* Partial_match */3 :
           const s$2 = s._0;
           if (s$2 === "") {
@@ -2334,31 +2334,31 @@ function message(s) {
             const lab$1 = match$1.hd;
             if (match$1.tl) {
               return Stdlib__String.concat(" ", {
-                          hd: "the following instance variables are overridden by the class",
-                          tl: {
-                            hd: lab$1,
-                            tl: {
-                              hd: ":\n ",
-                              tl: match$1.tl
-                            }
-                          }
-                        }) + "\nThe behaviour changed in ocaml 3.10 (previous behaviour was hiding.)";
+                    hd: "the following instance variables are overridden by the class",
+                    tl: {
+                      hd: lab$1,
+                      tl: {
+                        hd: ":\n ",
+                        tl: match$1.tl
+                      }
+                    }
+                  }) + "\nThe behaviour changed in ocaml 3.10 (previous behaviour was hiding.)";
             } else {
               return "the instance variable " + (lab$1 + " is overridden.\nThe behaviour changed in ocaml 3.10 (previous behaviour was hiding.)");
             }
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "warnings.ml",
-                      303,
-                      37
-                    ]
-                  });
-      case /* Implicit_public_methods */6 :
-          return "the following private methods were made public implicitly:\n " + (Stdlib__String.concat(" ", s._0) + ".");
-      case /* Undeclared_virtual_method */7 :
-          return "the virtual method " + (s._0 + " is not declared.");
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "warnings.ml",
+                  303,
+                  37
+                ]
+              });
+      case /* Implicit_public_methods */6 :
+          return "the following private methods were made public implicitly:\n " + (Stdlib__String.concat(" ", s._0) + ".");
+      case /* Undeclared_virtual_method */7 :
+          return "the virtual method " + (s._0 + " is not declared.");
       case /* Not_principal */8 :
           return s._0 + " is not principal.";
       case /* Without_principality */9 :
@@ -2372,76 +2372,76 @@ function message(s) {
           return "unused variable " + (s._0 + ".");
       case /* Duplicate_definitions */14 :
           return Curry._4(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "the ",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "the ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                              TAG: /* String_literal */11,
+                              _0: " is defined in both types ",
                               _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
                                 _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
+                                  TAG: /* String_literal */11,
+                                  _0: " and ",
                                   _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " is defined in both types ",
+                                    TAG: /* String */2,
+                                    _0: /* No_padding */0,
                                     _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: {
-                                        TAG: /* String_literal */11,
-                                        _0: " and ",
-                                        _1: {
-                                          TAG: /* String */2,
-                                          _0: /* No_padding */0,
-                                          _1: {
-                                            TAG: /* Char_literal */12,
-                                            _0: /* '.' */46,
-                                            _1: /* End_of_format */0
-                                          }
-                                        }
-                                      }
+                                      TAG: /* Char_literal */12,
+                                      _0: /* '.' */46,
+                                      _1: /* End_of_format */0
                                     }
                                   }
                                 }
                               }
                             }
-                          },
-                          _1: "the %s %s is defined in both types %s and %s."
-                        }), s._0, s._1, s._2, s._3);
+                          }
+                        }
+                      }
+                    },
+                    _1: "the %s %s is defined in both types %s and %s."
+                  }), s._0, s._1, s._2, s._3);
       case /* Multiple_definition */15 :
           return Curry._3(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "files ",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "files ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " and ",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
+                              TAG: /* String_literal */11,
+                              _0: " both define a module named ",
                               _1: {
-                                TAG: /* String_literal */11,
-                                _0: " and ",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " both define a module named ",
-                                    _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                }
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
+                                _1: /* End_of_format */0
                               }
                             }
-                          },
-                          _1: "files %s and %s both define a module named %s"
-                        }), s._1, s._2, s._0);
+                          }
+                        }
+                      }
+                    },
+                    _1: "files %s and %s both define a module named %s"
+                  }), s._1, s._2, s._0);
       case /* Unused_value_declaration */16 :
           return "unused value " + (s._0 + ".");
       case /* Unused_open */17 :
@@ -2480,13 +2480,13 @@ function message(s) {
             return "this record of type " + (ty + (" contains fields that are \nnot visible in the current scope: " + (Stdlib__String.concat(" ", slist) + ".\nThey will not be selected if the type becomes unknown.")));
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "warnings.ml",
-                      365,
-                      39
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "warnings.ml",
+                  365,
+                  39
+                ]
+              });
           break;
       case /* Ambiguous_name */24 :
           const slist$1 = s._0;
@@ -2497,13 +2497,13 @@ function message(s) {
             return "these field labels belong to several types: " + (Stdlib__String.concat(" ", s._1) + "\nThe first one was selected. Please disambiguate if this is wrong.");
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "warnings.ml",
-                      374,
-                      36
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "warnings.ml",
+                  374,
+                  36
+                ]
+              });
           break;
       case /* Disambiguated_name */25 :
           return "this use of " + (s._0 + " required disambiguation.");
@@ -2511,123 +2511,123 @@ function message(s) {
           return "the label " + (s._0 + " is not optional.");
       case /* Open_shadow_identifier */27 :
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "this open statement shadows the ",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "this open statement shadows the ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " identifier ",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: " identifier ",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " (which is later used)",
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* String_literal */11,
+                              _0: " (which is later used)",
+                              _1: /* End_of_format */0
                             }
-                          },
-                          _1: "this open statement shadows the %s identifier %s (which is later used)"
-                        }), s._0, s._1);
+                          }
+                        }
+                      }
+                    },
+                    _1: "this open statement shadows the %s identifier %s (which is later used)"
+                  }), s._0, s._1);
       case /* Open_shadow_label_constructor */28 :
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "this open statement shadows the ",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "this open statement shadows the ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* String_literal */11,
-                                    _0: " (which is later used)",
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* String_literal */11,
+                              _0: " (which is later used)",
+                              _1: /* End_of_format */0
                             }
-                          },
-                          _1: "this open statement shadows the %s %s (which is later used)"
-                        }), s._0, s._1);
+                          }
+                        }
+                      }
+                    },
+                    _1: "this open statement shadows the %s %s (which is later used)"
+                  }), s._0, s._1);
       case /* Bad_env_variable */29 :
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "illegal environment variable ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: " : ",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          },
-                          _1: "illegal environment variable %s : %s"
-                        }), s._0, s._1);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "illegal environment variable ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: " : ",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "illegal environment variable %s : %s"
+                  }), s._0, s._1);
       case /* Attribute_payload */30 :
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "illegal payload for attribute '",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: "'.\n",
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          },
-                          _1: "illegal payload for attribute '%s'.\n%s"
-                        }), s._0, s._1);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "illegal payload for attribute '",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: "'.\n",
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "illegal payload for attribute '%s'.\n%s"
+                  }), s._0, s._1);
       case /* Eliminated_optional_arguments */31 :
           const sl = s._0;
           return Curry._2(Stdlib__Printf.sprintf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "implicit elimination of optional argument",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          },
-                          _1: "implicit elimination of optional argument%s %s"
-                        }), Stdlib__List.length(sl) === 1 ? "" : "s", Stdlib__String.concat(", ", sl));
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "implicit elimination of optional argument",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "implicit elimination of optional argument%s %s"
+                  }), Stdlib__List.length(sl) === 1 ? "" : "s", Stdlib__String.concat(", ", sl));
       case /* No_cmi_file */32 :
           return "no cmi file was found in path for module " + s._0;
       case /* Bad_docstring */33 :
@@ -3147,20 +3147,20 @@ function in_file(name) {
     pos_cnum: -1
   };
   return {
-          loc_start: loc,
-          loc_end: loc,
-          loc_ghost: true
-        };
+    loc_start: loc,
+    loc_end: loc,
+    loc_ghost: true
+  };
 }
 
 const none = in_file("_none_");
 
 function curr(lexbuf) {
   return {
-          loc_start: lexbuf.lex_start_p,
-          loc_end: lexbuf.lex_curr_p,
-          loc_ghost: false
-        };
+    loc_start: lexbuf.lex_start_p,
+    loc_end: lexbuf.lex_curr_p,
+    loc_ghost: false
+  };
 }
 
 function init(lexbuf, fname) {
@@ -3174,26 +3174,26 @@ function init(lexbuf, fname) {
 
 function symbol_rloc(param) {
   return {
-          loc_start: Stdlib__Parsing.symbol_start_pos(undefined),
-          loc_end: Stdlib__Parsing.symbol_end_pos(undefined),
-          loc_ghost: false
-        };
+    loc_start: Stdlib__Parsing.symbol_start_pos(undefined),
+    loc_end: Stdlib__Parsing.symbol_end_pos(undefined),
+    loc_ghost: false
+  };
 }
 
 function symbol_gloc(param) {
   return {
-          loc_start: Stdlib__Parsing.symbol_start_pos(undefined),
-          loc_end: Stdlib__Parsing.symbol_end_pos(undefined),
-          loc_ghost: true
-        };
+    loc_start: Stdlib__Parsing.symbol_start_pos(undefined),
+    loc_end: Stdlib__Parsing.symbol_end_pos(undefined),
+    loc_ghost: true
+  };
 }
 
 function rhs_loc(n) {
   return {
-          loc_start: Stdlib__Parsing.rhs_start_pos(n),
-          loc_end: Stdlib__Parsing.rhs_end_pos(n),
-          loc_ghost: false
-        };
+    loc_start: Stdlib__Parsing.rhs_start_pos(n),
+    loc_end: Stdlib__Parsing.rhs_end_pos(n),
+    loc_ghost: false
+  };
 }
 
 const input_name = {
@@ -3251,8 +3251,8 @@ function highlight_terminfo(ppf, num_lines, lb, locs) {
   const pos0 = -lb.lex_abs_pos | 0;
   if (pos0 < 0) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-              MEL_EXN_ID: Stdlib.Exit
-            });
+          MEL_EXN_ID: Stdlib.Exit
+        });
   }
   let lines = num_loc_lines.contents;
   for (let i = pos0 ,i_finish = lb.lex_buffer_len; i < i_finish; ++i) {
@@ -3263,8 +3263,8 @@ function highlight_terminfo(ppf, num_lines, lb, locs) {
   }
   if (lines >= (num_lines - 2 | 0)) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-              MEL_EXN_ID: Stdlib.Exit
-            });
+          MEL_EXN_ID: Stdlib.Exit
+        });
   }
   Caml_io.caml_ml_flush(Stdlib.stdout);
   Caml_external_polyfill.resolve("caml_terminfo_backup")(lines);
@@ -3298,8 +3298,8 @@ function highlight_dumb(ppf, lb, loc) {
   const pos0 = -lb.lex_abs_pos | 0;
   if (pos0 < 0) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-              MEL_EXN_ID: Stdlib.Exit
-            });
+          MEL_EXN_ID: Stdlib.Exit
+        });
   }
   const end_pos = (lb.lex_buffer_len - pos0 | 0) - 1 | 0;
   let line_start = 0;
@@ -3528,10 +3528,10 @@ function reset(param) {
 
 function get_pos_info(pos) {
   return [
-          pos.pos_fname,
-          pos.pos_lnum,
-          pos.pos_cnum - pos.pos_bol | 0
-        ];
+    pos.pos_fname,
+    pos.pos_lnum,
+    pos.pos_cnum - pos.pos_bol | 0
+  ];
 }
 
 function print_loc(ppf, loc) {
@@ -3549,30 +3549,30 @@ function print_loc(ppf, loc) {
       return ;
     } else {
       return Curry._2(Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Characters ",
-                        _1: {
-                          TAG: /* Int */4,
-                          _0: /* Int_i */3,
-                          _1: /* No_padding */0,
-                          _2: /* No_precision */0,
-                          _3: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '-' */45,
-                            _1: {
-                              TAG: /* Int */4,
-                              _0: /* Int_i */3,
-                              _1: /* No_padding */0,
-                              _2: /* No_precision */0,
-                              _3: /* End_of_format */0
-                            }
-                          }
-                        }
-                      },
-                      _1: "Characters %i-%i"
-                    }), loc.loc_start.pos_cnum, loc.loc_end.pos_cnum);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Characters ",
+                  _1: {
+                    TAG: /* Int */4,
+                    _0: /* Int_i */3,
+                    _1: /* No_padding */0,
+                    _2: /* No_precision */0,
+                    _3: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '-' */45,
+                      _1: {
+                        TAG: /* Int */4,
+                        _0: /* Int_i */3,
+                        _1: /* No_padding */0,
+                        _2: /* No_precision */0,
+                        _3: /* End_of_format */0
+                      }
+                    }
+                  }
+                },
+                _1: "Characters %i-%i"
+              }), loc.loc_start.pos_cnum, loc.loc_end.pos_cnum);
     }
   } else {
     Curry._5(Stdlib__Format.fprintf(ppf)({
@@ -3640,14 +3640,14 @@ function print_loc(ppf, loc) {
               }), ", characters ", startchar$1, "-", endchar);
     }
     return Stdlib__Format.fprintf(ppf)({
-                TAG: /* Format */0,
-                _0: {
-                  TAG: /* Formatting_lit */17,
-                  _0: /* Close_tag */1,
-                  _1: /* End_of_format */0
-                },
-                _1: "@}"
-              });
+          TAG: /* Format */0,
+          _0: {
+            TAG: /* Formatting_lit */17,
+            _0: /* Close_tag */1,
+            _1: /* End_of_format */0
+          },
+          _1: "@}"
+        });
   }
 }
 
@@ -3660,40 +3660,40 @@ function print$1(ppf, loc) {
     return ;
   } else {
     return Curry._3(Stdlib__Format.fprintf(ppf)({
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_gen */18,
+                _0: {
+                  TAG: /* Open_tag */0,
+                  _0: {
                     TAG: /* Format */0,
                     _0: {
-                      TAG: /* Formatting_gen */18,
-                      _0: {
-                        TAG: /* Open_tag */0,
-                        _0: {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "<loc>",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "<loc>"
-                        }
-                      },
+                      TAG: /* String_literal */11,
+                      _0: "<loc>",
+                      _1: /* End_of_format */0
+                    },
+                    _1: "<loc>"
+                  }
+                },
+                _1: {
+                  TAG: /* Alpha */15,
+                  _0: {
+                    TAG: /* Formatting_lit */17,
+                    _0: /* Close_tag */1,
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
                       _1: {
-                        TAG: /* Alpha */15,
-                        _0: {
-                          TAG: /* Formatting_lit */17,
-                          _0: /* Close_tag */1,
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: /* Flush_newline */4,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        }
+                        TAG: /* Formatting_lit */17,
+                        _0: /* Flush_newline */4,
+                        _1: /* End_of_format */0
                       }
-                    },
-                    _1: "@{<loc>%a@}%s@."
-                  }), print_loc, loc, ":");
+                    }
+                  }
+                }
+              },
+              _1: "@{<loc>%a@}%s@."
+            }), print_loc, loc, ":");
   }
 }
 
@@ -3749,44 +3749,44 @@ function default_warning_printer(loc, ppf, w) {
     Curry._1(Misc_Color.setup, color.contents);
     print$1(ppf, loc);
     return Curry._3(Stdlib__Format.fprintf(ppf)({
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_gen */18,
+                _0: {
+                  TAG: /* Open_tag */0,
+                  _0: {
                     TAG: /* Format */0,
                     _0: {
-                      TAG: /* Formatting_gen */18,
-                      _0: {
-                        TAG: /* Open_tag */0,
-                        _0: {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "<warning>",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "<warning>"
-                        }
-                      },
+                      TAG: /* String_literal */11,
+                      _0: "<warning>",
+                      _1: /* End_of_format */0
+                    },
+                    _1: "<warning>"
+                  }
+                },
+                _1: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* Formatting_lit */17,
+                    _0: /* Close_tag */1,
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
                       _1: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
+                        TAG: /* Alpha */15,
+                        _0: {
                           TAG: /* Formatting_lit */17,
-                          _0: /* Close_tag */1,
-                          _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ' ' */32,
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Formatting_lit */17,
-                                _0: /* Flush_newline */4,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
+                          _0: /* Flush_newline */4,
+                          _1: /* End_of_format */0
                         }
                       }
-                    },
-                    _1: "@{<warning>%s@} %a@."
-                  }), "Warning", print, w);
+                    }
+                  }
+                }
+              },
+              _1: "@{<warning>%s@} %a@."
+            }), "Warning", print, w);
   }
   
 }
@@ -3814,16 +3814,16 @@ function echo_eof(param) {
 
 function mkloc(txt, loc) {
   return {
-          txt: txt,
-          loc: loc
-        };
+    txt: txt,
+    loc: loc
+  };
 }
 
 function mknoloc(txt) {
   return {
-          txt: txt,
-          loc: none
-        };
+    txt: txt,
+    loc: none
+  };
 }
 
 function pp_ksprintf(before, k, fmt) {
@@ -3834,9 +3834,9 @@ function pp_ksprintf(before, k, fmt) {
     Curry._1(before, ppf);
   }
   return Stdlib__Format.kfprintf((function (param) {
-                Stdlib__Format.pp_print_flush(ppf, undefined);
-                return Curry._1(k, Stdlib__Buffer.contents(buf));
-              }), ppf, fmt);
+          Stdlib__Format.pp_print_flush(ppf, undefined);
+          return Curry._1(k, Stdlib__Buffer.contents(buf));
+        }), ppf, fmt);
 }
 
 function print_phanton_error_prefix(ppf) {
@@ -3848,13 +3848,13 @@ function errorf(locOpt, subOpt, if_highlightOpt, fmt) {
   const sub = subOpt !== undefined ? subOpt : /* [] */0;
   const if_highlight = if_highlightOpt !== undefined ? if_highlightOpt : "";
   return pp_ksprintf(print_phanton_error_prefix, (function (msg) {
-                return {
-                        loc: loc,
-                        msg: msg,
-                        sub: sub,
-                        if_highlight: if_highlight
-                      };
-              }), fmt);
+          return {
+            loc: loc,
+            msg: msg,
+            sub: sub,
+            if_highlight: if_highlight
+          };
+        }), fmt);
 }
 
 function error(locOpt, subOpt, if_highlightOpt, msg) {
@@ -3862,11 +3862,11 @@ function error(locOpt, subOpt, if_highlightOpt, msg) {
   const sub = subOpt !== undefined ? subOpt : /* [] */0;
   const if_highlight = if_highlightOpt !== undefined ? if_highlightOpt : "";
   return {
-          loc: loc,
-          msg: msg,
-          sub: sub,
-          if_highlight: if_highlight
-        };
+    loc: loc,
+    msg: msg,
+    sub: sub,
+    if_highlight: if_highlight
+  };
 }
 
 const error_of_exn = {
@@ -3902,9 +3902,9 @@ function default_error_reporter(ppf, err) {
   if (if_highlight !== "") {
     const collect_locs = function (locs, param) {
       return Stdlib__List.fold_left(collect_locs, {
-                  hd: param.loc,
-                  tl: locs
-                }, param.sub);
+            hd: param.loc,
+            tl: locs
+          }, param.sub);
     };
     const locs = collect_locs(/* [] */0, err);
     highlighted = highlight_locations(ppf, locs);
@@ -3934,36 +3934,36 @@ function default_error_reporter(ppf, err) {
               _1: "%a%a %s"
             }), print$1, err.loc, print_error_prefix, undefined, err.msg);
     return Stdlib__List.iter(Curry._1(Stdlib__Format.fprintf(ppf)({
-                        TAG: /* Format */0,
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_lit */17,
+                    _0: /* Force_newline */3,
+                    _1: {
+                      TAG: /* Formatting_gen */18,
+                      _0: {
+                        TAG: /* Open_box */1,
+                        _0: {
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* String_literal */11,
+                            _0: "<2>",
+                            _1: /* End_of_format */0
+                          },
+                          _1: "<2>"
+                        }
+                      },
+                      _1: {
+                        TAG: /* Alpha */15,
                         _0: {
                           TAG: /* Formatting_lit */17,
-                          _0: /* Force_newline */3,
-                          _1: {
-                            TAG: /* Formatting_gen */18,
-                            _0: {
-                              TAG: /* Open_box */1,
-                              _0: {
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "<2>",
-                                  _1: /* End_of_format */0
-                                },
-                                _1: "<2>"
-                              }
-                            },
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Formatting_lit */17,
-                                _0: /* Close_box */0,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
-                        },
-                        _1: "@\n@[<2>%a@]"
-                      }), default_error_reporter), err.sub);
+                          _0: /* Close_box */0,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    }
+                  },
+                  _1: "@\n@[<2>%a@]"
+                }), default_error_reporter), err.sub);
   }
 }
 
@@ -3977,17 +3977,17 @@ function report_error(ppf, err) {
 
 function error_of_printer(loc, print, x) {
   return Curry._2(errorf(loc, undefined, undefined, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Alpha */15,
-                    _0: {
-                      TAG: /* Formatting_lit */17,
-                      _0: /* FFlush */2,
-                      _1: /* End_of_format */0
-                    }
-                  },
-                  _1: "%a@?"
-                }), print, x);
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Alpha */15,
+              _0: {
+                TAG: /* Formatting_lit */17,
+                _0: /* FFlush */2,
+                _1: /* End_of_format */0
+              }
+            },
+            _1: "%a@?"
+          }), print, x);
 }
 
 function error_of_printer_file(print, x) {
@@ -3997,38 +3997,38 @@ function error_of_printer_file(print, x) {
 register_error_of_exn(function (msg) {
       if (msg.MEL_EXN_ID === Stdlib.Sys_error) {
         return Curry._1(errorf(in_file(input_name.contents), undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "I/O error: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "I/O error: %s"
-                      }), msg._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "I/O error: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "I/O error: %s"
+                }), msg._1);
       } else if (msg.MEL_EXN_ID === Errors) {
         return Curry._1(errorf(in_file(input_name.contents), undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Some fatal warnings were triggered (",
-                          _1: {
-                            TAG: /* Int */4,
-                            _0: /* Int_d */0,
-                            _1: /* No_padding */0,
-                            _2: /* No_precision */0,
-                            _3: {
-                              TAG: /* String_literal */11,
-                              _0: " occurrences)",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "Some fatal warnings were triggered (%d occurrences)"
-                      }), msg._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Some fatal warnings were triggered (",
+                    _1: {
+                      TAG: /* Int */4,
+                      _0: /* Int_d */0,
+                      _1: /* No_padding */0,
+                      _2: /* No_precision */0,
+                      _3: {
+                        TAG: /* String_literal */11,
+                        _0: " occurrences)",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Some fatal warnings were triggered (%d occurrences)"
+                }), msg._1);
       } else {
         return ;
       }
@@ -4044,32 +4044,32 @@ function report_exception(ppf, exn) {
       const err = error_of_exn$1(exn$1);
       if (err !== undefined) {
         return Curry._2(Stdlib__Format.fprintf(ppf)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: /* End_of_format */0,
-                              _1: ""
-                            }
-                          },
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: {
-                              TAG: /* Formatting_lit */17,
-                              _0: /* Close_box */0,
-                              _1: {
-                                TAG: /* Formatting_lit */17,
-                                _0: /* Flush_newline */4,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
-                        },
-                        _1: "@[%a@]@."
-                      }), report_error, err);
+                        _0: /* End_of_format */0,
+                        _1: ""
+                      }
+                    },
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: {
+                        TAG: /* Formatting_lit */17,
+                        _0: /* Close_box */0,
+                        _1: {
+                          TAG: /* Formatting_lit */17,
+                          _0: /* Flush_newline */4,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[%a@]@."
+                }), report_error, err);
       }
       throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
     }
@@ -4101,16 +4101,16 @@ function raise_errorf(locOpt, subOpt, if_highlightOpt) {
   const partial_arg = print_phanton_error_prefix;
   return function (param) {
     return pp_ksprintf(partial_arg, (function (msg) {
-                  throw new Caml_js_exceptions.MelangeError($$Error, {
-                            MEL_EXN_ID: $$Error,
-                            _1: {
-                              loc: loc,
-                              msg: msg,
-                              sub: sub,
-                              if_highlight: if_highlight
-                            }
-                          });
-                }), param);
+            throw new Caml_js_exceptions.MelangeError($$Error, {
+                  MEL_EXN_ID: $$Error,
+                  _1: {
+                    loc: loc,
+                    msg: msg,
+                    sub: sub,
+                    if_highlight: if_highlight
+                  }
+                });
+          }), param);
   };
 }
 
@@ -4170,9 +4170,9 @@ function flatten(lid) {
     switch (s.TAG) {
       case /* Lident */0 :
           return {
-                  hd: s._0,
-                  tl: accu
-                };
+            hd: s._0,
+            tl: accu
+          };
       case /* Ldot */1 :
           _s = s._0;
           _accu = {
@@ -4203,17 +4203,17 @@ function split_at_dots(s, pos) {
   try {
     const dot = Stdlib__String.index_from(s, pos, /* '.' */46);
     return {
-            hd: Stdlib__String.sub(s, pos, dot - pos | 0),
-            tl: split_at_dots(s, dot + 1 | 0)
-          };
+      hd: Stdlib__String.sub(s, pos, dot - pos | 0),
+      tl: split_at_dots(s, dot + 1 | 0)
+    };
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Stdlib.Not_found) {
       return {
-              hd: Stdlib__String.sub(s, pos, s.length - pos | 0),
-              tl: /* [] */0
-            };
+        hd: Stdlib__String.sub(s, pos, s.length - pos | 0),
+        tl: /* [] */0
+      };
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -4223,20 +4223,20 @@ function parse(s) {
   const match = split_at_dots(s, 0);
   if (match) {
     return Stdlib__List.fold_left((function (p, s) {
-                  return {
-                          TAG: /* Ldot */1,
-                          _0: p,
-                          _1: s
-                        };
-                }), {
-                TAG: /* Lident */0,
-                _0: match.hd
-              }, match.tl);
+            return {
+              TAG: /* Ldot */1,
+              _0: p,
+              _1: s
+            };
+          }), {
+          TAG: /* Lident */0,
+          _0: match.hd
+        }, match.tl);
   } else {
     return {
-            TAG: /* Lident */0,
-            _0: ""
-          };
+      TAG: /* Lident */0,
+      _0: ""
+    };
   }
 }
 
@@ -4258,31 +4258,31 @@ function warn_bad_docstrings(param) {
           _0: true
         })) {
     return Stdlib__List.iter((function (ds) {
-                  const match = ds.ds_attached;
-                  switch (match) {
-                    case /* Unattached */0 :
-                        return prerr_warning(ds.ds_loc, {
-                                    TAG: /* Bad_docstring */33,
-                                    _0: true
-                                  });
-                    case /* Info */1 :
+            const match = ds.ds_attached;
+            switch (match) {
+              case /* Unattached */0 :
+                  return prerr_warning(ds.ds_loc, {
+                        TAG: /* Bad_docstring */33,
+                        _0: true
+                      });
+              case /* Info */1 :
+                  return ;
+              case /* Docs */2 :
+                  const match$1 = ds.ds_associated;
+                  switch (match$1) {
+                    case /* Zero */0 :
+                    case /* One */1 :
                         return ;
-                    case /* Docs */2 :
-                        const match$1 = ds.ds_associated;
-                        switch (match$1) {
-                          case /* Zero */0 :
-                          case /* One */1 :
-                              return ;
-                          case /* Many */2 :
-                              return prerr_warning(ds.ds_loc, {
-                                          TAG: /* Bad_docstring */33,
-                                          _0: false
-                                        });
-                          
-                        }
+                    case /* Many */2 :
+                        return prerr_warning(ds.ds_loc, {
+                              TAG: /* Bad_docstring */33,
+                              _0: false
+                            });
                     
                   }
-                }), Stdlib__List.rev(docstrings.contents));
+              
+            }
+          }), Stdlib__List.rev(docstrings.contents));
   }
   
 }
@@ -4345,29 +4345,29 @@ function docs_attr(ds) {
     pstr_loc: item_pstr_loc
   };
   return [
-          doc_loc,
-          {
-            TAG: /* PStr */0,
-            _0: {
-              hd: item,
-              tl: /* [] */0
-            }
-          }
-        ];
+    doc_loc,
+    {
+      TAG: /* PStr */0,
+      _0: {
+        hd: item,
+        tl: /* [] */0
+      }
+    }
+  ];
 }
 
 function add_docs_attrs(docs, attrs) {
   const ds = docs.docs_pre;
   const attrs$1 = ds !== undefined ? ({
-        hd: docs_attr(ds),
-        tl: attrs
-      }) : attrs;
+      hd: docs_attr(ds),
+      tl: attrs
+    }) : attrs;
   const ds$1 = docs.docs_post;
   if (ds$1 !== undefined) {
     return Stdlib.$at(attrs$1, {
-                hd: docs_attr(ds$1),
-                tl: /* [] */0
-              });
+          hd: docs_attr(ds$1),
+          tl: /* [] */0
+        });
   } else {
     return attrs$1;
   }
@@ -4376,9 +4376,9 @@ function add_docs_attrs(docs, attrs) {
 function add_info_attrs(info, attrs) {
   if (info !== undefined) {
     return Stdlib.$at(attrs, {
-                hd: docs_attr(info),
-                tl: /* [] */0
-              });
+          hd: docs_attr(info),
+          tl: /* [] */0
+        });
   } else {
     return attrs;
   }
@@ -4415,15 +4415,15 @@ function text_attr(ds) {
     pstr_loc: item_pstr_loc
   };
   return [
-          text_loc,
-          {
-            TAG: /* PStr */0,
-            _0: {
-              hd: item,
-              tl: /* [] */0
-            }
-          }
-        ];
+    text_loc,
+    {
+      TAG: /* PStr */0,
+      _0: {
+        hd: item,
+        tl: /* [] */0
+      }
+    }
+  ];
 }
 
 function add_text_attrs(dsl, attrs) {
@@ -4655,44 +4655,44 @@ function get_post_extra_text(pos) {
 
 function symbol_docs(param) {
   return {
-          docs_pre: get_pre_docs(Stdlib__Parsing.symbol_start_pos(undefined)),
-          docs_post: get_post_docs(Stdlib__Parsing.symbol_end_pos(undefined))
-        };
+    docs_pre: get_pre_docs(Stdlib__Parsing.symbol_start_pos(undefined)),
+    docs_post: get_post_docs(Stdlib__Parsing.symbol_end_pos(undefined))
+  };
 }
 
 function symbol_docs_lazy(param) {
   const p1 = Stdlib__Parsing.symbol_start_pos(undefined);
   const p2 = Stdlib__Parsing.symbol_end_pos(undefined);
   return {
-          LAZY_DONE: false,
-          VAL: (function () {
-              return {
-                      docs_pre: get_pre_docs(p1),
-                      docs_post: get_post_docs(p2)
-                    };
-            })
+    LAZY_DONE: false,
+    VAL: (function () {
+        return {
+          docs_pre: get_pre_docs(p1),
+          docs_post: get_post_docs(p2)
         };
+      })
+  };
 }
 
 function rhs_docs(pos1, pos2) {
   return {
-          docs_pre: get_pre_docs(Stdlib__Parsing.rhs_start_pos(pos1)),
-          docs_post: get_post_docs(Stdlib__Parsing.rhs_end_pos(pos2))
-        };
+    docs_pre: get_pre_docs(Stdlib__Parsing.rhs_start_pos(pos1)),
+    docs_post: get_post_docs(Stdlib__Parsing.rhs_end_pos(pos2))
+  };
 }
 
 function rhs_docs_lazy(pos1, pos2) {
   const p1 = Stdlib__Parsing.rhs_start_pos(pos1);
   const p2 = Stdlib__Parsing.rhs_end_pos(pos2);
   return {
-          LAZY_DONE: false,
-          VAL: (function () {
-              return {
-                      docs_pre: get_pre_docs(p1),
-                      docs_post: get_post_docs(p2)
-                    };
-            })
+    LAZY_DONE: false,
+    VAL: (function () {
+        return {
+          docs_pre: get_pre_docs(p1),
+          docs_post: get_post_docs(p2)
         };
+      })
+  };
 }
 
 function mark_symbol_docs(param) {
@@ -4720,11 +4720,11 @@ function symbol_text(param) {
 function symbol_text_lazy(param) {
   const pos = Stdlib__Parsing.symbol_start_pos(undefined);
   return {
-          LAZY_DONE: false,
-          VAL: (function () {
-              return get_text(pos);
-            })
-        };
+    LAZY_DONE: false,
+    VAL: (function () {
+        return get_text(pos);
+      })
+  };
 }
 
 function rhs_text(pos) {
@@ -4734,11 +4734,11 @@ function rhs_text(pos) {
 function rhs_text_lazy(pos) {
   const pos$1 = Stdlib__Parsing.rhs_start_pos(pos);
   return {
-          LAZY_DONE: false,
-          VAL: (function () {
-              return get_text(pos$1);
-            })
-        };
+    LAZY_DONE: false,
+    VAL: (function () {
+        return get_text(pos$1);
+      })
+  };
 }
 
 function symbol_pre_extra_text(param) {
@@ -4826,21 +4826,21 @@ function mk(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          ptyp_desc: d,
-          ptyp_loc: loc,
-          ptyp_attributes: attrs
-        };
+    ptyp_desc: d,
+    ptyp_loc: loc,
+    ptyp_attributes: attrs
+  };
 }
 
 function attr(d, a) {
   return {
-          ptyp_desc: d.ptyp_desc,
-          ptyp_loc: d.ptyp_loc,
-          ptyp_attributes: Stdlib.$at(d.ptyp_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    ptyp_desc: d.ptyp_desc,
+    ptyp_loc: d.ptyp_loc,
+    ptyp_attributes: Stdlib.$at(d.ptyp_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function any(loc, attrs, param) {
@@ -4849,91 +4849,91 @@ function any(loc, attrs, param) {
 
 function $$var(loc, attrs, a) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_var */0,
-              _0: a
-            });
+        TAG: /* Ptyp_var */0,
+        _0: a
+      });
 }
 
 function arrow(loc, attrs, a, b, c) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_arrow */1,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Ptyp_arrow */1,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function tuple(loc, attrs, a) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_tuple */2,
-              _0: a
-            });
+        TAG: /* Ptyp_tuple */2,
+        _0: a
+      });
 }
 
 function constr(loc, attrs, a, b) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_constr */3,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ptyp_constr */3,
+        _0: a,
+        _1: b
+      });
 }
 
 function object_(loc, attrs, a, b) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_object */4,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ptyp_object */4,
+        _0: a,
+        _1: b
+      });
 }
 
 function class_(loc, attrs, a, b) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_class */5,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ptyp_class */5,
+        _0: a,
+        _1: b
+      });
 }
 
 function alias(loc, attrs, a, b) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_alias */6,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ptyp_alias */6,
+        _0: a,
+        _1: b
+      });
 }
 
 function variant(loc, attrs, a, b, c) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_variant */7,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Ptyp_variant */7,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function poly(loc, attrs, a, b) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_poly */8,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ptyp_poly */8,
+        _0: a,
+        _1: b
+      });
 }
 
 function $$package(loc, attrs, a, b) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_package */9,
-              _0: [
-                a,
-                b
-              ]
-            });
+        TAG: /* Ptyp_package */9,
+        _0: [
+          a,
+          b
+        ]
+      });
 }
 
 function extension(loc, attrs, a) {
   return mk(loc, attrs, {
-              TAG: /* Ptyp_extension */10,
-              _0: a
-            });
+        TAG: /* Ptyp_extension */10,
+        _0: a
+      });
 }
 
 function force_poly(t) {
@@ -4966,21 +4966,21 @@ function mk$1(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          ppat_desc: d,
-          ppat_loc: loc,
-          ppat_attributes: attrs
-        };
+    ppat_desc: d,
+    ppat_loc: loc,
+    ppat_attributes: attrs
+  };
 }
 
 function attr$1(d, a) {
   return {
-          ppat_desc: d.ppat_desc,
-          ppat_loc: d.ppat_loc,
-          ppat_attributes: Stdlib.$at(d.ppat_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    ppat_desc: d.ppat_desc,
+    ppat_loc: d.ppat_loc,
+    ppat_attributes: Stdlib.$at(d.ppat_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function any$1(loc, attrs, param) {
@@ -4989,121 +4989,121 @@ function any$1(loc, attrs, param) {
 
 function $$var$1(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_var */0,
-              _0: a
-            });
+        TAG: /* Ppat_var */0,
+        _0: a
+      });
 }
 
 function alias$1(loc, attrs, a, b) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_alias */1,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ppat_alias */1,
+        _0: a,
+        _1: b
+      });
 }
 
 function constant(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_constant */2,
-              _0: a
-            });
+        TAG: /* Ppat_constant */2,
+        _0: a
+      });
 }
 
 function interval(loc, attrs, a, b) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_interval */3,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ppat_interval */3,
+        _0: a,
+        _1: b
+      });
 }
 
 function tuple$1(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_tuple */4,
-              _0: a
-            });
+        TAG: /* Ppat_tuple */4,
+        _0: a
+      });
 }
 
 function construct(loc, attrs, a, b) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_construct */5,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ppat_construct */5,
+        _0: a,
+        _1: b
+      });
 }
 
 function variant$1(loc, attrs, a, b) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_variant */6,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ppat_variant */6,
+        _0: a,
+        _1: b
+      });
 }
 
 function record(loc, attrs, a, b) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_record */7,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ppat_record */7,
+        _0: a,
+        _1: b
+      });
 }
 
 function array(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_array */8,
-              _0: a
-            });
+        TAG: /* Ppat_array */8,
+        _0: a
+      });
 }
 
 function or_(loc, attrs, a, b) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_or */9,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ppat_or */9,
+        _0: a,
+        _1: b
+      });
 }
 
 function constraint_(loc, attrs, a, b) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_constraint */10,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Ppat_constraint */10,
+        _0: a,
+        _1: b
+      });
 }
 
 function type_(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_type */11,
-              _0: a
-            });
+        TAG: /* Ppat_type */11,
+        _0: a
+      });
 }
 
 function lazy_(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_lazy */12,
-              _0: a
-            });
+        TAG: /* Ppat_lazy */12,
+        _0: a
+      });
 }
 
 function unpack(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_unpack */13,
-              _0: a
-            });
+        TAG: /* Ppat_unpack */13,
+        _0: a
+      });
 }
 
 function exception_(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_exception */14,
-              _0: a
-            });
+        TAG: /* Ppat_exception */14,
+        _0: a
+      });
 }
 
 function extension$1(loc, attrs, a) {
   return mk$1(loc, attrs, {
-              TAG: /* Ppat_extension */15,
-              _0: a
-            });
+        TAG: /* Ppat_extension */15,
+        _0: a
+      });
 }
 
 const Pat = {
@@ -5132,373 +5132,373 @@ function mk$2(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pexp_desc: d,
-          pexp_loc: loc,
-          pexp_attributes: attrs
-        };
+    pexp_desc: d,
+    pexp_loc: loc,
+    pexp_attributes: attrs
+  };
 }
 
 function attr$2(d, a) {
   return {
-          pexp_desc: d.pexp_desc,
-          pexp_loc: d.pexp_loc,
-          pexp_attributes: Stdlib.$at(d.pexp_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pexp_desc: d.pexp_desc,
+    pexp_loc: d.pexp_loc,
+    pexp_attributes: Stdlib.$at(d.pexp_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function ident(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_ident */0,
-              _0: a
-            });
+        TAG: /* Pexp_ident */0,
+        _0: a
+      });
 }
 
 function constant$1(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_constant */1,
-              _0: a
-            });
+        TAG: /* Pexp_constant */1,
+        _0: a
+      });
 }
 
 function let_(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_let */2,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_let */2,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function fun_(loc, attrs, a, b, c, d) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_fun */4,
-              _0: a,
-              _1: b,
-              _2: c,
-              _3: d
-            });
+        TAG: /* Pexp_fun */4,
+        _0: a,
+        _1: b,
+        _2: c,
+        _3: d
+      });
 }
 
 function function_(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_function */3,
-              _0: a
-            });
+        TAG: /* Pexp_function */3,
+        _0: a
+      });
 }
 
 function apply(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_apply */5,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_apply */5,
+        _0: a,
+        _1: b
+      });
 }
 
 function match_(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_match */6,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_match */6,
+        _0: a,
+        _1: b
+      });
 }
 
 function try_(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_try */7,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_try */7,
+        _0: a,
+        _1: b
+      });
 }
 
 function tuple$2(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_tuple */8,
-              _0: a
-            });
+        TAG: /* Pexp_tuple */8,
+        _0: a
+      });
 }
 
 function construct$1(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_construct */9,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_construct */9,
+        _0: a,
+        _1: b
+      });
 }
 
 function variant$2(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_variant */10,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_variant */10,
+        _0: a,
+        _1: b
+      });
 }
 
 function record$1(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_record */11,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_record */11,
+        _0: a,
+        _1: b
+      });
 }
 
 function field(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_field */12,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_field */12,
+        _0: a,
+        _1: b
+      });
 }
 
 function setfield(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_setfield */13,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_setfield */13,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function array$1(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_array */14,
-              _0: a
-            });
+        TAG: /* Pexp_array */14,
+        _0: a
+      });
 }
 
 function ifthenelse(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_ifthenelse */15,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_ifthenelse */15,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function sequence(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_sequence */16,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_sequence */16,
+        _0: a,
+        _1: b
+      });
 }
 
 function while_(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_while */17,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_while */17,
+        _0: a,
+        _1: b
+      });
 }
 
 function for_(loc, attrs, a, b, c, d, e) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_for */18,
-              _0: a,
-              _1: b,
-              _2: c,
-              _3: d,
-              _4: e
-            });
+        TAG: /* Pexp_for */18,
+        _0: a,
+        _1: b,
+        _2: c,
+        _3: d,
+        _4: e
+      });
 }
 
 function constraint_$1(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_constraint */19,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_constraint */19,
+        _0: a,
+        _1: b
+      });
 }
 
 function coerce(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_coerce */20,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_coerce */20,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function send(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_send */21,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_send */21,
+        _0: a,
+        _1: b
+      });
 }
 
 function new_(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_new */22,
-              _0: a
-            });
+        TAG: /* Pexp_new */22,
+        _0: a
+      });
 }
 
 function setinstvar(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_setinstvar */23,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_setinstvar */23,
+        _0: a,
+        _1: b
+      });
 }
 
 function override(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_override */24,
-              _0: a
-            });
+        TAG: /* Pexp_override */24,
+        _0: a
+      });
 }
 
 function letmodule(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_letmodule */25,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_letmodule */25,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function assert_(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_assert */26,
-              _0: a
-            });
+        TAG: /* Pexp_assert */26,
+        _0: a
+      });
 }
 
 function lazy_$1(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_lazy */27,
-              _0: a
-            });
+        TAG: /* Pexp_lazy */27,
+        _0: a
+      });
 }
 
 function poly$1(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_poly */28,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_poly */28,
+        _0: a,
+        _1: b
+      });
 }
 
 function object_$1(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_object */29,
-              _0: a
-            });
+        TAG: /* Pexp_object */29,
+        _0: a
+      });
 }
 
 function newtype(loc, attrs, a, b) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_newtype */30,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pexp_newtype */30,
+        _0: a,
+        _1: b
+      });
 }
 
 function pack(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_pack */31,
-              _0: a
-            });
+        TAG: /* Pexp_pack */31,
+        _0: a
+      });
 }
 
 function open_(loc, attrs, a, b, c) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_open */32,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pexp_open */32,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function extension$2(loc, attrs, a) {
   return mk$2(loc, attrs, {
-              TAG: /* Pexp_extension */33,
-              _0: a
-            });
+        TAG: /* Pexp_extension */33,
+        _0: a
+      });
 }
 
 function $$case(lhs, guard, rhs) {
   return {
-          pc_lhs: lhs,
-          pc_guard: guard,
-          pc_rhs: rhs
-        };
+    pc_lhs: lhs,
+    pc_guard: guard,
+    pc_rhs: rhs
+  };
 }
 
 function mk$3(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pmty_desc: d,
-          pmty_loc: loc,
-          pmty_attributes: attrs
-        };
+    pmty_desc: d,
+    pmty_loc: loc,
+    pmty_attributes: attrs
+  };
 }
 
 function attr$3(d, a) {
   return {
-          pmty_desc: d.pmty_desc,
-          pmty_loc: d.pmty_loc,
-          pmty_attributes: Stdlib.$at(d.pmty_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pmty_desc: d.pmty_desc,
+    pmty_loc: d.pmty_loc,
+    pmty_attributes: Stdlib.$at(d.pmty_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function ident$1(loc, attrs, a) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_ident */0,
-              _0: a
-            });
+        TAG: /* Pmty_ident */0,
+        _0: a
+      });
 }
 
 function alias$2(loc, attrs, a) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_alias */6,
-              _0: a
-            });
+        TAG: /* Pmty_alias */6,
+        _0: a
+      });
 }
 
 function signature(loc, attrs, a) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_signature */1,
-              _0: a
-            });
+        TAG: /* Pmty_signature */1,
+        _0: a
+      });
 }
 
 function functor_(loc, attrs, a, b, c) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_functor */2,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pmty_functor */2,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function with_(loc, attrs, a, b) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_with */3,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pmty_with */3,
+        _0: a,
+        _1: b
+      });
 }
 
 function typeof_(loc, attrs, a) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_typeof */4,
-              _0: a
-            });
+        TAG: /* Pmty_typeof */4,
+        _0: a
+      });
 }
 
 function extension$3(loc, attrs, a) {
   return mk$3(loc, attrs, {
-              TAG: /* Pmty_extension */5,
-              _0: a
-            });
+        TAG: /* Pmty_extension */5,
+        _0: a
+      });
 }
 
 const Mty = {
@@ -5517,74 +5517,74 @@ function mk$4(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pmod_desc: d,
-          pmod_loc: loc,
-          pmod_attributes: attrs
-        };
+    pmod_desc: d,
+    pmod_loc: loc,
+    pmod_attributes: attrs
+  };
 }
 
 function attr$4(d, a) {
   return {
-          pmod_desc: d.pmod_desc,
-          pmod_loc: d.pmod_loc,
-          pmod_attributes: Stdlib.$at(d.pmod_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pmod_desc: d.pmod_desc,
+    pmod_loc: d.pmod_loc,
+    pmod_attributes: Stdlib.$at(d.pmod_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function ident$2(loc, attrs, x) {
   return mk$4(loc, attrs, {
-              TAG: /* Pmod_ident */0,
-              _0: x
-            });
+        TAG: /* Pmod_ident */0,
+        _0: x
+      });
 }
 
 function structure(loc, attrs, x) {
   return mk$4(loc, attrs, {
-              TAG: /* Pmod_structure */1,
-              _0: x
-            });
+        TAG: /* Pmod_structure */1,
+        _0: x
+      });
 }
 
 function functor_$1(loc, attrs, arg, arg_ty, body) {
   return mk$4(loc, attrs, {
-              TAG: /* Pmod_functor */2,
-              _0: arg,
-              _1: arg_ty,
-              _2: body
-            });
+        TAG: /* Pmod_functor */2,
+        _0: arg,
+        _1: arg_ty,
+        _2: body
+      });
 }
 
 function apply$1(loc, attrs, m1, m2) {
   return mk$4(loc, attrs, {
-              TAG: /* Pmod_apply */3,
-              _0: m1,
-              _1: m2
-            });
+        TAG: /* Pmod_apply */3,
+        _0: m1,
+        _1: m2
+      });
 }
 
 function constraint_$2(loc, attrs, m, mty) {
   return mk$4(loc, attrs, {
-              TAG: /* Pmod_constraint */4,
-              _0: m,
-              _1: mty
-            });
+        TAG: /* Pmod_constraint */4,
+        _0: m,
+        _1: mty
+      });
 }
 
 function unpack$1(loc, attrs, e) {
   return mk$4(loc, attrs, {
-              TAG: /* Pmod_unpack */5,
-              _0: e
-            });
+        TAG: /* Pmod_unpack */5,
+        _0: e
+      });
 }
 
 function extension$4(loc, attrs, a) {
   return mk$4(loc, attrs, {
-              TAG: /* Pmod_extension */6,
-              _0: a
-            });
+        TAG: /* Pmod_extension */6,
+        _0: a
+      });
 }
 
 const Mod = {
@@ -5602,113 +5602,113 @@ const Mod = {
 function mk$5(locOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   return {
-          psig_desc: d,
-          psig_loc: loc
-        };
+    psig_desc: d,
+    psig_loc: loc
+  };
 }
 
 function value(loc, a) {
   return mk$5(loc, {
-              TAG: /* Psig_value */0,
-              _0: a
-            });
+        TAG: /* Psig_value */0,
+        _0: a
+      });
 }
 
 function type_$1(loc, a) {
   return mk$5(loc, {
-              TAG: /* Psig_type */1,
-              _0: a
-            });
+        TAG: /* Psig_type */1,
+        _0: a
+      });
 }
 
 function type_extension(loc, a) {
   return mk$5(loc, {
-              TAG: /* Psig_typext */2,
-              _0: a
-            });
+        TAG: /* Psig_typext */2,
+        _0: a
+      });
 }
 
 function exception_$1(loc, a) {
   return mk$5(loc, {
-              TAG: /* Psig_exception */3,
-              _0: a
-            });
+        TAG: /* Psig_exception */3,
+        _0: a
+      });
 }
 
 function module_(loc, a) {
   return mk$5(loc, {
-              TAG: /* Psig_module */4,
-              _0: a
-            });
+        TAG: /* Psig_module */4,
+        _0: a
+      });
 }
 
 function rec_module(loc, a) {
   return mk$5(loc, {
-              TAG: /* Psig_recmodule */5,
-              _0: a
-            });
+        TAG: /* Psig_recmodule */5,
+        _0: a
+      });
 }
 
 function modtype(loc, a) {
   return mk$5(loc, {
-              TAG: /* Psig_modtype */6,
-              _0: a
-            });
+        TAG: /* Psig_modtype */6,
+        _0: a
+      });
 }
 
 function open_$1(loc, a) {
   return mk$5(loc, {
-              TAG: /* Psig_open */7,
-              _0: a
-            });
+        TAG: /* Psig_open */7,
+        _0: a
+      });
 }
 
 function include_(loc, a) {
   return mk$5(loc, {
-              TAG: /* Psig_include */8,
-              _0: a
-            });
+        TAG: /* Psig_include */8,
+        _0: a
+      });
 }
 
 function class_$1(loc, a) {
   return mk$5(loc, {
-              TAG: /* Psig_class */9,
-              _0: a
-            });
+        TAG: /* Psig_class */9,
+        _0: a
+      });
 }
 
 function class_type(loc, a) {
   return mk$5(loc, {
-              TAG: /* Psig_class_type */10,
-              _0: a
-            });
+        TAG: /* Psig_class_type */10,
+        _0: a
+      });
 }
 
 function extension$5(loc, attrsOpt, a) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return mk$5(loc, {
-              TAG: /* Psig_extension */12,
-              _0: a,
-              _1: attrs
-            });
+        TAG: /* Psig_extension */12,
+        _0: a,
+        _1: attrs
+      });
 }
 
 function attribute(loc, a) {
   return mk$5(loc, {
-              TAG: /* Psig_attribute */11,
-              _0: a
-            });
+        TAG: /* Psig_attribute */11,
+        _0: a
+      });
 }
 
 function text(txt) {
   return Stdlib__List.map((function (ds) {
-                const a = text_attr(ds);
-                const loc = ds.ds_loc;
-                return mk$5(loc, {
-                            TAG: /* Psig_attribute */11,
-                            _0: a
-                          });
-              }), txt);
+          const a = text_attr(ds);
+          const loc = ds.ds_loc;
+          return mk$5(loc, {
+                TAG: /* Psig_attribute */11,
+                _0: a
+              });
+        }), txt);
 }
 
 const Sig = {
@@ -5732,130 +5732,130 @@ const Sig = {
 function mk$6(locOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   return {
-          pstr_desc: d,
-          pstr_loc: loc
-        };
+    pstr_desc: d,
+    pstr_loc: loc
+  };
 }
 
 function $$eval(loc, attrsOpt, a) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return mk$6(loc, {
-              TAG: /* Pstr_eval */0,
-              _0: a,
-              _1: attrs
-            });
+        TAG: /* Pstr_eval */0,
+        _0: a,
+        _1: attrs
+      });
 }
 
 function value$1(loc, a, b) {
   return mk$6(loc, {
-              TAG: /* Pstr_value */1,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pstr_value */1,
+        _0: a,
+        _1: b
+      });
 }
 
 function primitive(loc, a) {
   return mk$6(loc, {
-              TAG: /* Pstr_primitive */2,
-              _0: a
-            });
+        TAG: /* Pstr_primitive */2,
+        _0: a
+      });
 }
 
 function type_$2(loc, a) {
   return mk$6(loc, {
-              TAG: /* Pstr_type */3,
-              _0: a
-            });
+        TAG: /* Pstr_type */3,
+        _0: a
+      });
 }
 
 function type_extension$1(loc, a) {
   return mk$6(loc, {
-              TAG: /* Pstr_typext */4,
-              _0: a
-            });
+        TAG: /* Pstr_typext */4,
+        _0: a
+      });
 }
 
 function exception_$2(loc, a) {
   return mk$6(loc, {
-              TAG: /* Pstr_exception */5,
-              _0: a
-            });
+        TAG: /* Pstr_exception */5,
+        _0: a
+      });
 }
 
 function module_$1(loc, a) {
   return mk$6(loc, {
-              TAG: /* Pstr_module */6,
-              _0: a
-            });
+        TAG: /* Pstr_module */6,
+        _0: a
+      });
 }
 
 function rec_module$1(loc, a) {
   return mk$6(loc, {
-              TAG: /* Pstr_recmodule */7,
-              _0: a
-            });
+        TAG: /* Pstr_recmodule */7,
+        _0: a
+      });
 }
 
 function modtype$1(loc, a) {
   return mk$6(loc, {
-              TAG: /* Pstr_modtype */8,
-              _0: a
-            });
+        TAG: /* Pstr_modtype */8,
+        _0: a
+      });
 }
 
 function open_$2(loc, a) {
   return mk$6(loc, {
-              TAG: /* Pstr_open */9,
-              _0: a
-            });
+        TAG: /* Pstr_open */9,
+        _0: a
+      });
 }
 
 function class_$2(loc, a) {
   return mk$6(loc, {
-              TAG: /* Pstr_class */10,
-              _0: a
-            });
+        TAG: /* Pstr_class */10,
+        _0: a
+      });
 }
 
 function class_type$1(loc, a) {
   return mk$6(loc, {
-              TAG: /* Pstr_class_type */11,
-              _0: a
-            });
+        TAG: /* Pstr_class_type */11,
+        _0: a
+      });
 }
 
 function include_$1(loc, a) {
   return mk$6(loc, {
-              TAG: /* Pstr_include */12,
-              _0: a
-            });
+        TAG: /* Pstr_include */12,
+        _0: a
+      });
 }
 
 function extension$6(loc, attrsOpt, a) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return mk$6(loc, {
-              TAG: /* Pstr_extension */14,
-              _0: a,
-              _1: attrs
-            });
+        TAG: /* Pstr_extension */14,
+        _0: a,
+        _1: attrs
+      });
 }
 
 function attribute$1(loc, a) {
   return mk$6(loc, {
-              TAG: /* Pstr_attribute */13,
-              _0: a
-            });
+        TAG: /* Pstr_attribute */13,
+        _0: a
+      });
 }
 
 function text$1(txt) {
   return Stdlib__List.map((function (ds) {
-                const a = text_attr(ds);
-                const loc = ds.ds_loc;
-                return mk$6(loc, {
-                            TAG: /* Pstr_attribute */13,
-                            _0: a
-                          });
-              }), txt);
+          const a = text_attr(ds);
+          const loc = ds.ds_loc;
+          return mk$6(loc, {
+                TAG: /* Pstr_attribute */13,
+                _0: a
+              });
+        }), txt);
 }
 
 const Str = {
@@ -5882,78 +5882,78 @@ function mk$7(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pcl_desc: d,
-          pcl_loc: loc,
-          pcl_attributes: attrs
-        };
+    pcl_desc: d,
+    pcl_loc: loc,
+    pcl_attributes: attrs
+  };
 }
 
 function attr$5(d, a) {
   return {
-          pcl_desc: d.pcl_desc,
-          pcl_loc: d.pcl_loc,
-          pcl_attributes: Stdlib.$at(d.pcl_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pcl_desc: d.pcl_desc,
+    pcl_loc: d.pcl_loc,
+    pcl_attributes: Stdlib.$at(d.pcl_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function constr$1(loc, attrs, a, b) {
   return mk$7(loc, attrs, {
-              TAG: /* Pcl_constr */0,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pcl_constr */0,
+        _0: a,
+        _1: b
+      });
 }
 
 function structure$1(loc, attrs, a) {
   return mk$7(loc, attrs, {
-              TAG: /* Pcl_structure */1,
-              _0: a
-            });
+        TAG: /* Pcl_structure */1,
+        _0: a
+      });
 }
 
 function fun_$1(loc, attrs, a, b, c, d) {
   return mk$7(loc, attrs, {
-              TAG: /* Pcl_fun */2,
-              _0: a,
-              _1: b,
-              _2: c,
-              _3: d
-            });
+        TAG: /* Pcl_fun */2,
+        _0: a,
+        _1: b,
+        _2: c,
+        _3: d
+      });
 }
 
 function apply$2(loc, attrs, a, b) {
   return mk$7(loc, attrs, {
-              TAG: /* Pcl_apply */3,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pcl_apply */3,
+        _0: a,
+        _1: b
+      });
 }
 
 function let_$1(loc, attrs, a, b, c) {
   return mk$7(loc, attrs, {
-              TAG: /* Pcl_let */4,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pcl_let */4,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function constraint_$3(loc, attrs, a, b) {
   return mk$7(loc, attrs, {
-              TAG: /* Pcl_constraint */5,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pcl_constraint */5,
+        _0: a,
+        _1: b
+      });
 }
 
 function extension$7(loc, attrs, a) {
   return mk$7(loc, attrs, {
-              TAG: /* Pcl_extension */6,
-              _0: a
-            });
+        TAG: /* Pcl_extension */6,
+        _0: a
+      });
 }
 
 const Cl = {
@@ -5972,52 +5972,52 @@ function mk$8(locOpt, attrsOpt, d) {
   const loc = locOpt !== undefined ? locOpt : default_loc.contents;
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   return {
-          pcty_desc: d,
-          pcty_loc: loc,
-          pcty_attributes: attrs
-        };
+    pcty_desc: d,
+    pcty_loc: loc,
+    pcty_attributes: attrs
+  };
 }
 
 function attr$6(d, a) {
   return {
-          pcty_desc: d.pcty_desc,
-          pcty_loc: d.pcty_loc,
-          pcty_attributes: Stdlib.$at(d.pcty_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pcty_desc: d.pcty_desc,
+    pcty_loc: d.pcty_loc,
+    pcty_attributes: Stdlib.$at(d.pcty_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function constr$2(loc, attrs, a, b) {
   return mk$8(loc, attrs, {
-              TAG: /* Pcty_constr */0,
-              _0: a,
-              _1: b
-            });
+        TAG: /* Pcty_constr */0,
+        _0: a,
+        _1: b
+      });
 }
 
 function signature$1(loc, attrs, a) {
   return mk$8(loc, attrs, {
-              TAG: /* Pcty_signature */1,
-              _0: a
-            });
+        TAG: /* Pcty_signature */1,
+        _0: a
+      });
 }
 
 function arrow$1(loc, attrs, a, b, c) {
   return mk$8(loc, attrs, {
-              TAG: /* Pcty_arrow */2,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pcty_arrow */2,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function extension$8(loc, attrs, a) {
   return mk$8(loc, attrs, {
-              TAG: /* Pcty_extension */3,
-              _0: a
-            });
+        TAG: /* Pcty_extension */3,
+        _0: a
+      });
 }
 
 const Cty = {
@@ -6034,82 +6034,82 @@ function mk$9(locOpt, attrsOpt, docsOpt, d) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   return {
-          pctf_desc: d,
-          pctf_loc: loc,
-          pctf_attributes: add_docs_attrs(docs, attrs)
-        };
+    pctf_desc: d,
+    pctf_loc: loc,
+    pctf_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 function inherit_(loc, attrs, a) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_inherit */0,
-              _0: a
-            });
+        TAG: /* Pctf_inherit */0,
+        _0: a
+      });
 }
 
 function val_(loc, attrs, a, b, c, d) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_val */1,
-              _0: [
-                a,
-                b,
-                c,
-                d
-              ]
-            });
+        TAG: /* Pctf_val */1,
+        _0: [
+          a,
+          b,
+          c,
+          d
+        ]
+      });
 }
 
 function method_(loc, attrs, a, b, c, d) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_method */2,
-              _0: [
-                a,
-                b,
-                c,
-                d
-              ]
-            });
+        TAG: /* Pctf_method */2,
+        _0: [
+          a,
+          b,
+          c,
+          d
+        ]
+      });
 }
 
 function constraint_$4(loc, attrs, a, b) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_constraint */3,
-              _0: [
-                a,
-                b
-              ]
-            });
+        TAG: /* Pctf_constraint */3,
+        _0: [
+          a,
+          b
+        ]
+      });
 }
 
 function extension$9(loc, attrs, a) {
   return mk$9(loc, attrs, undefined, {
-              TAG: /* Pctf_extension */5,
-              _0: a
-            });
+        TAG: /* Pctf_extension */5,
+        _0: a
+      });
 }
 
 function attribute$2(loc, a) {
   return mk$9(loc, undefined, undefined, {
-              TAG: /* Pctf_attribute */4,
-              _0: a
-            });
+        TAG: /* Pctf_attribute */4,
+        _0: a
+      });
 }
 
 function text$2(txt) {
   return Stdlib__List.map((function (ds) {
-                return attribute$2(ds.ds_loc, text_attr(ds));
-              }), txt);
+          return attribute$2(ds.ds_loc, text_attr(ds));
+        }), txt);
 }
 
 function attr$7(d, a) {
   return {
-          pctf_desc: d.pctf_desc,
-          pctf_loc: d.pctf_loc,
-          pctf_attributes: Stdlib.$at(d.pctf_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pctf_desc: d.pctf_desc,
+    pctf_loc: d.pctf_loc,
+    pctf_attributes: Stdlib.$at(d.pctf_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function mk$10(locOpt, attrsOpt, docsOpt, d) {
@@ -6117,104 +6117,104 @@ function mk$10(locOpt, attrsOpt, docsOpt, d) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   return {
-          pcf_desc: d,
-          pcf_loc: loc,
-          pcf_attributes: add_docs_attrs(docs, attrs)
-        };
+    pcf_desc: d,
+    pcf_loc: loc,
+    pcf_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 function inherit_$1(loc, attrs, a, b, c) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_inherit */0,
-              _0: a,
-              _1: b,
-              _2: c
-            });
+        TAG: /* Pcf_inherit */0,
+        _0: a,
+        _1: b,
+        _2: c
+      });
 }
 
 function val_$1(loc, attrs, a, b, c) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_val */1,
-              _0: [
-                a,
-                b,
-                c
-              ]
-            });
+        TAG: /* Pcf_val */1,
+        _0: [
+          a,
+          b,
+          c
+        ]
+      });
 }
 
 function method_$1(loc, attrs, a, b, c) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_method */2,
-              _0: [
-                a,
-                b,
-                c
-              ]
-            });
+        TAG: /* Pcf_method */2,
+        _0: [
+          a,
+          b,
+          c
+        ]
+      });
 }
 
 function constraint_$5(loc, attrs, a, b) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_constraint */3,
-              _0: [
-                a,
-                b
-              ]
-            });
+        TAG: /* Pcf_constraint */3,
+        _0: [
+          a,
+          b
+        ]
+      });
 }
 
 function initializer_(loc, attrs, a) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_initializer */4,
-              _0: a
-            });
+        TAG: /* Pcf_initializer */4,
+        _0: a
+      });
 }
 
 function extension$10(loc, attrs, a) {
   return mk$10(loc, attrs, undefined, {
-              TAG: /* Pcf_extension */6,
-              _0: a
-            });
+        TAG: /* Pcf_extension */6,
+        _0: a
+      });
 }
 
 function attribute$3(loc, a) {
   return mk$10(loc, undefined, undefined, {
-              TAG: /* Pcf_attribute */5,
-              _0: a
-            });
+        TAG: /* Pcf_attribute */5,
+        _0: a
+      });
 }
 
 function text$3(txt) {
   return Stdlib__List.map((function (ds) {
-                return attribute$3(ds.ds_loc, text_attr(ds));
-              }), txt);
+          return attribute$3(ds.ds_loc, text_attr(ds));
+        }), txt);
 }
 
 function virtual_(ct) {
   return {
-          TAG: /* Cfk_virtual */0,
-          _0: ct
-        };
+    TAG: /* Cfk_virtual */0,
+    _0: ct
+  };
 }
 
 function concrete(o, e) {
   return {
-          TAG: /* Cfk_concrete */1,
-          _0: o,
-          _1: e
-        };
+    TAG: /* Cfk_concrete */1,
+    _0: o,
+    _1: e
+  };
 }
 
 function attr$8(d, a) {
   return {
-          pcf_desc: d.pcf_desc,
-          pcf_loc: d.pcf_loc,
-          pcf_attributes: Stdlib.$at(d.pcf_attributes, {
-                hd: a,
-                tl: /* [] */0
-              })
-        };
+    pcf_desc: d.pcf_desc,
+    pcf_loc: d.pcf_loc,
+    pcf_attributes: Stdlib.$at(d.pcf_attributes, {
+          hd: a,
+          tl: /* [] */0
+        })
+  };
 }
 
 function mk$11(locOpt, attrsOpt, docsOpt, primOpt, name, typ) {
@@ -6223,12 +6223,12 @@ function mk$11(locOpt, attrsOpt, docsOpt, primOpt, name, typ) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const prim = primOpt !== undefined ? primOpt : /* [] */0;
   return {
-          pval_name: name,
-          pval_type: typ,
-          pval_prim: prim,
-          pval_attributes: add_docs_attrs(docs, attrs),
-          pval_loc: loc
-        };
+    pval_name: name,
+    pval_type: typ,
+    pval_prim: prim,
+    pval_attributes: add_docs_attrs(docs, attrs),
+    pval_loc: loc
+  };
 }
 
 const Val = {
@@ -6241,11 +6241,11 @@ function mk$12(locOpt, attrsOpt, docsOpt, textOpt, name, typ) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const text = textOpt !== undefined ? textOpt : /* [] */0;
   return {
-          pmd_name: name,
-          pmd_type: typ,
-          pmd_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          pmd_loc: loc
-        };
+    pmd_name: name,
+    pmd_type: typ,
+    pmd_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    pmd_loc: loc
+  };
 }
 
 const Md = {
@@ -6258,11 +6258,11 @@ function mk$13(locOpt, attrsOpt, docsOpt, textOpt, typ, name) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const text = textOpt !== undefined ? textOpt : /* [] */0;
   return {
-          pmtd_name: name,
-          pmtd_type: typ,
-          pmtd_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          pmtd_loc: loc
-        };
+    pmtd_name: name,
+    pmtd_type: typ,
+    pmtd_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    pmtd_loc: loc
+  };
 }
 
 const Mtd = {
@@ -6275,11 +6275,11 @@ function mk$14(locOpt, attrsOpt, docsOpt, textOpt, name, expr) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const text = textOpt !== undefined ? textOpt : /* [] */0;
   return {
-          pmb_name: name,
-          pmb_expr: expr,
-          pmb_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          pmb_loc: loc
-        };
+    pmb_name: name,
+    pmb_expr: expr,
+    pmb_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    pmb_loc: loc
+  };
 }
 
 const Mb = {
@@ -6292,11 +6292,11 @@ function mk$15(locOpt, attrsOpt, docsOpt, overrideOpt, lid) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const override = overrideOpt !== undefined ? overrideOpt : /* Fresh */1;
   return {
-          popen_lid: lid,
-          popen_override: override,
-          popen_loc: loc,
-          popen_attributes: add_docs_attrs(docs, attrs)
-        };
+    popen_lid: lid,
+    popen_override: override,
+    popen_loc: loc,
+    popen_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 const Opn = {
@@ -6308,10 +6308,10 @@ function mk$16(locOpt, attrsOpt, docsOpt, mexpr) {
   const attrs = attrsOpt !== undefined ? attrsOpt : /* [] */0;
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   return {
-          pincl_mod: mexpr,
-          pincl_loc: loc,
-          pincl_attributes: add_docs_attrs(docs, attrs)
-        };
+    pincl_mod: mexpr,
+    pincl_loc: loc,
+    pincl_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 const Incl = {
@@ -6324,11 +6324,11 @@ function mk$17(locOpt, attrsOpt, docsOpt, textOpt, pat, expr) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const text = textOpt !== undefined ? textOpt : /* [] */0;
   return {
-          pvb_pat: pat,
-          pvb_expr: expr,
-          pvb_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          pvb_loc: loc
-        };
+    pvb_pat: pat,
+    pvb_expr: expr,
+    pvb_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    pvb_loc: loc
+  };
 }
 
 const Vb = {
@@ -6343,13 +6343,13 @@ function mk$18(locOpt, attrsOpt, docsOpt, textOpt, virtOpt, paramsOpt, name, exp
   const virt = virtOpt !== undefined ? virtOpt : /* Concrete */1;
   const params = paramsOpt !== undefined ? paramsOpt : /* [] */0;
   return {
-          pci_virt: virt,
-          pci_params: params,
-          pci_name: name,
-          pci_expr: expr,
-          pci_loc: loc,
-          pci_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs))
-        };
+    pci_virt: virt,
+    pci_params: params,
+    pci_name: name,
+    pci_expr: expr,
+    pci_loc: loc,
+    pci_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs))
+  };
 }
 
 const Ci = {
@@ -6366,15 +6366,15 @@ function mk$19(locOpt, attrsOpt, docsOpt, textOpt, paramsOpt, cstrsOpt, kindOpt,
   const kind = kindOpt !== undefined ? kindOpt : /* Ptype_abstract */0;
   const priv = privOpt !== undefined ? privOpt : /* Public */1;
   return {
-          ptype_name: name,
-          ptype_params: params,
-          ptype_cstrs: cstrs,
-          ptype_kind: kind,
-          ptype_private: priv,
-          ptype_manifest: manifest,
-          ptype_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
-          ptype_loc: loc
-        };
+    ptype_name: name,
+    ptype_params: params,
+    ptype_cstrs: cstrs,
+    ptype_kind: kind,
+    ptype_private: priv,
+    ptype_manifest: manifest,
+    ptype_attributes: add_text_attrs(text, add_docs_attrs(docs, attrs)),
+    ptype_loc: loc
+  };
 }
 
 function constructor(locOpt, attrsOpt, infoOpt, argsOpt, res, name) {
@@ -6383,12 +6383,12 @@ function constructor(locOpt, attrsOpt, infoOpt, argsOpt, res, name) {
   const info = infoOpt !== undefined ? Caml_option.valFromOption(infoOpt) : undefined;
   const args = argsOpt !== undefined ? argsOpt : /* [] */0;
   return {
-          pcd_name: name,
-          pcd_args: args,
-          pcd_res: res,
-          pcd_loc: loc,
-          pcd_attributes: add_info_attrs(info, attrs)
-        };
+    pcd_name: name,
+    pcd_args: args,
+    pcd_res: res,
+    pcd_loc: loc,
+    pcd_attributes: add_info_attrs(info, attrs)
+  };
 }
 
 function field$1(locOpt, attrsOpt, infoOpt, mutOpt, name, typ) {
@@ -6397,12 +6397,12 @@ function field$1(locOpt, attrsOpt, infoOpt, mutOpt, name, typ) {
   const info = infoOpt !== undefined ? Caml_option.valFromOption(infoOpt) : undefined;
   const mut = mutOpt !== undefined ? mutOpt : /* Immutable */0;
   return {
-          pld_name: name,
-          pld_mutable: mut,
-          pld_type: typ,
-          pld_loc: loc,
-          pld_attributes: add_info_attrs(info, attrs)
-        };
+    pld_name: name,
+    pld_mutable: mut,
+    pld_type: typ,
+    pld_loc: loc,
+    pld_attributes: add_info_attrs(info, attrs)
+  };
 }
 
 const Type = {
@@ -6417,12 +6417,12 @@ function mk$20(attrsOpt, docsOpt, paramsOpt, privOpt, path, constructors) {
   const params = paramsOpt !== undefined ? paramsOpt : /* [] */0;
   const priv = privOpt !== undefined ? privOpt : /* Public */1;
   return {
-          ptyext_path: path,
-          ptyext_params: params,
-          ptyext_constructors: constructors,
-          ptyext_private: priv,
-          ptyext_attributes: add_docs_attrs(docs, attrs)
-        };
+    ptyext_path: path,
+    ptyext_params: params,
+    ptyext_constructors: constructors,
+    ptyext_private: priv,
+    ptyext_attributes: add_docs_attrs(docs, attrs)
+  };
 }
 
 function constructor$1(locOpt, attrsOpt, docsOpt, infoOpt, name, kind) {
@@ -6431,11 +6431,11 @@ function constructor$1(locOpt, attrsOpt, docsOpt, infoOpt, name, kind) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const info = infoOpt !== undefined ? Caml_option.valFromOption(infoOpt) : undefined;
   return {
-          pext_name: name,
-          pext_kind: kind,
-          pext_loc: loc,
-          pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
-        };
+    pext_name: name,
+    pext_kind: kind,
+    pext_loc: loc,
+    pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
+  };
 }
 
 function decl(locOpt, attrsOpt, docsOpt, infoOpt, argsOpt, res, name) {
@@ -6445,15 +6445,15 @@ function decl(locOpt, attrsOpt, docsOpt, infoOpt, argsOpt, res, name) {
   const info = infoOpt !== undefined ? Caml_option.valFromOption(infoOpt) : undefined;
   const args = argsOpt !== undefined ? argsOpt : /* [] */0;
   return {
-          pext_name: name,
-          pext_kind: {
-            TAG: /* Pext_decl */0,
-            _0: args,
-            _1: res
-          },
-          pext_loc: loc,
-          pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
-        };
+    pext_name: name,
+    pext_kind: {
+      TAG: /* Pext_decl */0,
+      _0: args,
+      _1: res
+    },
+    pext_loc: loc,
+    pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
+  };
 }
 
 function rebind(locOpt, attrsOpt, docsOpt, infoOpt, name, lid) {
@@ -6462,14 +6462,14 @@ function rebind(locOpt, attrsOpt, docsOpt, infoOpt, name, lid) {
   const docs = docsOpt !== undefined ? docsOpt : empty_docs;
   const info = infoOpt !== undefined ? Caml_option.valFromOption(infoOpt) : undefined;
   return {
-          pext_name: name,
-          pext_kind: {
-            TAG: /* Pext_rebind */1,
-            _0: lid
-          },
-          pext_loc: loc,
-          pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
-        };
+    pext_name: name,
+    pext_kind: {
+      TAG: /* Pext_rebind */1,
+      _0: lid
+    },
+    pext_loc: loc,
+    pext_attributes: add_docs_attrs(docs, add_info_attrs(info, attrs))
+  };
 }
 
 const Te = {
@@ -6481,9 +6481,9 @@ const Te = {
 
 function mk$21(self, fields) {
   return {
-          pcsig_self: self,
-          pcsig_fields: fields
-        };
+    pcsig_self: self,
+    pcsig_fields: fields
+  };
 }
 
 const Csig = {
@@ -6492,9 +6492,9 @@ const Csig = {
 
 function mk$22(self, fields) {
   return {
-          pcstr_self: self,
-          pcstr_fields: fields
-        };
+    pcstr_self: self,
+    pcstr_fields: fields
+  };
 }
 
 const Cstr = {
@@ -6606,162 +6606,162 @@ function prepare_error(loc) {
         const closing = loc._3;
         const opening = loc._1;
         return Curry._1(errorf(loc._2, {
-                        hd: Curry._1(errorf(loc._0, undefined, undefined, {
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* String_literal */11,
-                                    _0: "This '",
-                                    _1: {
-                                      TAG: /* String */2,
-                                      _0: /* No_padding */0,
-                                      _1: {
-                                        TAG: /* String_literal */11,
-                                        _0: "' might be unmatched",
-                                        _1: /* End_of_format */0
-                                      }
-                                    }
-                                  },
-                                  _1: "This '%s' might be unmatched"
-                                }), opening),
-                        tl: /* [] */0
-                      }, Curry._2(Stdlib__Printf.sprintf({
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "Syntax error: '",
-                                  _1: {
-                                    TAG: /* String */2,
-                                    _0: /* No_padding */0,
-                                    _1: {
-                                      TAG: /* String_literal */11,
-                                      _0: "' expected, the highlighted '",
-                                      _1: {
-                                        TAG: /* String */2,
-                                        _0: /* No_padding */0,
-                                        _1: {
-                                          TAG: /* String_literal */11,
-                                          _0: "' might be unmatched",
-                                          _1: /* End_of_format */0
-                                        }
-                                      }
-                                    }
-                                  }
-                                },
-                                _1: "Syntax error: '%s' expected, the highlighted '%s' might be unmatched"
-                              }), closing, opening), {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Syntax error: '",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
+                  hd: Curry._1(errorf(loc._0, undefined, undefined, {
+                            TAG: /* Format */0,
+                            _0: {
                               TAG: /* String_literal */11,
-                              _0: "' expected",
-                              _1: /* End_of_format */0
+                              _0: "This '",
+                              _1: {
+                                TAG: /* String */2,
+                                _0: /* No_padding */0,
+                                _1: {
+                                  TAG: /* String_literal */11,
+                                  _0: "' might be unmatched",
+                                  _1: /* End_of_format */0
+                                }
+                              }
+                            },
+                            _1: "This '%s' might be unmatched"
+                          }), opening),
+                  tl: /* [] */0
+                }, Curry._2(Stdlib__Printf.sprintf({
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* String_literal */11,
+                            _0: "Syntax error: '",
+                            _1: {
+                              TAG: /* String */2,
+                              _0: /* No_padding */0,
+                              _1: {
+                                TAG: /* String_literal */11,
+                                _0: "' expected, the highlighted '",
+                                _1: {
+                                  TAG: /* String */2,
+                                  _0: /* No_padding */0,
+                                  _1: {
+                                    TAG: /* String_literal */11,
+                                    _0: "' might be unmatched",
+                                    _1: /* End_of_format */0
+                                  }
+                                }
+                              }
                             }
-                          }
-                        },
-                        _1: "Syntax error: '%s' expected"
-                      }), closing);
+                          },
+                          _1: "Syntax error: '%s' expected, the highlighted '%s' might be unmatched"
+                        }), closing, opening), {
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Syntax error: '",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: "' expected",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Syntax error: '%s' expected"
+                }), closing);
     case /* Expecting */1 :
         return Curry._1(errorf(loc._0, undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Syntax error: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: " expected.",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "Syntax error: %s expected."
-                      }), loc._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Syntax error: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " expected.",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Syntax error: %s expected."
+                }), loc._1);
     case /* Not_expecting */2 :
         return Curry._1(errorf(loc._0, undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "Syntax error: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: " not expected.",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "Syntax error: %s not expected."
-                      }), loc._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "Syntax error: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " not expected.",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "Syntax error: %s not expected."
+                }), loc._1);
     case /* Applicative_path */3 :
         return errorf(loc._0, undefined, undefined, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "Syntax error: applicative paths of the form F(X).t are not supported when the option -no-app-func is set.",
-                      _1: /* End_of_format */0
-                    },
-                    _1: "Syntax error: applicative paths of the form F(X).t are not supported when the option -no-app-func is set."
-                  });
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "Syntax error: applicative paths of the form F(X).t are not supported when the option -no-app-func is set.",
+                _1: /* End_of_format */0
+              },
+              _1: "Syntax error: applicative paths of the form F(X).t are not supported when the option -no-app-func is set."
+            });
     case /* Variable_in_scope */4 :
         const $$var = loc._1;
         return Curry._2(errorf(loc._0, undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "In this scoped type, variable '",
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "In this scoped type, variable '",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* String_literal */11,
+                        _0: " is reserved for the local type ",
+                        _1: {
+                          TAG: /* String */2,
+                          _0: /* No_padding */0,
                           _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* String_literal */11,
-                              _0: " is reserved for the local type ",
-                              _1: {
-                                TAG: /* String */2,
-                                _0: /* No_padding */0,
-                                _1: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* '.' */46,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Char_literal */12,
+                            _0: /* '.' */46,
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "In this scoped type, variable '%s is reserved for the local type %s."
-                      }), $$var, $$var);
+                        }
+                      }
+                    }
+                  },
+                  _1: "In this scoped type, variable '%s is reserved for the local type %s."
+                }), $$var, $$var);
     case /* Other */5 :
         return errorf(loc._0, undefined, undefined, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "Syntax error",
-                      _1: /* End_of_format */0
-                    },
-                    _1: "Syntax error"
-                  });
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "Syntax error",
+                _1: /* End_of_format */0
+              },
+              _1: "Syntax error"
+            });
     case /* Ill_formed_ast */6 :
         return Curry._1(errorf(loc._0, undefined, undefined, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "broken invariant in parsetree: ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: /* End_of_format */0
-                          }
-                        },
-                        _1: "broken invariant in parsetree: %s"
-                      }), loc._1);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "broken invariant in parsetree: ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: /* End_of_format */0
+                    }
+                  },
+                  _1: "broken invariant in parsetree: %s"
+                }), loc._1);
     
   }
 }
@@ -6783,13 +6783,13 @@ function location_of_error(param) {
 
 function ill_formed_ast(loc, s) {
   throw new Caml_js_exceptions.MelangeError($$Error$1, {
-            MEL_EXN_ID: $$Error$1,
-            _1: {
-              TAG: /* Ill_formed_ast */6,
-              _0: loc,
-              _1: s
-            }
-          });
+        MEL_EXN_ID: $$Error$1,
+        _1: {
+          TAG: /* Ill_formed_ast */6,
+          _0: loc,
+          _1: s
+        }
+      });
 }
 
 const Syntaxerr = {
@@ -6854,63 +6854,63 @@ function mkoption(d) {
     loc_ghost: true
   };
   return mk(loc, undefined, {
-              TAG: /* Ptyp_constr */3,
-              _0: {
-                txt: {
-                  TAG: /* Ldot */1,
-                  _0: {
-                    TAG: /* Lident */0,
-                    _0: "*predef*"
-                  },
-                  _1: "option"
-                },
-                loc: loc
-              },
-              _1: {
-                hd: d,
-                tl: /* [] */0
-              }
-            });
+        TAG: /* Ptyp_constr */3,
+        _0: {
+          txt: {
+            TAG: /* Ldot */1,
+            _0: {
+              TAG: /* Lident */0,
+              _0: "*predef*"
+            },
+            _1: "option"
+          },
+          loc: loc
+        },
+        _1: {
+          hd: d,
+          tl: /* [] */0
+        }
+      });
 }
 
 function reloc_pat(x) {
   return {
-          ppat_desc: x.ppat_desc,
-          ppat_loc: symbol_rloc(undefined),
-          ppat_attributes: x.ppat_attributes
-        };
+    ppat_desc: x.ppat_desc,
+    ppat_loc: symbol_rloc(undefined),
+    ppat_attributes: x.ppat_attributes
+  };
 }
 
 function reloc_exp(x) {
   return {
-          pexp_desc: x.pexp_desc,
-          pexp_loc: symbol_rloc(undefined),
-          pexp_attributes: x.pexp_attributes
-        };
+    pexp_desc: x.pexp_desc,
+    pexp_loc: symbol_rloc(undefined),
+    pexp_attributes: x.pexp_attributes
+  };
 }
 
 function mkoperator(name, pos) {
   const loc = rhs_loc(pos);
   return Curry._3(Ast_helper_Exp.mk, loc, undefined, {
-              TAG: /* Pexp_ident */0,
-              _0: {
-                txt: {
-                  TAG: /* Lident */0,
-                  _0: name
-                },
-                loc: loc
-              }
-            });
+        TAG: /* Pexp_ident */0,
+        _0: {
+          txt: {
+            TAG: /* Lident */0,
+            _0: name
+          },
+          loc: loc
+        }
+      });
 }
 
 function mkpatvar(name, pos) {
   return mk$1(rhs_loc(pos), undefined, {
-              TAG: /* Ppat_var */0,
-              _0: {
-                txt: name,
-                loc: rhs_loc(pos)
-              }
-            });
+        TAG: /* Ppat_var */0,
+        _0: {
+          txt: name,
+          loc: rhs_loc(pos)
+        }
+      });
 }
 
 function ghexp(d) {
@@ -6927,22 +6927,22 @@ function ghtyp(d) {
 
 function mkinfix(arg1, name, arg2) {
   return mkexp({
-              TAG: /* Pexp_apply */5,
-              _0: mkoperator(name, 2),
-              _1: {
-                hd: [
-                  "",
-                  arg1
-                ],
-                tl: {
-                  hd: [
-                    "",
-                    arg2
-                  ],
-                  tl: /* [] */0
-                }
-              }
-            });
+        TAG: /* Pexp_apply */5,
+        _0: mkoperator(name, 2),
+        _1: {
+          hd: [
+            "",
+            arg1
+          ],
+          tl: {
+            hd: [
+              "",
+              arg2
+            ],
+            tl: /* [] */0
+          }
+        }
+      });
 }
 
 function neg_float_string(f) {
@@ -6955,30 +6955,30 @@ function neg_float_string(f) {
 
 function mkexp_cons(consloc, args, loc) {
   return Curry._3(Ast_helper_Exp.mk, loc, undefined, {
-              TAG: /* Pexp_construct */9,
-              _0: {
-                txt: {
-                  TAG: /* Lident */0,
-                  _0: "::"
-                },
-                loc: consloc
-              },
-              _1: args
-            });
+        TAG: /* Pexp_construct */9,
+        _0: {
+          txt: {
+            TAG: /* Lident */0,
+            _0: "::"
+          },
+          loc: consloc
+        },
+        _1: args
+      });
 }
 
 function mkpat_cons(consloc, args, loc) {
   return mk$1(loc, undefined, {
-              TAG: /* Ppat_construct */5,
-              _0: {
-                txt: {
-                  TAG: /* Lident */0,
-                  _0: "::"
-                },
-                loc: consloc
-              },
-              _1: args
-            });
+        TAG: /* Ppat_construct */5,
+        _0: {
+          txt: {
+            TAG: /* Lident */0,
+            _0: "::"
+          },
+          loc: consloc
+        },
+        _1: args
+      });
 }
 
 function mktailexp(nilloc, param) {
@@ -7003,10 +7003,10 @@ function mktailexp(nilloc, param) {
           }
         });
     return mkexp_cons({
-                loc_start: loc_loc_start,
-                loc_end: loc_loc_end,
-                loc_ghost: true
-              }, arg, loc);
+          loc_start: loc_loc_start,
+          loc_end: loc_loc_end,
+          loc_ghost: true
+        }, arg, loc);
   }
   const loc_loc_start$1 = nilloc.loc_start;
   const loc_loc_end$1 = nilloc.loc_end;
@@ -7024,10 +7024,10 @@ function mktailexp(nilloc, param) {
     loc: loc$1
   };
   return Curry._3(Ast_helper_Exp.mk, loc$1, undefined, {
-              TAG: /* Pexp_construct */9,
-              _0: nil,
-              _1: undefined
-            });
+        TAG: /* Pexp_construct */9,
+        _0: nil,
+        _1: undefined
+      });
 }
 
 function mktailpat(nilloc, param) {
@@ -7052,10 +7052,10 @@ function mktailpat(nilloc, param) {
           }
         });
     return mkpat_cons({
-                loc_start: loc_loc_start,
-                loc_end: loc_loc_end,
-                loc_ghost: true
-              }, arg, loc);
+          loc_start: loc_loc_start,
+          loc_end: loc_loc_end,
+          loc_ghost: true
+        }, arg, loc);
   }
   const loc_loc_start$1 = nilloc.loc_start;
   const loc_loc_end$1 = nilloc.loc_end;
@@ -7073,21 +7073,21 @@ function mktailpat(nilloc, param) {
     loc: loc$1
   };
   return mk$1(loc$1, undefined, {
-              TAG: /* Ppat_construct */5,
-              _0: nil,
-              _1: undefined
-            });
+        TAG: /* Ppat_construct */5,
+        _0: nil,
+        _1: undefined
+      });
 }
 
 function mkstrexp(e, attrs) {
   return {
-          pstr_desc: {
-            TAG: /* Pstr_eval */0,
-            _0: e,
-            _1: attrs
-          },
-          pstr_loc: e.pexp_loc
-        };
+    pstr_desc: {
+      TAG: /* Pstr_eval */0,
+      _0: e,
+      _1: attrs
+    },
+    pstr_loc: e.pexp_loc
+  };
 }
 
 function mkexp_constraint(e, param) {
@@ -7096,102 +7096,102 @@ function mkexp_constraint(e, param) {
   if (t1 !== undefined) {
     if (t2 !== undefined) {
       return ghexp({
-                  TAG: /* Pexp_coerce */20,
-                  _0: e,
-                  _1: t1,
-                  _2: t2
-                });
+            TAG: /* Pexp_coerce */20,
+            _0: e,
+            _1: t1,
+            _2: t2
+          });
     } else {
       return ghexp({
-                  TAG: /* Pexp_constraint */19,
-                  _0: e,
-                  _1: t1
-                });
+            TAG: /* Pexp_constraint */19,
+            _0: e,
+            _1: t1
+          });
     }
   }
   if (t2 !== undefined) {
     return ghexp({
-                TAG: /* Pexp_coerce */20,
-                _0: e,
-                _1: t1,
-                _2: t2
-              });
+          TAG: /* Pexp_coerce */20,
+          _0: e,
+          _1: t1,
+          _2: t2
+        });
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "parsing/parser.mly",
-              153,
-              18
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "parsing/parser.mly",
+          153,
+          18
+        ]
+      });
 }
 
 function array_function(str, name) {
   return {
-          txt: {
-            TAG: /* Ldot */1,
-            _0: {
-              TAG: /* Lident */0,
-              _0: str
-            },
-            _1: fast.contents ? "unsafe_" + name : name
-          },
-          loc: symbol_gloc(undefined)
-        };
+    txt: {
+      TAG: /* Ldot */1,
+      _0: {
+        TAG: /* Lident */0,
+        _0: str
+      },
+      _1: fast.contents ? "unsafe_" + name : name
+    },
+    loc: symbol_gloc(undefined)
+  };
 }
 
 function unclosed(opening_name, opening_num, closing_name, closing_num) {
   throw new Caml_js_exceptions.MelangeError($$Error$1, {
-            MEL_EXN_ID: $$Error$1,
-            _1: {
-              TAG: /* Unclosed */0,
-              _0: rhs_loc(opening_num),
-              _1: opening_name,
-              _2: rhs_loc(closing_num),
-              _3: closing_name
-            }
-          });
+        MEL_EXN_ID: $$Error$1,
+        _1: {
+          TAG: /* Unclosed */0,
+          _0: rhs_loc(opening_num),
+          _1: opening_name,
+          _2: rhs_loc(closing_num),
+          _3: closing_name
+        }
+      });
 }
 
 function expecting(pos, nonterm) {
   throw new Caml_js_exceptions.MelangeError($$Error$1, {
-            MEL_EXN_ID: $$Error$1,
-            _1: {
-              TAG: /* Expecting */1,
-              _0: rhs_loc(pos),
-              _1: nonterm
-            }
-          });
+        MEL_EXN_ID: $$Error$1,
+        _1: {
+          TAG: /* Expecting */1,
+          _0: rhs_loc(pos),
+          _1: nonterm
+        }
+      });
 }
 
 function not_expecting(pos, nonterm) {
   throw new Caml_js_exceptions.MelangeError($$Error$1, {
-            MEL_EXN_ID: $$Error$1,
-            _1: {
-              TAG: /* Not_expecting */2,
-              _0: rhs_loc(pos),
-              _1: nonterm
-            }
-          });
+        MEL_EXN_ID: $$Error$1,
+        _1: {
+          TAG: /* Not_expecting */2,
+          _0: rhs_loc(pos),
+          _1: nonterm
+        }
+      });
 }
 
 function bigarray_function(str, name) {
   return {
-          txt: {
-            TAG: /* Ldot */1,
-            _0: {
-              TAG: /* Ldot */1,
-              _0: {
-                TAG: /* Lident */0,
-                _0: "Bigarray"
-              },
-              _1: str
-            },
-            _1: name
-          },
-          loc: symbol_gloc(undefined)
-        };
+    txt: {
+      TAG: /* Ldot */1,
+      _0: {
+        TAG: /* Ldot */1,
+        _0: {
+          TAG: /* Lident */0,
+          _0: "Bigarray"
+        },
+        _1: str
+      },
+      _1: name
+    },
+    loc: symbol_gloc(undefined)
+  };
 }
 
 function bigarray_untuplify(exp) {
@@ -7200,9 +7200,9 @@ function bigarray_untuplify(exp) {
     return explist._0;
   } else {
     return {
-            hd: exp,
-            tl: /* [] */0
-          };
+      hd: exp,
+      tl: /* [] */0
+    };
   }
 }
 
@@ -7212,23 +7212,23 @@ function exp_of_label(lbl, pos) {
     _0: last(lbl)
   };
   return mkexp({
-              TAG: /* Pexp_ident */0,
-              _0: {
-                txt: rhs,
-                loc: rhs_loc(pos)
-              }
-            });
+        TAG: /* Pexp_ident */0,
+        _0: {
+          txt: rhs,
+          loc: rhs_loc(pos)
+        }
+      });
 }
 
 function pat_of_label(lbl, pos) {
   const rhs = last(lbl);
   return mkpat({
-              TAG: /* Ppat_var */0,
-              _0: {
-                txt: rhs,
-                loc: rhs_loc(pos)
-              }
-            });
+        TAG: /* Ppat_var */0,
+        _0: {
+          txt: rhs,
+          loc: rhs_loc(pos)
+        }
+      });
 }
 
 function check_variable(vl, loc, v) {
@@ -7236,13 +7236,13 @@ function check_variable(vl, loc, v) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError($$Error$1, {
-            MEL_EXN_ID: $$Error$1,
-            _1: {
-              TAG: /* Variable_in_scope */4,
-              _0: loc,
-              _1: v
-            }
-          });
+        MEL_EXN_ID: $$Error$1,
+        _1: {
+          TAG: /* Variable_in_scope */4,
+          _0: loc,
+          _1: v
+        }
+      });
 }
 
 function varify_constructors(var_names, t) {
@@ -7314,10 +7314,10 @@ function varify_constructors(var_names, t) {
               TAG: /* Ptyp_object */4,
               _0: Stdlib__List.map((function (param) {
                       return [
-                              param[0],
-                              param[1],
-                              loop(param[2])
-                            ];
+                        param[0],
+                        param[1],
+                        loop(param[2])
+                      ];
                     }), x._0),
               _1: x._1
             };
@@ -7366,9 +7366,9 @@ function varify_constructors(var_names, t) {
                 match[0],
                 Stdlib__List.map((function (param) {
                         return [
-                                param[0],
-                                loop(param[1])
-                              ];
+                          param[0],
+                          loop(param[1])
+                        ];
                       }), match[1])
               ]
             };
@@ -7387,25 +7387,25 @@ function varify_constructors(var_names, t) {
       }
     }
     return {
-            ptyp_desc: desc,
-            ptyp_loc: t.ptyp_loc,
-            ptyp_attributes: t.ptyp_attributes
-          };
+      ptyp_desc: desc,
+      ptyp_loc: t.ptyp_loc,
+      ptyp_attributes: t.ptyp_attributes
+    };
   };
   const loop_row_field = function (t) {
     if (t.TAG === /* Rtag */0) {
       return {
-              TAG: /* Rtag */0,
-              _0: t._0,
-              _1: t._1,
-              _2: t._2,
-              _3: Stdlib__List.map(loop, t._3)
-            };
+        TAG: /* Rtag */0,
+        _0: t._0,
+        _1: t._1,
+        _2: t._2,
+        _3: Stdlib__List.map(loop, t._3)
+      };
     } else {
       return {
-              TAG: /* Rinherit */1,
-              _0: loop(t._0)
-            };
+        TAG: /* Rinherit */1,
+        _0: loop(t._0)
+      };
     }
   };
   return loop(t);
@@ -7419,19 +7419,19 @@ function wrap_type_annotation(newtypes, core_type, body) {
       });
   const exp$1 = Stdlib__List.fold_right((function (newtype, exp) {
           return mkexp({
-                      TAG: /* Pexp_newtype */30,
-                      _0: newtype,
-                      _1: exp
-                    });
+                TAG: /* Pexp_newtype */30,
+                _0: newtype,
+                _1: exp
+              });
         }), newtypes, exp);
   return [
-          exp$1,
-          ghtyp({
-                TAG: /* Ptyp_poly */8,
-                _0: newtypes,
-                _1: varify_constructors(newtypes, core_type)
-              })
-        ];
+    exp$1,
+    ghtyp({
+          TAG: /* Ptyp_poly */8,
+          _0: newtypes,
+          _1: varify_constructors(newtypes, core_type)
+        })
+  ];
 }
 
 function wrap_exp_attrs(body, param) {
@@ -7446,18 +7446,18 @@ function wrap_exp_attrs(body, param) {
   };
   if (ext !== undefined) {
     return ghexp({
-                TAG: /* Pexp_extension */33,
-                _0: [
-                  ext,
-                  {
-                    TAG: /* PStr */0,
-                    _0: {
-                      hd: mkstrexp(body$1, /* [] */0),
-                      tl: /* [] */0
-                    }
-                  }
-                ]
-              });
+          TAG: /* Pexp_extension */33,
+          _0: [
+            ext,
+            {
+              TAG: /* PStr */0,
+              _0: {
+                hd: mkstrexp(body$1, /* [] */0),
+                tl: /* [] */0
+              }
+            }
+          ]
+        });
   } else {
     return body$1;
   }
@@ -7465,12 +7465,12 @@ function wrap_exp_attrs(body, param) {
 
 function text_def(pos) {
   return {
-          hd: {
-            TAG: /* Ptop_def */0,
-            _0: text$1(get_text(Stdlib__Parsing.rhs_start_pos(pos)))
-          },
-          tl: /* [] */0
-        };
+    hd: {
+      TAG: /* Ptop_def */0,
+      _0: text$1(get_text(Stdlib__Parsing.rhs_start_pos(pos)))
+    },
+    tl: /* [] */0
+  };
 }
 
 function extra_text(text, pos, items) {
@@ -7497,26 +7497,26 @@ function add_nonrec(rf, attrs, pos) {
     loc: name_loc
   };
   return {
-          hd: [
-            name,
-            {
-              TAG: /* PStr */0,
-              _0: /* [] */0
-            }
-          ],
-          tl: attrs
-        };
+    hd: [
+      name,
+      {
+        TAG: /* PStr */0,
+        _0: /* [] */0
+      }
+    ],
+    tl: attrs
+  };
 }
 
 function mklb(param, attrs) {
   return {
-          lb_pattern: param[0],
-          lb_expression: param[1],
-          lb_attributes: attrs,
-          lb_docs: symbol_docs_lazy(undefined),
-          lb_text: symbol_text_lazy(undefined),
-          lb_loc: symbol_rloc(undefined)
-        };
+    lb_pattern: param[0],
+    lb_expression: param[1],
+    lb_attributes: attrs,
+    lb_docs: symbol_docs_lazy(undefined),
+    lb_text: symbol_text_lazy(undefined),
+    lb_loc: symbol_rloc(undefined)
+  };
 }
 
 const yytransl_const = [
@@ -7651,9 +7651,9 @@ const yytransl_block = [
 const yyact = [
   (function (param) {
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: "parser"
-              });
+            MEL_EXN_ID: "Failure",
+            _1: "parser"
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -7666,25 +7666,25 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return {
-              TAG: /* Ptop_def */0,
-              _0: extra_text(text$1, 1, _1)
-            };
+        TAG: /* Ptop_def */0,
+        _0: extra_text(text$1, 1, _1)
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib.End_of_file, {
-                MEL_EXN_ID: Stdlib.End_of_file
-              });
+            MEL_EXN_ID: Stdlib.End_of_file
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text$1(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: mkstrexp(_1, _2),
-                  tl: /* [] */0
-                });
+            hd: mkstrexp(_1, _2),
+            tl: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -7696,22 +7696,22 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text$1(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: _1,
-                  tl: _2
-                });
+            hd: _1,
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       let pos = 1;
       return extra_text((function (txt) {
-                    return {
-                            hd: {
-                              TAG: /* Ptop_def */0,
-                              _0: text$1(txt)
-                            },
-                            tl: /* [] */0
-                          };
-                  }), pos, _1);
+              return {
+                hd: {
+                  TAG: /* Ptop_def */0,
+                  _0: text$1(txt)
+                },
+                tl: /* [] */0
+              };
+            }), pos, _1);
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -7721,15 +7721,15 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text_def(1), {
-                  hd: {
-                    TAG: /* Ptop_def */0,
-                    _0: {
-                      hd: mkstrexp(_1, _2),
-                      tl: /* [] */0
-                    }
-                  },
-                  tl: _3
-                });
+            hd: {
+              TAG: /* Ptop_def */0,
+              _0: {
+                hd: mkstrexp(_1, _2),
+                tl: /* [] */0
+              }
+            },
+            tl: _3
+          });
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -7743,61 +7743,61 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_rhs_docs(2, 3);
       return Stdlib.$at(text_def(1), Stdlib.$at(text_def(2), {
-                      hd: {
-                        TAG: /* Ptop_def */0,
-                        _0: {
-                          hd: mkstrexp(_2, _3),
-                          tl: /* [] */0
-                        }
-                      },
-                      tl: _4
-                    }));
+                hd: {
+                  TAG: /* Ptop_def */0,
+                  _0: {
+                    hd: mkstrexp(_2, _3),
+                    tl: /* [] */0
+                  }
+                },
+                tl: _4
+              }));
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text_def(1), Stdlib.$at(text_def(2), {
-                      hd: {
-                        TAG: /* Ptop_def */0,
-                        _0: {
-                          hd: _2,
-                          tl: /* [] */0
-                        }
-                      },
-                      tl: _3
-                    }));
+                hd: {
+                  TAG: /* Ptop_def */0,
+                  _0: {
+                    hd: _2,
+                    tl: /* [] */0
+                  }
+                },
+                tl: _3
+              }));
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_rhs_docs(2, 3);
       return Stdlib.$at(text_def(1), Stdlib.$at(text_def(2), {
-                      hd: _2,
-                      tl: _3
-                    }));
+                hd: _2,
+                tl: _3
+              }));
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text_def(1), {
-                  hd: {
-                    TAG: /* Ptop_def */0,
-                    _0: {
-                      hd: _1,
-                      tl: /* [] */0
-                    }
-                  },
-                  tl: _2
-                });
+            hd: {
+              TAG: /* Ptop_def */0,
+              _0: {
+                hd: _1,
+                tl: /* [] */0
+              }
+            },
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_rhs_docs(1, 1);
       return Stdlib.$at(text_def(1), {
-                  hd: _1,
-                  tl: _2
-                });
+            hd: _1,
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -7810,23 +7810,23 @@ const yyact = [
     }),
   (function (__caml_parser_env) {
       return [
-              {
-                txt: "*",
-                loc: rhs_loc(2)
-              },
-              undefined
-            ];
+        {
+          txt: "*",
+          loc: rhs_loc(2)
+        },
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              {
-                txt: _2,
-                loc: rhs_loc(2)
-              },
-              _4
-            ];
+        {
+          txt: _2,
+          loc: rhs_loc(2)
+        },
+        _4
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -7838,33 +7838,33 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmod({
-                  TAG: /* Pmod_ident */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Pmod_ident */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_structure */1,
-                  _0: extra_text(text$1, 2, _2)
-                });
+            TAG: /* Pmod_structure */1,
+            _0: extra_text(text$1, 2, _2)
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -7874,33 +7874,33 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib__List.fold_left((function (acc, param) {
-                    return mkmod({
-                                TAG: /* Pmod_functor */2,
-                                _0: param[0],
-                                _1: param[1],
-                                _2: acc
-                              });
-                  }), _4, _2);
+              return mkmod({
+                    TAG: /* Pmod_functor */2,
+                    _0: param[0],
+                    _1: param[1],
+                    _2: acc
+                  });
+            }), _4, _2);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_apply */3,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Pmod_apply */3,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       return mkmod({
-                  TAG: /* Pmod_apply */3,
-                  _0: _1,
-                  _1: mkmod({
-                        TAG: /* Pmod_structure */1,
-                        _0: /* [] */0
-                      })
-                });
+            TAG: /* Pmod_apply */3,
+            _0: _1,
+            _1: mkmod({
+                  TAG: /* Pmod_structure */1,
+                  _0: /* [] */0
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -7911,10 +7911,10 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_constraint */4,
-                  _0: _2,
-                  _1: _4
-                });
+            TAG: /* Pmod_constraint */4,
+            _0: _2,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -7931,60 +7931,60 @@ const yyact = [
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_unpack */5,
-                  _0: _3
-                });
+            TAG: /* Pmod_unpack */5,
+            _0: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_unpack */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_constraint */19,
-                        _0: _3,
-                        _1: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _5
-                            })
-                      })
-                });
+            TAG: /* Pmod_unpack */5,
+            _0: ghexp({
+                  TAG: /* Pexp_constraint */19,
+                  _0: _3,
+                  _1: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _5
+                      })
+                })
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_unpack */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_coerce */20,
-                        _0: _3,
-                        _1: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _5
-                            }),
-                        _2: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _7
-                            })
+            TAG: /* Pmod_unpack */5,
+            _0: ghexp({
+                  TAG: /* Pexp_coerce */20,
+                  _0: _3,
+                  _1: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _5
+                      }),
+                  _2: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _7
                       })
-                });
+                })
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmod({
-                  TAG: /* Pmod_unpack */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_coerce */20,
-                        _0: _3,
-                        _1: undefined,
-                        _2: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _5
-                            })
+            TAG: /* Pmod_unpack */5,
+            _0: ghexp({
+                  TAG: /* Pexp_coerce */20,
+                  _0: _3,
+                  _1: undefined,
+                  _2: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _5
                       })
-                });
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -8006,9 +8006,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmod({
-                  TAG: /* Pmod_extension */6,
-                  _0: _1
-                });
+            TAG: /* Pmod_extension */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -8016,9 +8016,9 @@ const yyact = [
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_rhs_docs(1, 2);
       return Stdlib.$at(text$1(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: mkstrexp(_1, _2),
-                  tl: _3
-                });
+            hd: mkstrexp(_1, _2),
+            tl: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -8034,9 +8034,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text$1(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: _1,
-                  tl: _2
-                });
+            hd: _1,
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       let lbs = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -8065,13 +8065,13 @@ const yyact = [
       if (exit === 1) {
         if (Caml_obj.caml_notequal(lbs.lbs_attributes, /* [] */0)) {
           throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                    MEL_EXN_ID: $$Error$1,
-                    _1: {
-                      TAG: /* Not_expecting */2,
-                      _0: lbs.lbs_loc,
-                      _1: "attributes"
-                    }
-                  });
+                MEL_EXN_ID: $$Error$1,
+                _1: {
+                  TAG: /* Not_expecting */2,
+                  _0: lbs.lbs_loc,
+                  _1: "attributes"
+                }
+              });
         }
         const bindings$1 = Stdlib__List.map((function (lb) {
                 return mk$17(lb.lb_loc, lb.lb_attributes, CamlinternalLazy.force(lb.lb_docs), CamlinternalLazy.force(lb.lb_text), lb.lb_pattern, lb.lb_expression);
@@ -8106,96 +8106,96 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_primitive */2,
-                  _0: _1
-                });
+            TAG: /* Pstr_primitive */2,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_type */3,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pstr_type */3,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_typext */4,
-                  _0: _1
-                });
+            TAG: /* Pstr_typext */4,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_exception */5,
-                  _0: _1
-                });
+            TAG: /* Pstr_exception */5,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_module */6,
-                  _0: _1
-                });
+            TAG: /* Pstr_module */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_recmodule */7,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pstr_recmodule */7,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_modtype */8,
-                  _0: _1
-                });
+            TAG: /* Pstr_modtype */8,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_open */9,
-                  _0: _1
-                });
+            TAG: /* Pstr_open */9,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_class */10,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pstr_class */10,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_class_type */11,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pstr_class_type */11,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_include */12,
-                  _0: _1
-                });
+            TAG: /* Pstr_include */12,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkstr({
-                  TAG: /* Pstr_extension */14,
-                  _0: _1,
-                  _1: add_docs_attrs(symbol_docs(undefined), _2)
-                });
+            TAG: /* Pstr_extension */14,
+            _0: _1,
+            _1: add_docs_attrs(symbol_docs(undefined), _2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_symbol_docs(undefined);
       return mkstr({
-                  TAG: /* Pstr_attribute */13,
-                  _0: _1
-                });
+            TAG: /* Pstr_attribute */13,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -8209,79 +8209,79 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmod({
-                  TAG: /* Pmod_constraint */4,
-                  _0: _4,
-                  _1: _2
-                });
+            TAG: /* Pmod_constraint */4,
+            _0: _4,
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmod({
-                  TAG: /* Pmod_functor */2,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _2
-                });
+            TAG: /* Pmod_functor */2,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$14(symbol_rloc(undefined), _4, symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _3);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _3);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$14(symbol_rloc(undefined), _5, symbol_docs(undefined), undefined, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                }, _4);
+            txt: _3,
+            loc: rhs_loc(3)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$14(symbol_rloc(undefined), _4, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _3);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _3);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_ident */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Pmty_ident */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkmty({
-                  TAG: /* Pmty_signature */1,
-                  _0: extra_text(text, 2, _2)
-                });
+            TAG: /* Pmty_signature */1,
+            _0: extra_text(text, 2, _2)
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -8291,29 +8291,29 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib__List.fold_left((function (acc, param) {
-                    return mkmty({
-                                TAG: /* Pmty_functor */2,
-                                _0: param[0],
-                                _1: param[1],
-                                _2: acc
-                              });
-                  }), _4, _2);
+              return mkmty({
+                    TAG: /* Pmty_functor */2,
+                    _0: param[0],
+                    _1: param[1],
+                    _2: acc
+                  });
+            }), _4, _2);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_with */3,
-                  _0: _1,
-                  _1: Stdlib__List.rev(_3)
-                });
+            TAG: /* Pmty_with */3,
+            _0: _1,
+            _1: Stdlib__List.rev(_3)
+          });
     }),
   (function (__caml_parser_env) {
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_typeof */4,
-                  _0: _4
-                });
+            TAG: /* Pmty_typeof */4,
+            _0: _4
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -8325,9 +8325,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_extension */5,
-                  _0: _1
-                });
+            TAG: /* Pmty_extension */5,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -8345,126 +8345,126 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at(text(get_text(Stdlib__Parsing.rhs_start_pos(1))), {
-                  hd: _1,
-                  tl: _2
-                });
+            hd: _1,
+            tl: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_value */0,
-                  _0: _1
-                });
+            TAG: /* Psig_value */0,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_value */0,
-                  _0: _1
-                });
+            TAG: /* Psig_value */0,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_type */1,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Psig_type */1,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_typext */2,
-                  _0: _1
-                });
+            TAG: /* Psig_typext */2,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_exception */3,
-                  _0: _1
-                });
+            TAG: /* Psig_exception */3,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_module */4,
-                  _0: _1
-                });
+            TAG: /* Psig_module */4,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_module */4,
-                  _0: _1
-                });
+            TAG: /* Psig_module */4,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_recmodule */5,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Psig_recmodule */5,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_modtype */6,
-                  _0: _1
-                });
+            TAG: /* Psig_modtype */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_open */7,
-                  _0: _1
-                });
+            TAG: /* Psig_open */7,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_include */8,
-                  _0: _1
-                });
+            TAG: /* Psig_include */8,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_class */9,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Psig_class */9,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_class_type */10,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Psig_class_type */10,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mksig({
-                  TAG: /* Psig_extension */12,
-                  _0: _1,
-                  _1: add_docs_attrs(symbol_docs(undefined), _2)
-                });
+            TAG: /* Psig_extension */12,
+            _0: _1,
+            _1: add_docs_attrs(symbol_docs(undefined), _2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_symbol_docs(undefined);
       return mksig({
-                  TAG: /* Psig_attribute */11,
-                  _0: _1
-                });
+            TAG: /* Psig_attribute */11,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$15(symbol_rloc(undefined), _4, symbol_docs(undefined), _2, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                });
+            txt: _3,
+            loc: rhs_loc(3)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -8479,80 +8479,80 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_functor */2,
-                  _0: {
-                    txt: _2,
-                    loc: rhs_loc(2)
-                  },
-                  _1: _4,
-                  _2: _6
-                });
+            TAG: /* Pmty_functor */2,
+            _0: {
+              txt: _2,
+              loc: rhs_loc(2)
+            },
+            _1: _4,
+            _2: _6
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkmty({
-                  TAG: /* Pmty_functor */2,
-                  _0: {
-                    txt: "*",
-                    loc: rhs_loc(1)
-                  },
-                  _1: undefined,
-                  _2: _3
-                });
+            TAG: /* Pmty_functor */2,
+            _0: {
+              txt: "*",
+              loc: rhs_loc(1)
+            },
+            _1: undefined,
+            _2: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$12(symbol_rloc(undefined), _4, symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _3);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _3);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$12(symbol_rloc(undefined), _5, symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, alias$2(rhs_loc(4), undefined, {
-                      txt: _4,
-                      loc: rhs_loc(4)
-                    }));
+            txt: _2,
+            loc: rhs_loc(2)
+          }, alias$2(rhs_loc(4), undefined, {
+                txt: _4,
+                loc: rhs_loc(4)
+              }));
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$12(symbol_rloc(undefined), _6, symbol_docs(undefined), undefined, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                }, _5);
+            txt: _3,
+            loc: rhs_loc(3)
+          }, _5);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$12(symbol_rloc(undefined), _5, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       
@@ -8565,24 +8565,24 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$13(symbol_rloc(undefined), _5, symbol_docs(undefined), undefined, _4, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                });
+            txt: _3,
+            loc: rhs_loc(3)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -8591,9 +8591,9 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _6, symbol_docs(undefined), undefined, _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _5);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _5);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -8602,9 +8602,9 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _6, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _5);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _5);
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -8613,21 +8613,21 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_constraint */5,
-                  _0: _4,
-                  _1: _2
-                });
+            TAG: /* Pcl_constraint */5,
+            _0: _4,
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_fun */2,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _2
-                });
+            TAG: /* Pcl_fun */2,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _2
+          });
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -8639,23 +8639,23 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_fun */2,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _3
-                });
+            TAG: /* Pcl_fun */2,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_fun */2,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _2
-                });
+            TAG: /* Pcl_fun */2,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _2
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -8667,10 +8667,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_apply */3,
-                  _0: _1,
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pcl_apply */3,
+            _0: _1,
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -8678,42 +8678,42 @@ const yyact = [
       const bindings = Stdlib__List.map((function (lb) {
               if (Caml_obj.caml_notequal(lb.lb_attributes, /* [] */0)) {
                 throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                          MEL_EXN_ID: $$Error$1,
-                          _1: {
-                            TAG: /* Not_expecting */2,
-                            _0: lb.lb_loc,
-                            _1: "item attribute"
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$1,
+                      _1: {
+                        TAG: /* Not_expecting */2,
+                        _0: lb.lb_loc,
+                        _1: "item attribute"
+                      }
+                    });
               }
               return mk$17(lb.lb_loc, undefined, undefined, undefined, lb.lb_pattern, lb.lb_expression);
             }), _1.lbs_bindings);
       if (_1.lbs_extension !== undefined) {
         throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                  MEL_EXN_ID: $$Error$1,
-                  _1: {
-                    TAG: /* Not_expecting */2,
-                    _0: _1.lbs_loc,
-                    _1: "extension"
-                  }
-                });
+              MEL_EXN_ID: $$Error$1,
+              _1: {
+                TAG: /* Not_expecting */2,
+                _0: _1.lbs_loc,
+                _1: "extension"
+              }
+            });
       }
       if (Caml_obj.caml_notequal(_1.lbs_attributes, /* [] */0)) {
         throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                  MEL_EXN_ID: $$Error$1,
-                  _1: {
-                    TAG: /* Not_expecting */2,
-                    _0: _1.lbs_loc,
-                    _1: "attributes"
-                  }
-                });
+              MEL_EXN_ID: $$Error$1,
+              _1: {
+                TAG: /* Not_expecting */2,
+                _0: _1.lbs_loc,
+                _1: "attributes"
+              }
+            });
       }
       return mkclass({
-                  TAG: /* Pcl_let */4,
-                  _0: _1.lbs_rec,
-                  _1: Stdlib__List.rev(bindings),
-                  _2: _3
-                });
+            TAG: /* Pcl_let */4,
+            _0: _1.lbs_rec,
+            _1: Stdlib__List.rev(bindings),
+            _2: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -8723,39 +8723,39 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_extension */6,
-                  _0: _1
-                });
+            TAG: /* Pcl_extension */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_constr */0,
-                  _0: {
-                    txt: _4,
-                    loc: rhs_loc(4)
-                  },
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pcl_constr */0,
+            _0: {
+              txt: _4,
+              loc: rhs_loc(4)
+            },
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkclass({
-                  TAG: /* Pcl_constr */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: /* [] */0
-                });
+            TAG: /* Pcl_constr */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkclass({
-                  TAG: /* Pcl_structure */1,
-                  _0: _2
-                });
+            TAG: /* Pcl_structure */1,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -8765,10 +8765,10 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkclass({
-                  TAG: /* Pcl_constraint */5,
-                  _0: _2,
-                  _1: _4
-                });
+            TAG: /* Pcl_constraint */5,
+            _0: _2,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -8786,9 +8786,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              pcstr_self: _1,
-              pcstr_fields: extra_cstr(2, Stdlib__List.rev(_2))
-            };
+        pcstr_self: _1,
+        pcstr_fields: extra_cstr(2, Stdlib__List.rev(_2))
+      };
     }),
   (function (__caml_parser_env) {
       return reloc_pat(Stdlib__Parsing.peek_val(__caml_parser_env, 1));
@@ -8797,10 +8797,10 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_constraint */10,
-                  _0: _2,
-                  _1: _4
-                });
+            TAG: /* Ppat_constraint */10,
+            _0: _2,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       return ghpat(/* Ppat_any */0);
@@ -8812,9 +8812,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at({
-                  hd: _2,
-                  tl: Curry._1(Ast_helper_Cf.text, get_text(Stdlib__Parsing.rhs_start_pos(2)))
-                }, _1);
+            hd: _2,
+            tl: Curry._1(Ast_helper_Cf.text, get_text(Stdlib__Parsing.rhs_start_pos(2)))
+          }, _1);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -8822,59 +8822,59 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_5, symbol_docs(undefined), {
-                  TAG: /* Pcf_inherit */0,
-                  _0: _2,
-                  _1: _3,
-                  _2: _4
-                });
+            TAG: /* Pcf_inherit */0,
+            _0: _2,
+            _1: _3,
+            _2: _4
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_3, symbol_docs(undefined), {
-                  TAG: /* Pcf_val */1,
-                  _0: _2
-                });
+            TAG: /* Pcf_val */1,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_3, symbol_docs(undefined), {
-                  TAG: /* Pcf_method */2,
-                  _0: _2
-                });
+            TAG: /* Pcf_method */2,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_3, symbol_docs(undefined), {
-                  TAG: /* Pcf_constraint */3,
-                  _0: _2
-                });
+            TAG: /* Pcf_constraint */3,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_3, symbol_docs(undefined), {
-                  TAG: /* Pcf_initializer */4,
-                  _0: _2
-                });
+            TAG: /* Pcf_initializer */4,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcf(_2, symbol_docs(undefined), {
-                  TAG: /* Pcf_extension */6,
-                  _0: _1
-                });
+            TAG: /* Pcf_extension */6,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_symbol_docs(undefined);
       return mkcf(undefined, undefined, {
-                  TAG: /* Pcf_attribute */5,
-                  _0: _1
-                });
+            TAG: /* Pcf_attribute */5,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -8888,36 +8888,36 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       if (_1 === /* Override */0) {
         throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                  MEL_EXN_ID: Escape_error
-                });
+              MEL_EXN_ID: Escape_error
+            });
       }
       return [
-              {
-                txt: _4,
-                loc: rhs_loc(4)
-              },
-              /* Mutable */1,
-              {
-                TAG: /* Cfk_virtual */0,
-                _0: _6
-              }
-            ];
+        {
+          txt: _4,
+          loc: rhs_loc(4)
+        },
+        /* Mutable */1,
+        {
+          TAG: /* Cfk_virtual */0,
+          _0: _6
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_virtual */0,
-                _0: _5
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_virtual */0,
+          _0: _5
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -8925,17 +8925,17 @@ const yyact = [
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: _5
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: _5
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -8945,17 +8945,17 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       const e = mkexp_constraint(_6, _4);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: e
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: e
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -8963,20 +8963,20 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       if (_1 === /* Override */0) {
         throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                  MEL_EXN_ID: Escape_error
-                });
+              MEL_EXN_ID: Escape_error
+            });
       }
       return [
-              {
-                txt: _4,
-                loc: rhs_loc(4)
-              },
-              /* Private */0,
-              {
-                TAG: /* Cfk_virtual */0,
-                _0: _6
-              }
-            ];
+        {
+          txt: _4,
+          loc: rhs_loc(4)
+        },
+        /* Private */0,
+        {
+          TAG: /* Cfk_virtual */0,
+          _0: _6
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -8985,20 +8985,20 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       if (_1 === /* Override */0) {
         throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                  MEL_EXN_ID: Escape_error
-                });
+              MEL_EXN_ID: Escape_error
+            });
       }
       return [
-              {
-                txt: _4,
-                loc: rhs_loc(4)
-              },
-              _3,
-              {
-                TAG: /* Cfk_virtual */0,
-                _0: _6
-              }
-            ];
+        {
+          txt: _4,
+          loc: rhs_loc(4)
+        },
+        _3,
+        {
+          TAG: /* Cfk_virtual */0,
+          _0: _6
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -9006,21 +9006,21 @@ const yyact = [
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: ghexp({
-                      TAG: /* Pexp_poly */28,
-                      _0: _4,
-                      _1: undefined
-                    })
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: ghexp({
+                TAG: /* Pexp_poly */28,
+                _0: _4,
+                _1: undefined
+              })
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -9029,21 +9029,21 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: ghexp({
-                      TAG: /* Pexp_poly */28,
-                      _0: _7,
-                      _1: _5
-                    })
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: ghexp({
+                TAG: /* Pexp_poly */28,
+                _0: _7,
+                _1: _5
+              })
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 9);
@@ -9054,21 +9054,21 @@ const yyact = [
       const _10 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       const match = wrap_type_annotation(_6, _8, _10);
       return [
-              {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _2,
-              {
-                TAG: /* Cfk_concrete */1,
-                _0: _1,
-                _1: ghexp({
-                      TAG: /* Pexp_poly */28,
-                      _0: match[0],
-                      _1: match[1]
-                    })
-              }
-            ];
+        {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _2,
+        {
+          TAG: /* Cfk_concrete */1,
+          _0: _1,
+          _1: ghexp({
+                TAG: /* Pexp_poly */28,
+                _0: match[0],
+                _1: match[1]
+              })
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9078,73 +9078,73 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_arrow */2,
-                  _0: "?" + _2,
-                  _1: mkoption(_4),
-                  _2: _6
-                });
+            TAG: /* Pcty_arrow */2,
+            _0: "?" + _2,
+            _1: mkoption(_4),
+            _2: _6
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_arrow */2,
-                  _0: "?" + _1,
-                  _1: mkoption(_2),
-                  _2: _4
-                });
+            TAG: /* Pcty_arrow */2,
+            _0: "?" + _1,
+            _1: mkoption(_2),
+            _2: _4
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_arrow */2,
-                  _0: _1,
-                  _1: _3,
-                  _2: _5
-                });
+            TAG: /* Pcty_arrow */2,
+            _0: _1,
+            _1: _3,
+            _2: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_arrow */2,
-                  _0: "",
-                  _1: _1,
-                  _2: _3
-                });
+            TAG: /* Pcty_arrow */2,
+            _0: "",
+            _1: _1,
+            _2: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_constr */0,
-                  _0: {
-                    txt: _4,
-                    loc: rhs_loc(4)
-                  },
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pcty_constr */0,
+            _0: {
+              txt: _4,
+              loc: rhs_loc(4)
+            },
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_constr */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: /* [] */0
-                });
+            TAG: /* Pcty_constr */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkcty({
-                  TAG: /* Pcty_signature */1,
-                  _0: _2
-                });
+            TAG: /* Pcty_signature */1,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -9158,17 +9158,17 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkcty({
-                  TAG: /* Pcty_extension */3,
-                  _0: _1
-                });
+            TAG: /* Pcty_extension */3,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              pcsig_self: _1,
-              pcsig_fields: extra_csig(2, Stdlib__List.rev(_2))
-            };
+        pcsig_self: _1,
+        pcsig_fields: extra_csig(2, Stdlib__List.rev(_2))
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -9183,25 +9183,25 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return Stdlib.$at({
-                  hd: _2,
-                  tl: Curry._1(Ast_helper_Ctf.text, get_text(Stdlib__Parsing.rhs_start_pos(2)))
-                }, _1);
+            hd: _2,
+            tl: Curry._1(Ast_helper_Ctf.text, get_text(Stdlib__Parsing.rhs_start_pos(2)))
+          }, _1);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_3, symbol_docs(undefined), {
-                  TAG: /* Pctf_inherit */0,
-                  _0: _2
-                });
+            TAG: /* Pctf_inherit */0,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_3, symbol_docs(undefined), {
-                  TAG: /* Pctf_val */1,
-                  _0: _2
-                });
+            TAG: /* Pctf_val */1,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -9209,102 +9209,102 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_6, symbol_docs(undefined), {
-                  TAG: /* Pctf_method */2,
-                  _0: [
-                    _3,
-                    _2[0],
-                    _2[1],
-                    _5
-                  ]
-                });
+            TAG: /* Pctf_method */2,
+            _0: [
+              _3,
+              _2[0],
+              _2[1],
+              _5
+            ]
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_3, symbol_docs(undefined), {
-                  TAG: /* Pctf_constraint */3,
-                  _0: _2
-                });
+            TAG: /* Pctf_constraint */3,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkctf(_2, symbol_docs(undefined), {
-                  TAG: /* Pctf_extension */5,
-                  _0: _1
-                });
+            TAG: /* Pctf_extension */5,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       mark_symbol_docs(undefined);
       return mkctf(undefined, undefined, {
-                  TAG: /* Pctf_attribute */4,
-                  _0: _1
-                });
+            TAG: /* Pctf_attribute */4,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _3,
-              _2,
-              /* Virtual */0,
-              _5
-            ];
+        _3,
+        _2,
+        /* Virtual */0,
+        _5
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _3,
-              /* Mutable */1,
-              _2,
-              _5
-            ];
+        _3,
+        /* Mutable */1,
+        _2,
+        _5
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              /* Immutable */0,
-              /* Concrete */1,
-              _3
-            ];
+        _1,
+        /* Immutable */0,
+        /* Concrete */1,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _3,
-              symbol_rloc(undefined)
-            ];
+        _1,
+        _3,
+        symbol_rloc(undefined)
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _3
-            ];
+        _1,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -9313,9 +9313,9 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _7, symbol_docs(undefined), undefined, _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _6);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _6);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -9324,24 +9324,24 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _7, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _6);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _6);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -9350,9 +9350,9 @@ const yyact = [
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _8 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _8, symbol_docs(undefined), undefined, _3, _4, {
-                  txt: _5,
-                  loc: rhs_loc(5)
-                }, _7);
+            txt: _5,
+            loc: rhs_loc(5)
+          }, _7);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -9361,9 +9361,9 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$18(symbol_rloc(undefined), _7, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), _2, _3, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, _6);
+            txt: _4,
+            loc: rhs_loc(4)
+          }, _6);
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9375,89 +9375,89 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_sequence */16,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Pexp_sequence */16,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              "?" + _3[0],
-              _4,
-              _3[1]
-            ];
+        "?" + _3[0],
+        _4,
+        _3[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "?" + _2[0],
-              undefined,
-              _2[1]
-            ];
+        "?" + _2[0],
+        undefined,
+        _2[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              "?" + _1,
-              _4,
-              _3
-            ];
+        "?" + _1,
+        _4,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "?" + _1,
-              undefined,
-              _2
-            ];
+        "?" + _1,
+        undefined,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _3[0],
-              undefined,
-              _3[1]
-            ];
+        _3[0],
+        undefined,
+        _3[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2[0],
-              undefined,
-              _2[1]
-            ];
+        _2[0],
+        undefined,
+        _2[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              undefined,
-              _2
-            ];
+        _1,
+        undefined,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "",
-              undefined,
-              _1
-            ];
+        "",
+        undefined,
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_var */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Ppat_var */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       return mkpat(/* Ppat_any */0);
@@ -9475,26 +9475,26 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1[0],
-              mkpat({
-                    TAG: /* Ppat_constraint */10,
-                    _0: _1[1],
-                    _1: _3
-                  })
-            ];
+        _1[0],
+        mkpat({
+              TAG: /* Ppat_constraint */10,
+              _0: _1[1],
+              _1: _3
+            })
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              mkpat({
-                    TAG: /* Ppat_var */0,
-                    _0: {
-                      txt: _1,
-                      loc: rhs_loc(1)
-                    }
-                  })
-            ];
+        _1,
+        mkpat({
+              TAG: /* Ppat_var */0,
+              _0: {
+                txt: _1,
+                loc: rhs_loc(1)
+              }
+            })
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9503,10 +9503,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_constraint */10,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Ppat_constraint */10,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -9515,10 +9515,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: _1,
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pexp_apply */5,
+            _0: _1,
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -9526,13 +9526,13 @@ const yyact = [
       const bindings = Stdlib__List.map((function (lb) {
               if (Caml_obj.caml_notequal(lb.lb_attributes, /* [] */0)) {
                 throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                          MEL_EXN_ID: $$Error$1,
-                          _1: {
-                            TAG: /* Not_expecting */2,
-                            _0: lb.lb_loc,
-                            _1: "item attribute"
-                          }
-                        });
+                      MEL_EXN_ID: $$Error$1,
+                      _1: {
+                        TAG: /* Not_expecting */2,
+                        _0: lb.lb_loc,
+                        _1: "item attribute"
+                      }
+                    });
               }
               return mk$17(lb.lb_loc, undefined, undefined, undefined, lb.lb_pattern, lb.lb_expression);
             }), _1.lbs_bindings);
@@ -9545,9 +9545,9 @@ const yyact = [
         _2: _3
       };
       return wrap_exp_attrs(mkexp(d), [
-                  _1.lbs_extension,
-                  _1.lbs_attributes
-                ]);
+            _1.lbs_extension,
+            _1.lbs_attributes
+          ]);
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -9598,22 +9598,22 @@ const yyact = [
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_fun */4,
-                      _0: _3[0],
-                      _1: _3[1],
-                      _2: _3[2],
-                      _3: _4
-                    }), _2);
+                TAG: /* Pexp_fun */4,
+                _0: _3[0],
+                _1: _3[1],
+                _2: _3[2],
+                _3: _4
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_newtype */30,
-                      _0: _5,
-                      _1: _7
-                    }), _2);
+                TAG: /* Pexp_newtype */30,
+                _0: _5,
+                _1: _7
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -9645,36 +9645,36 @@ const yyact = [
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                MEL_EXN_ID: Escape_error
-              });
+            MEL_EXN_ID: Escape_error
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_tuple */8,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Pexp_tuple */8,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_construct */9,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: _2
-                });
+            TAG: /* Pexp_construct */9,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_variant */10,
-                  _0: _1,
-                  _1: _2
-                });
+            TAG: /* Pexp_variant */10,
+            _0: _1,
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -9682,32 +9682,32 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_ifthenelse */15,
-                      _0: _3,
-                      _1: _5,
-                      _2: _7
-                    }), _2);
+                TAG: /* Pexp_ifthenelse */15,
+                _0: _3,
+                _1: _5,
+                _2: _7
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_ifthenelse */15,
-                      _0: _3,
-                      _1: _5,
-                      _2: undefined
-                    }), _2);
+                TAG: /* Pexp_ifthenelse */15,
+                _0: _3,
+                _1: _5,
+                _2: undefined
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_while */17,
-                      _0: _3,
-                      _1: _5
-                    }), _2);
+                TAG: /* Pexp_while */17,
+                _0: _3,
+                _1: _5
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 8);
@@ -9717,41 +9717,41 @@ const yyact = [
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _9 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_for */18,
-                      _0: _3,
-                      _1: _5,
-                      _2: _7,
-                      _3: _6,
-                      _4: _9
-                    }), _2);
+                TAG: /* Pexp_for */18,
+                _0: _3,
+                _1: _5,
+                _2: _7,
+                _3: _6,
+                _4: _9
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp_cons(rhs_loc(2), ghexp({
-                      TAG: /* Pexp_tuple */8,
-                      _0: {
-                        hd: _1,
-                        tl: {
-                          hd: _3,
-                          tl: /* [] */0
-                        }
-                      }
-                    }), symbol_rloc(undefined));
+                TAG: /* Pexp_tuple */8,
+                _0: {
+                  hd: _1,
+                  tl: {
+                    hd: _3,
+                    tl: /* [] */0
+                  }
+                }
+              }), symbol_rloc(undefined));
     }),
   (function (__caml_parser_env) {
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp_cons(rhs_loc(2), ghexp({
-                      TAG: /* Pexp_tuple */8,
-                      _0: {
-                        hd: _5,
-                        tl: {
-                          hd: _7,
-                          tl: /* [] */0
-                        }
-                      }
-                    }), symbol_rloc(undefined));
+                TAG: /* Pexp_tuple */8,
+                _0: {
+                  hd: _5,
+                  tl: {
+                    hd: _7,
+                    tl: /* [] */0
+                  }
+                }
+              }), symbol_rloc(undefined));
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -9870,36 +9870,36 @@ const yyact = [
               switch (n.TAG) {
                 case /* Const_int */0 :
                     return mkexp({
-                                TAG: /* Pexp_constant */1,
-                                _0: {
-                                  TAG: /* Const_int */0,
-                                  _0: -n._0 | 0
-                                }
-                              });
+                          TAG: /* Pexp_constant */1,
+                          _0: {
+                            TAG: /* Const_int */0,
+                            _0: -n._0 | 0
+                          }
+                        });
                 case /* Const_int32 */4 :
                     return mkexp({
-                                TAG: /* Pexp_constant */1,
-                                _0: {
-                                  TAG: /* Const_int32 */4,
-                                  _0: -n._0 | 0
-                                }
-                              });
+                          TAG: /* Pexp_constant */1,
+                          _0: {
+                            TAG: /* Const_int32 */4,
+                            _0: -n._0 | 0
+                          }
+                        });
                 case /* Const_int64 */5 :
                     return mkexp({
-                                TAG: /* Pexp_constant */1,
-                                _0: {
-                                  TAG: /* Const_int64 */5,
-                                  _0: Caml_int64.neg(n._0)
-                                }
-                              });
+                          TAG: /* Pexp_constant */1,
+                          _0: {
+                            TAG: /* Const_int64 */5,
+                            _0: Caml_int64.neg(n._0)
+                          }
+                        });
                 case /* Const_nativeint */6 :
                     return mkexp({
-                                TAG: /* Pexp_constant */1,
-                                _0: {
-                                  TAG: /* Const_nativeint */6,
-                                  _0: Caml_external_polyfill.resolve("nativeint_neg")(n._0)
-                                }
-                              });
+                          TAG: /* Pexp_constant */1,
+                          _0: {
+                            TAG: /* Const_nativeint */6,
+                            _0: Caml_external_polyfill.resolve("nativeint_neg")(n._0)
+                          }
+                        });
                 default:
                   exit = 2;
               }
@@ -9917,26 +9917,26 @@ const yyact = [
         const f = match._0;
         if (f.TAG === /* Const_float */3) {
           return mkexp({
-                      TAG: /* Pexp_constant */1,
-                      _0: {
-                        TAG: /* Const_float */3,
-                        _0: neg_float_string(f._0)
-                      }
-                    });
+                TAG: /* Pexp_constant */1,
+                _0: {
+                  TAG: /* Const_float */3,
+                  _0: neg_float_string(f._0)
+                }
+              });
         }
         
       }
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: mkoperator("~" + _1, 1),
-                  _1: {
-                    hd: [
-                      "",
-                      _2
-                    ],
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: mkoperator("~" + _1, 1),
+            _1: {
+              hd: [
+                "",
+                _2
+              ],
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -9969,92 +9969,92 @@ const yyact = [
         return mkexp(desc);
       }
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: mkoperator("~" + _1, 1),
-                  _1: {
-                    hd: [
-                      "",
-                      _2
-                    ],
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: mkoperator("~" + _1, 1),
+            _1: {
+              hd: [
+                "",
+                _2
+              ],
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_setfield */13,
-                  _0: _1,
-                  _1: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  },
-                  _2: _5
-                });
+            TAG: /* Pexp_setfield */13,
+            _0: _1,
+            _1: {
+              txt: _3,
+              loc: rhs_loc(3)
+            },
+            _2: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: array_function("Array", "set")
-                      }),
-                  _1: {
-                    hd: [
-                      "",
-                      _1
-                    ],
-                    tl: {
-                      hd: [
-                        "",
-                        _4
-                      ],
-                      tl: {
-                        hd: [
-                          "",
-                          _7
-                        ],
-                        tl: /* [] */0
-                      }
-                    }
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: array_function("Array", "set")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  _4
+                ],
+                tl: {
+                  hd: [
+                    "",
+                    _7
+                  ],
+                  tl: /* [] */0
+                }
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: array_function("String", "set")
-                      }),
-                  _1: {
-                    hd: [
-                      "",
-                      _1
-                    ],
-                    tl: {
-                      hd: [
-                        "",
-                        _4
-                      ],
-                      tl: {
-                        hd: [
-                          "",
-                          _7
-                        ],
-                        tl: /* [] */0
-                      }
-                    }
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: array_function("String", "set")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  _4
+                ],
+                tl: {
+                  hd: [
+                    "",
+                    _7
+                  ],
+                  tl: /* [] */0
+                }
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -10067,175 +10067,175 @@ const yyact = [
         const c1 = coords.hd;
         if (!match) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array1", set)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              _7
-                            ],
-                            tl: /* [] */0
-                          }
-                        }
-                      }
-                    });
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array1", set)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
+                    hd: [
+                      "",
+                      c1
+                    ],
+                    tl: {
+                      hd: [
+                        "",
+                        _7
+                      ],
+                      tl: /* [] */0
+                    }
+                  }
+                }
+              });
         }
         const match$1 = match.tl;
         const c2 = match.hd;
         if (!match$1) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array2", set)
-                          }),
-                      _1: {
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array2", set)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
+                    hd: [
+                      "",
+                      c1
+                    ],
+                    tl: {
+                      hd: [
+                        "",
+                        c2
+                      ],
+                      tl: {
                         hd: [
                           "",
-                          _1
+                          _7
                         ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              c2
-                            ],
-                            tl: {
-                              hd: [
-                                "",
-                                _7
-                              ],
-                              tl: /* [] */0
-                            }
-                          }
-                        }
+                        tl: /* [] */0
                       }
-                    });
+                    }
+                  }
+                }
+              });
         }
         if (!match$1.tl) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array3", set)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              c2
-                            ],
-                            tl: {
-                              hd: [
-                                "",
-                                match$1.hd
-                              ],
-                              tl: {
-                                hd: [
-                                  "",
-                                  _7
-                                ],
-                                tl: /* [] */0
-                              }
-                            }
-                          }
-                        }
-                      }
-                    });
-        }
-        
-      }
-      return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: bigarray_function("Genarray", "set")
-                      }),
-                  _1: {
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array3", set)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
                     hd: [
                       "",
-                      _1
+                      c1
                     ],
                     tl: {
                       hd: [
                         "",
-                        ghexp({
-                              TAG: /* Pexp_array */14,
-                              _0: coords
-                            })
+                        c2
                       ],
                       tl: {
                         hd: [
                           "",
-                          _7
+                          match$1.hd
                         ],
-                        tl: /* [] */0
+                        tl: {
+                          hd: [
+                            "",
+                            _7
+                          ],
+                          tl: /* [] */0
+                        }
                       }
                     }
                   }
-                });
+                }
+              });
+        }
+        
+      }
+      return mkexp({
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: bigarray_function("Genarray", "set")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  ghexp({
+                        TAG: /* Pexp_array */14,
+                        _0: coords
+                      })
+                ],
+                tl: {
+                  hd: [
+                    "",
+                    _7
+                  ],
+                  tl: /* [] */0
+                }
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_setinstvar */23,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: _3
-                });
+            TAG: /* Pexp_setinstvar */23,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_assert */26,
-                      _0: _3
-                    }), _2);
+                TAG: /* Pexp_assert */26,
+                _0: _3
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_lazy */27,
-                      _0: _3
-                    }), _2);
+                TAG: /* Pexp_lazy */27,
+                _0: _3
+              }), _2);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return wrap_exp_attrs(mkexp({
-                      TAG: /* Pexp_object */29,
-                      _0: _3
-                    }), _2);
+                TAG: /* Pexp_object */29,
+                _0: _3
+              }), _2);
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -10250,38 +10250,38 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_ident */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Pexp_ident */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_constant */1,
-                  _0: _1
-                });
+            TAG: /* Pexp_constant */1,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_construct */9,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: undefined
-                });
+            TAG: /* Pexp_construct */9,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_variant */10,
-                  _0: _1,
-                  _1: undefined
-                });
+            TAG: /* Pexp_variant */10,
+            _0: _1,
+            _1: undefined
+          });
     }),
   (function (__caml_parser_env) {
       return reloc_exp(Stdlib__Parsing.peek_val(__caml_parser_env, 1));
@@ -10325,55 +10325,26 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_field */12,
-                  _0: _1,
-                  _1: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  }
-                });
-    }),
-  (function (__caml_parser_env) {
-      const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
-      const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
-      return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: _4
-                });
-    }),
-  (function (__caml_parser_env) {
-      Stdlib__Parsing.peek_val(__caml_parser_env, 4);
-      Stdlib__Parsing.peek_val(__caml_parser_env, 1);
-      return unclosed("(", 3, ")", 5);
+            TAG: /* Pexp_field */12,
+            _0: _1,
+            _1: {
+              txt: _3,
+              loc: rhs_loc(3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: array_function("Array", "get")
-                      }),
-                  _1: {
-                    hd: [
-                      "",
-                      _1
-                    ],
-                    tl: {
-                      hd: [
-                        "",
-                        _4
-                      ],
-                      tl: /* [] */0
-                    }
-                  }
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: _4
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -10384,25 +10355,54 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: array_function("String", "get")
-                      }),
-                  _1: {
-                    hd: [
-                      "",
-                      _1
-                    ],
-                    tl: {
-                      hd: [
-                        "",
-                        _4
-                      ],
-                      tl: /* [] */0
-                    }
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: array_function("Array", "get")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  _4
+                ],
+                tl: /* [] */0
+              }
+            }
+          });
+    }),
+  (function (__caml_parser_env) {
+      Stdlib__Parsing.peek_val(__caml_parser_env, 4);
+      Stdlib__Parsing.peek_val(__caml_parser_env, 1);
+      return unclosed("(", 3, ")", 5);
+    }),
+  (function (__caml_parser_env) {
+      const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
+      const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
+      return mkexp({
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: array_function("String", "get")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  _4
+                ],
+                tl: /* [] */0
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -10419,115 +10419,115 @@ const yyact = [
         const c1 = coords.hd;
         if (!match) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array1", get)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: /* [] */0
-                        }
-                      }
-                    });
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array1", get)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
+                    hd: [
+                      "",
+                      c1
+                    ],
+                    tl: /* [] */0
+                  }
+                }
+              });
         }
         const match$1 = match.tl;
         const c2 = match.hd;
         if (!match$1) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array2", get)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              c2
-                            ],
-                            tl: /* [] */0
-                          }
-                        }
-                      }
-                    });
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array2", get)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
+                    hd: [
+                      "",
+                      c1
+                    ],
+                    tl: {
+                      hd: [
+                        "",
+                        c2
+                      ],
+                      tl: /* [] */0
+                    }
+                  }
+                }
+              });
         }
         if (!match$1.tl) {
           return mkexp({
-                      TAG: /* Pexp_apply */5,
-                      _0: ghexp({
-                            TAG: /* Pexp_ident */0,
-                            _0: bigarray_function("Array3", get)
-                          }),
-                      _1: {
-                        hd: [
-                          "",
-                          _1
-                        ],
-                        tl: {
-                          hd: [
-                            "",
-                            c1
-                          ],
-                          tl: {
-                            hd: [
-                              "",
-                              c2
-                            ],
-                            tl: {
-                              hd: [
-                                "",
-                                match$1.hd
-                              ],
-                              tl: /* [] */0
-                            }
-                          }
-                        }
-                      }
-                    });
-        }
-        
-      }
-      return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: ghexp({
-                        TAG: /* Pexp_ident */0,
-                        _0: bigarray_function("Genarray", "get")
-                      }),
-                  _1: {
+                TAG: /* Pexp_apply */5,
+                _0: ghexp({
+                      TAG: /* Pexp_ident */0,
+                      _0: bigarray_function("Array3", get)
+                    }),
+                _1: {
+                  hd: [
+                    "",
+                    _1
+                  ],
+                  tl: {
                     hd: [
                       "",
-                      _1
+                      c1
                     ],
                     tl: {
                       hd: [
                         "",
-                        ghexp({
-                              TAG: /* Pexp_array */14,
-                              _0: coords
-                            })
+                        c2
                       ],
-                      tl: /* [] */0
+                      tl: {
+                        hd: [
+                          "",
+                          match$1.hd
+                        ],
+                        tl: /* [] */0
+                      }
                     }
                   }
-                });
+                }
+              });
+        }
+        
+      }
+      return mkexp({
+            TAG: /* Pexp_apply */5,
+            _0: ghexp({
+                  TAG: /* Pexp_ident */0,
+                  _0: bigarray_function("Genarray", "get")
+                }),
+            _1: {
+              hd: [
+                "",
+                _1
+              ],
+              tl: {
+                hd: [
+                  "",
+                  ghexp({
+                        TAG: /* Pexp_array */14,
+                        _0: coords
+                      })
+                ],
+                tl: /* [] */0
+              }
+            }
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -10537,10 +10537,10 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_record */11,
-                  _0: _2[1],
-                  _1: _2[0]
-                });
+            TAG: /* Pexp_record */11,
+            _0: _2[1],
+            _1: _2[0]
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -10555,14 +10555,14 @@ const yyact = [
             _1: _4[0]
           });
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: rec_exp
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: rec_exp
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -10573,9 +10573,9 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_array */14,
-                  _0: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pexp_array */14,
+            _0: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -10584,26 +10584,26 @@ const yyact = [
     }),
   (function (__caml_parser_env) {
       return mkexp({
-                  TAG: /* Pexp_array */14,
-                  _0: /* [] */0
-                });
+            TAG: /* Pexp_array */14,
+            _0: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: mkexp({
-                        TAG: /* Pexp_array */14,
-                        _0: Stdlib__List.rev(_4)
-                      })
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: mkexp({
+                  TAG: /* Pexp_array */14,
+                  _0: Stdlib__List.rev(_4)
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -10627,14 +10627,14 @@ const yyact = [
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const list_exp = reloc_exp(mktailexp(rhs_loc(6), Stdlib__List.rev(_4)));
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: list_exp
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: list_exp
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -10646,30 +10646,30 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: mkoperator(_1, 1),
-                  _1: {
-                    hd: [
-                      "",
-                      _2
-                    ],
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: mkoperator(_1, 1),
+            _1: {
+              hd: [
+                "",
+                _2
+              ],
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_apply */5,
-                  _0: mkoperator("!", 1),
-                  _1: {
-                    hd: [
-                      "",
-                      _2
-                    ],
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Pexp_apply */5,
+            _0: mkoperator("!", 1),
+            _1: {
+              hd: [
+                "",
+                _2
+              ],
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -10687,9 +10687,9 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_override */24,
-                  _0: Stdlib__List.rev(_2)
-                });
+            TAG: /* Pexp_override */24,
+            _0: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -10698,26 +10698,26 @@ const yyact = [
     }),
   (function (__caml_parser_env) {
       return mkexp({
-                  TAG: /* Pexp_override */24,
-                  _0: /* [] */0
-                });
+            TAG: /* Pexp_override */24,
+            _0: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: mkexp({
-                        TAG: /* Pexp_override */24,
-                        _0: Stdlib__List.rev(_4)
-                      })
-                });
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: mkexp({
+                  TAG: /* Pexp_override */24,
+                  _0: Stdlib__List.rev(_4)
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -10729,10 +10729,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_send */21,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Pexp_send */21,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -10743,24 +10743,24 @@ const yyact = [
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_pack */31,
-                  _0: _3
-                });
+            TAG: /* Pexp_pack */31,
+            _0: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_constraint */19,
-                  _0: ghexp({
-                        TAG: /* Pexp_pack */31,
-                        _0: _3
-                      }),
-                  _1: ghtyp({
-                        TAG: /* Ptyp_package */9,
-                        _0: _5
-                      })
-                });
+            TAG: /* Pexp_constraint */19,
+            _0: ghexp({
+                  TAG: /* Pexp_pack */31,
+                  _0: _3
+                }),
+            _1: ghtyp({
+                  TAG: /* Ptyp_package */9,
+                  _0: _5
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -10771,24 +10771,24 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkexp({
-                  TAG: /* Pexp_open */32,
-                  _0: /* Fresh */1,
-                  _1: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _2: mkexp({
-                        TAG: /* Pexp_constraint */19,
-                        _0: ghexp({
-                              TAG: /* Pexp_pack */31,
-                              _0: _5
-                            }),
-                        _1: ghtyp({
-                              TAG: /* Ptyp_package */9,
-                              _0: _7
-                            })
+            TAG: /* Pexp_open */32,
+            _0: /* Fresh */1,
+            _1: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _2: mkexp({
+                  TAG: /* Pexp_constraint */19,
+                  _0: ghexp({
+                        TAG: /* Pexp_pack */31,
+                        _0: _5
+                      }),
+                  _1: ghtyp({
+                        TAG: /* Ptyp_package */9,
+                        _0: _7
                       })
-                });
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -10798,31 +10798,31 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_extension */33,
-                  _0: _1
-                });
+            TAG: /* Pexp_extension */33,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "",
-              _1
-            ];
+        "",
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -10831,9 +10831,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _2
-            ];
+        _1,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -10841,56 +10841,56 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "?" + _2[0],
-              _2[1]
-            ];
+        "?" + _2[0],
+        _2[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              "?" + _1,
-              _2
-            ];
+        "?" + _1,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              mkexp({
-                    TAG: /* Pexp_ident */0,
-                    _0: {
-                      txt: {
-                        TAG: /* Lident */0,
-                        _0: _1
-                      },
-                      loc: rhs_loc(1)
-                    }
-                  })
-            ];
+        _1,
+        mkexp({
+              TAG: /* Pexp_ident */0,
+              _0: {
+                txt: {
+                  TAG: /* Lident */0,
+                  _0: _1
+                },
+                loc: rhs_loc(1)
+              }
+            })
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              mkpatvar(_1, 1),
-              _2
-            ];
+        mkpatvar(_1, 1),
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -10898,17 +10898,17 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              ghpat({
-                    TAG: /* Ppat_constraint */10,
-                    _0: mkpatvar(_1, 1),
-                    _1: ghtyp({
-                          TAG: /* Ptyp_poly */8,
-                          _0: Stdlib__List.rev(_3),
-                          _1: _5
-                        })
-                  }),
-              _7
-            ];
+        ghpat({
+              TAG: /* Ppat_constraint */10,
+              _0: mkpatvar(_1, 1),
+              _1: ghtyp({
+                    TAG: /* Ptyp_poly */8,
+                    _0: Stdlib__List.rev(_3),
+                    _1: _5
+                  })
+            }),
+        _7
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 7);
@@ -10917,34 +10917,34 @@ const yyact = [
       const _8 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       const match = wrap_type_annotation(_4, _6, _8);
       return [
-              ghpat({
-                    TAG: /* Ppat_constraint */10,
-                    _0: mkpatvar(_1, 1),
-                    _1: match[1]
-                  }),
-              match[0]
-            ];
+        ghpat({
+              TAG: /* Ppat_constraint */10,
+              _0: mkpatvar(_1, 1),
+              _1: match[1]
+            }),
+        match[0]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _3
-            ];
+        _1,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              ghpat({
-                    TAG: /* Ppat_constraint */10,
-                    _0: _1,
-                    _1: _3
-                  }),
-              _5
-            ];
+        ghpat({
+              TAG: /* Ppat_constraint */10,
+              _0: _1,
+              _1: _3
+            }),
+        _5
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -10953,15 +10953,15 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              lbs_bindings: {
-                hd: _2,
-                tl: _1.lbs_bindings
-              },
-              lbs_rec: _1.lbs_rec,
-              lbs_extension: _1.lbs_extension,
-              lbs_attributes: _1.lbs_attributes,
-              lbs_loc: _1.lbs_loc
-            };
+        lbs_bindings: {
+          hd: _2,
+          tl: _1.lbs_bindings
+        },
+        lbs_rec: _1.lbs_rec,
+        lbs_extension: _1.lbs_extension,
+        lbs_attributes: _1.lbs_attributes,
+        lbs_loc: _1.lbs_loc
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -10970,15 +10970,15 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       let lb = mklb(_4, _5);
       return {
-              lbs_bindings: {
-                hd: lb,
-                tl: /* [] */0
-              },
-              lbs_rec: _3,
-              lbs_extension: _2[0],
-              lbs_attributes: _2[1],
-              lbs_loc: symbol_rloc(undefined)
-            };
+        lbs_bindings: {
+          hd: lb,
+          tl: /* [] */0
+        },
+        lbs_rec: _3,
+        lbs_extension: _2[0],
+        lbs_attributes: _2[1],
+        lbs_loc: symbol_rloc(undefined)
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -11000,36 +11000,36 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return ghexp({
-                  TAG: /* Pexp_fun */4,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _2
-                });
+            TAG: /* Pexp_fun */4,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_newtype */30,
-                  _0: _3,
-                  _1: _5
-                });
+            TAG: /* Pexp_newtype */30,
+            _0: _3,
+            _1: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -11049,174 +11049,174 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return ghexp({
-                  TAG: /* Pexp_fun */4,
-                  _0: _1[0],
-                  _1: _1[1],
-                  _2: _1[2],
-                  _3: _2
-                });
+            TAG: /* Pexp_fun */4,
+            _0: _1[0],
+            _1: _1[1],
+            _2: _1[2],
+            _3: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkexp({
-                  TAG: /* Pexp_newtype */30,
-                  _0: _3,
-                  _1: _5
-                });
+            TAG: /* Pexp_newtype */30,
+            _0: _3,
+            _1: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: {
-                hd: _1,
-                tl: /* [] */0
-              }
-            };
+        hd: _3,
+        tl: {
+          hd: _1,
+          tl: /* [] */0
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _3
-            ];
+        _1,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              undefined,
-              _1
-            ];
+        undefined,
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _3
-            };
+        hd: _1,
+        tl: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              _3
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              exp_of_label(_1, 1)
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        exp_of_label(_1, 1)
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: [
-                {
-                  txt: _1,
-                  loc: rhs_loc(1)
-                },
-                _3
-              ],
-              tl: /* [] */0
-            };
+        hd: [
+          {
+            txt: _1,
+            loc: rhs_loc(1)
+          },
+          _3
+        ],
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: [
-                {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                },
-                _5
-              ],
-              tl: _1
-            };
+        hd: [
+          {
+            txt: _3,
+            loc: rhs_loc(3)
+          },
+          _5
+        ],
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              undefined
-            ];
+        _2,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              _4
-            ];
+        _2,
+        _4
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              undefined,
-              _2
-            ];
+        undefined,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                MEL_EXN_ID: Escape_error
-              });
+            MEL_EXN_ID: Escape_error
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Escape_error, {
-                MEL_EXN_ID: Escape_error
-              });
+            MEL_EXN_ID: Escape_error
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -11225,13 +11225,13 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_alias */1,
-                  _0: _1,
-                  _1: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  }
-                });
+            TAG: /* Ppat_alias */1,
+            _0: _1,
+            _1: {
+              txt: _3,
+              loc: rhs_loc(3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -11240,44 +11240,44 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_tuple */4,
-                  _0: Stdlib__List.rev(_1)
-                });
+            TAG: /* Ppat_tuple */4,
+            _0: Stdlib__List.rev(_1)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_construct */5,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: _2
-                });
+            TAG: /* Ppat_construct */5,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_variant */6,
-                  _0: _1,
-                  _1: _2
-                });
+            TAG: /* Ppat_variant */6,
+            _0: _1,
+            _1: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat_cons(rhs_loc(2), ghpat({
-                      TAG: /* Ppat_tuple */4,
-                      _0: {
-                        hd: _1,
-                        tl: {
-                          hd: _3,
-                          tl: /* [] */0
-                        }
-                      }
-                    }), symbol_rloc(undefined));
+                TAG: /* Ppat_tuple */4,
+                _0: {
+                  hd: _1,
+                  tl: {
+                    hd: _3,
+                    tl: /* [] */0
+                  }
+                }
+              }), symbol_rloc(undefined));
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -11287,15 +11287,15 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat_cons(rhs_loc(2), ghpat({
-                      TAG: /* Ppat_tuple */4,
-                      _0: {
-                        hd: _5,
-                        tl: {
-                          hd: _7,
-                          tl: /* [] */0
-                        }
-                      }
-                    }), symbol_rloc(undefined));
+                TAG: /* Ppat_tuple */4,
+                _0: {
+                  hd: _5,
+                  tl: {
+                    hd: _7,
+                    tl: /* [] */0
+                  }
+                }
+              }), symbol_rloc(undefined));
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -11306,10 +11306,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_or */9,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Ppat_or */9,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -11318,16 +11318,16 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_lazy */12,
-                  _0: _2
-                });
+            TAG: /* Ppat_lazy */12,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_exception */14,
-                  _0: _2
-                });
+            TAG: /* Ppat_exception */14,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -11337,12 +11337,12 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_var */0,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  }
-                });
+            TAG: /* Ppat_var */0,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -11353,55 +11353,55 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_constant */2,
-                  _0: _1
-                });
+            TAG: /* Ppat_constant */2,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_interval */3,
-                  _0: _1,
-                  _1: _3
-                });
+            TAG: /* Ppat_interval */3,
+            _0: _1,
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_construct */5,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: undefined
-                });
+            TAG: /* Ppat_construct */5,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_variant */6,
-                  _0: _1,
-                  _1: undefined
-                });
+            TAG: /* Ppat_variant */6,
+            _0: _1,
+            _1: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_type */11,
-                  _0: {
-                    txt: _2,
-                    loc: rhs_loc(2)
-                  }
-                });
+            TAG: /* Ppat_type */11,
+            _0: {
+              txt: _2,
+              loc: rhs_loc(2)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_record */7,
-                  _0: _2[0],
-                  _1: _2[1]
-                });
+            TAG: /* Ppat_record */7,
+            _0: _2[0],
+            _1: _2[1]
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
@@ -11421,15 +11421,15 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_array */8,
-                  _0: Stdlib__List.rev(_2)
-                });
+            TAG: /* Ppat_array */8,
+            _0: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       return mkpat({
-                  TAG: /* Ppat_array */8,
-                  _0: /* [] */0
-                });
+            TAG: /* Ppat_array */8,
+            _0: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -11447,10 +11447,10 @@ const yyact = [
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_constraint */10,
-                  _0: _2,
-                  _1: _4
-                });
+            TAG: /* Ppat_constraint */10,
+            _0: _2,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -11464,30 +11464,30 @@ const yyact = [
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_unpack */13,
-                  _0: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  }
-                });
+            TAG: /* Ppat_unpack */13,
+            _0: {
+              txt: _3,
+              loc: rhs_loc(3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mkpat({
-                  TAG: /* Ppat_constraint */10,
-                  _0: mkpat({
-                        TAG: /* Ppat_unpack */13,
-                        _0: {
-                          txt: _3,
-                          loc: rhs_loc(3)
-                        }
-                      }),
-                  _1: ghtyp({
-                        TAG: /* Ptyp_package */9,
-                        _0: _5
-                      })
-                });
+            TAG: /* Ppat_constraint */10,
+            _0: mkpat({
+                  TAG: /* Ppat_unpack */13,
+                  _0: {
+                    txt: _3,
+                    loc: rhs_loc(3)
+                  }
+                }),
+            _1: ghtyp({
+                  TAG: /* Ptyp_package */9,
+                  _0: _5
+                })
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -11497,28 +11497,28 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mkpat({
-                  TAG: /* Ppat_extension */15,
-                  _0: _1
-                });
+            TAG: /* Ppat_extension */15,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: {
-                hd: _1,
-                tl: /* [] */0
-              }
-            };
+        hd: _3,
+        tl: {
+          hd: _1,
+          tl: /* [] */0
+        }
+      };
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
@@ -11527,104 +11527,104 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: /* [] */0
-              },
-              /* Closed */0
-            ];
+        {
+          hd: _1,
+          tl: /* [] */0
+        },
+        /* Closed */0
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              {
-                hd: _1,
-                tl: /* [] */0
-              },
-              /* Closed */0
-            ];
+        {
+          hd: _1,
+          tl: /* [] */0
+        },
+        /* Closed */0
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: /* [] */0
-              },
-              /* Open */1
-            ];
+        {
+          hd: _1,
+          tl: /* [] */0
+        },
+        /* Open */1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: _3[0]
-              },
-              _3[1]
-            ];
+        {
+          hd: _1,
+          tl: _3[0]
+        },
+        _3[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              _3
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              pat_of_label(_1, 1)
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        pat_of_label(_1, 1)
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$11(symbol_rloc(undefined), _5, symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1[0],
-              tl: /* [] */0
-            };
+        hd: _1[0],
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1[0],
-              tl: _2
-            };
+        hd: _1[0],
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -11632,24 +11632,24 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$11(symbol_rloc(undefined), _7, symbol_docs(undefined), _6, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
@@ -11659,9 +11659,9 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _7 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$19(symbol_rloc(undefined), add_nonrec(_2, _7, 2), symbol_docs(undefined), undefined, _3, Stdlib__List.rev(_6), _5[0], _5[1], _5[2], {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                });
+            txt: _4,
+            loc: rhs_loc(4)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -11670,118 +11670,118 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mk$19(symbol_rloc(undefined), _6, symbol_docs(undefined), get_text(Stdlib__Parsing.symbol_start_pos(undefined)), _2, Stdlib__List.rev(_5), _4[0], _4[1], _4[2], {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                });
+            txt: _3,
+            loc: rhs_loc(3)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
     }),
   (function (__caml_parser_env) {
       return [
-              /* Ptype_abstract */0,
-              /* Public */1,
-              undefined
-            ];
+        /* Ptype_abstract */0,
+        /* Public */1,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              /* Ptype_abstract */0,
-              /* Public */1,
-              _2
-            ];
+        /* Ptype_abstract */0,
+        /* Public */1,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              /* Ptype_abstract */0,
-              /* Private */0,
-              _3
-            ];
+        /* Ptype_abstract */0,
+        /* Private */0,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                TAG: /* Ptype_variant */0,
-                _0: Stdlib__List.rev(_2)
-              },
-              /* Public */1,
-              undefined
-            ];
+        {
+          TAG: /* Ptype_variant */0,
+          _0: Stdlib__List.rev(_2)
+        },
+        /* Public */1,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                TAG: /* Ptype_variant */0,
-                _0: Stdlib__List.rev(_3)
-              },
-              /* Private */0,
-              undefined
-            ];
+        {
+          TAG: /* Ptype_variant */0,
+          _0: Stdlib__List.rev(_3)
+        },
+        /* Private */0,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Ptype_open */1,
-              /* Public */1,
-              undefined
-            ];
+        /* Ptype_open */1,
+        /* Public */1,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              {
-                TAG: /* Ptype_record */1,
-                _0: _4
-              },
-              _2,
-              undefined
-            ];
+        {
+          TAG: /* Ptype_record */1,
+          _0: _4
+        },
+        _2,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                TAG: /* Ptype_variant */0,
-                _0: Stdlib__List.rev(_5)
-              },
-              _4,
-              _2
-            ];
+        {
+          TAG: /* Ptype_variant */0,
+          _0: Stdlib__List.rev(_5)
+        },
+        _4,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       return [
-              /* Ptype_open */1,
-              /* Public */1,
-              _2
-            ];
+        /* Ptype_open */1,
+        /* Public */1,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 5);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              {
-                TAG: /* Ptype_record */1,
-                _0: _6
-              },
-              _4,
-              _2
-            ];
+        {
+          TAG: /* Ptype_record */1,
+          _0: _6
+        },
+        _4,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -11789,9 +11789,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__List.rev(Stdlib__Parsing.peek_val(__caml_parser_env, 1));
@@ -11800,31 +11800,31 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              _1
-            ];
+        _2,
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_var */0,
-                  _0: _2
-                });
+            TAG: /* Ptyp_var */0,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       return mktyp(/* Ptyp_any */0);
@@ -11835,9 +11835,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__List.rev(Stdlib__Parsing.peek_val(__caml_parser_env, 1));
@@ -11846,9 +11846,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              _1
-            ];
+        _2,
+        _1
+      ];
     }),
   (function (__caml_parser_env) {
       return /* Invariant */2;
@@ -11862,64 +11862,64 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_var */0,
-                  _0: _2
-                });
+            TAG: /* Ptyp_var */0,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return constructor(symbol_rloc(undefined), _3, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _2[0], _2[1], {
-                  txt: _1,
-                  loc: rhs_loc(1)
-                });
+            txt: _1,
+            loc: rhs_loc(1)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return constructor(symbol_rloc(undefined), _4, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _3[0], _3[1], {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -11930,12 +11930,12 @@ const yyact = [
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return rebind(symbol_rloc(undefined), Stdlib.$at(_5, _6), symbol_docs(undefined), undefined, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          }, {
+            txt: _4,
+            loc: rhs_loc(4)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
@@ -11943,59 +11943,59 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return decl(symbol_rloc(undefined), Stdlib.$at(_4, _5), symbol_docs(undefined), undefined, _3[0], _3[1], {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          });
     }),
   (function (__caml_parser_env) {
       return [
-              /* [] */0,
-              undefined
-            ];
+        /* [] */0,
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              Stdlib__List.rev(_2),
-              undefined
-            ];
+        Stdlib__List.rev(_2),
+        undefined
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              Stdlib__List.rev(_2),
-              _4
-            ];
+        Stdlib__List.rev(_2),
+        _4
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              /* [] */0,
-              _2
-            ];
+        /* [] */0,
+        _2
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -12003,9 +12003,9 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return field$1(symbol_rloc(undefined), _5, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _1, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -12016,9 +12016,9 @@ const yyact = [
       const info_before_semi = get_info(Stdlib__Parsing.rhs_end_pos(5));
       const info = info_before_semi !== undefined ? info_before_semi : get_info(Stdlib__Parsing.symbol_end_pos(undefined));
       return field$1(symbol_rloc(undefined), Stdlib.$at(_5, _7), Caml_option.some(info), _1, {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, _4);
+            txt: _2,
+            loc: rhs_loc(2)
+          }, _4);
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -12031,9 +12031,9 @@ const yyact = [
         not_expecting(2, "nonrec flag");
       }
       return mk$20(_8, symbol_docs(undefined), _3, _6, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, Stdlib__List.rev(_7));
+            txt: _4,
+            loc: rhs_loc(4)
+          }, Stdlib__List.rev(_7));
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 6);
@@ -12046,132 +12046,132 @@ const yyact = [
         not_expecting(2, "nonrec flag");
       }
       return mk$20(_8, symbol_docs(undefined), _3, _6, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                }, Stdlib__List.rev(_7));
+            txt: _4,
+            loc: rhs_loc(4)
+          }, Stdlib__List.rev(_7));
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return decl(symbol_rloc(undefined), _3, undefined, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _2[0], _2[1], {
-                  txt: _1,
-                  loc: rhs_loc(1)
-                });
+            txt: _1,
+            loc: rhs_loc(1)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return decl(symbol_rloc(undefined), _4, undefined, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), _3[0], _3[1], {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return rebind(symbol_rloc(undefined), _4, undefined, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), {
-                  txt: _1,
-                  loc: rhs_loc(1)
-                }, {
-                  txt: _3,
-                  loc: rhs_loc(3)
-                });
+            txt: _1,
+            loc: rhs_loc(1)
+          }, {
+            txt: _3,
+            loc: rhs_loc(3)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return rebind(symbol_rloc(undefined), _5, undefined, Caml_option.some(get_info(Stdlib__Parsing.symbol_end_pos(undefined))), {
-                  txt: _2,
-                  loc: rhs_loc(2)
-                }, {
-                  txt: _4,
-                  loc: rhs_loc(4)
-                });
+            txt: _2,
+            loc: rhs_loc(2)
+          }, {
+            txt: _4,
+            loc: rhs_loc(4)
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -12181,58 +12181,58 @@ const yyact = [
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       const rhs = last(_3);
       return {
-              TAG: /* Pwith_type */0,
-              _0: {
-                txt: _3,
-                loc: rhs_loc(3)
-              },
-              _1: mk$19(symbol_rloc(undefined), undefined, undefined, undefined, _2, Stdlib__List.rev(_6), undefined, _4, _5, {
-                    txt: rhs,
-                    loc: rhs_loc(3)
-                  })
-            };
+        TAG: /* Pwith_type */0,
+        _0: {
+          txt: _3,
+          loc: rhs_loc(3)
+        },
+        _1: mk$19(symbol_rloc(undefined), undefined, undefined, undefined, _2, Stdlib__List.rev(_6), undefined, _4, _5, {
+              txt: rhs,
+              loc: rhs_loc(3)
+            })
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Pwith_typesubst */2,
-              _0: mk$19(symbol_rloc(undefined), undefined, undefined, undefined, _2, undefined, undefined, undefined, _5, {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  })
-            };
+        TAG: /* Pwith_typesubst */2,
+        _0: mk$19(symbol_rloc(undefined), undefined, undefined, undefined, _2, undefined, undefined, undefined, _5, {
+              txt: _3,
+              loc: rhs_loc(3)
+            })
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Pwith_module */1,
-              _0: {
-                txt: _2,
-                loc: rhs_loc(2)
-              },
-              _1: {
-                txt: _4,
-                loc: rhs_loc(4)
-              }
-            };
+        TAG: /* Pwith_module */1,
+        _0: {
+          txt: _2,
+          loc: rhs_loc(2)
+        },
+        _1: {
+          txt: _4,
+          loc: rhs_loc(4)
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Pwith_modsubst */3,
-              _0: {
-                txt: _2,
-                loc: rhs_loc(2)
-              },
-              _1: {
-                txt: _4,
-                loc: rhs_loc(4)
-              }
-            };
+        TAG: /* Pwith_modsubst */3,
+        _0: {
+          txt: _2,
+          loc: rhs_loc(2)
+        },
+        _1: {
+          txt: _4,
+          loc: rhs_loc(4)
+        }
+      };
     }),
   (function (__caml_parser_env) {
       return /* Public */1;
@@ -12243,17 +12243,17 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: /* [] */0
-            };
+        hd: _2,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -12262,10 +12262,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_poly */8,
-                  _0: Stdlib__List.rev(_1),
-                  _1: _3
-                });
+            TAG: /* Ptyp_poly */8,
+            _0: Stdlib__List.rev(_1),
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -12274,10 +12274,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_poly */8,
-                  _0: Stdlib__List.rev(_1),
-                  _1: _3
-                });
+            TAG: /* Ptyp_poly */8,
+            _0: Stdlib__List.rev(_1),
+            _1: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -12294,10 +12294,10 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_alias */6,
-                  _0: _1,
-                  _1: _4
-                });
+            TAG: /* Ptyp_alias */6,
+            _0: _1,
+            _1: _4
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -12307,43 +12307,43 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _6 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_arrow */1,
-                  _0: "?" + _2,
-                  _1: mkoption(_4),
-                  _2: _6
-                });
+            TAG: /* Ptyp_arrow */1,
+            _0: "?" + _2,
+            _1: mkoption(_4),
+            _2: _6
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_arrow */1,
-                  _0: "?" + _1,
-                  _1: mkoption(_2),
-                  _2: _4
-                });
+            TAG: /* Ptyp_arrow */1,
+            _0: "?" + _1,
+            _1: mkoption(_2),
+            _2: _4
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_arrow */1,
-                  _0: _1,
-                  _1: _3,
-                  _2: _5
-                });
+            TAG: /* Ptyp_arrow */1,
+            _0: _1,
+            _1: _3,
+            _2: _5
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_arrow */1,
-                  _0: "",
-                  _1: _1,
-                  _2: _3
-                });
+            TAG: /* Ptyp_arrow */1,
+            _0: "",
+            _1: _1,
+            _2: _3
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -12353,14 +12353,14 @@ const yyact = [
       if (_2) {
         if (_2.tl) {
           throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.Parse_error, {
-                    MEL_EXN_ID: Stdlib__Parsing.Parse_error
-                  });
+                MEL_EXN_ID: Stdlib__Parsing.Parse_error
+              });
         }
         return _2.hd;
       }
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.Parse_error, {
-                MEL_EXN_ID: Stdlib__Parsing.Parse_error
-              });
+            MEL_EXN_ID: Stdlib__Parsing.Parse_error
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -12370,21 +12370,21 @@ const yyact = [
       if (_2) {
         if (_2.tl) {
           throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.Parse_error, {
-                    MEL_EXN_ID: Stdlib__Parsing.Parse_error
-                  });
+                MEL_EXN_ID: Stdlib__Parsing.Parse_error
+              });
         }
         return _2.hd;
       }
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.Parse_error, {
-                MEL_EXN_ID: Stdlib__Parsing.Parse_error
-              });
+            MEL_EXN_ID: Stdlib__Parsing.Parse_error
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_var */0,
-                  _0: _2
-                });
+            TAG: /* Ptyp_var */0,
+            _0: _2
+          });
     }),
   (function (__caml_parser_env) {
       return mktyp(/* Ptyp_any */0);
@@ -12392,242 +12392,242 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_constr */3,
-                  _0: {
-                    txt: _1,
-                    loc: rhs_loc(1)
-                  },
-                  _1: /* [] */0
-                });
+            TAG: /* Ptyp_constr */3,
+            _0: {
+              txt: _1,
+              loc: rhs_loc(1)
+            },
+            _1: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_constr */3,
-                  _0: {
-                    txt: _2,
-                    loc: rhs_loc(2)
-                  },
-                  _1: {
-                    hd: _1,
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Ptyp_constr */3,
+            _0: {
+              txt: _2,
+              loc: rhs_loc(2)
+            },
+            _1: {
+              hd: _1,
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_constr */3,
-                  _0: {
-                    txt: _4,
-                    loc: rhs_loc(4)
-                  },
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Ptyp_constr */3,
+            _0: {
+              txt: _4,
+              loc: rhs_loc(4)
+            },
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_object */4,
-                  _0: _2[0],
-                  _1: _2[1]
-                });
+            TAG: /* Ptyp_object */4,
+            _0: _2[0],
+            _1: _2[1]
+          });
     }),
   (function (__caml_parser_env) {
       return mktyp({
-                  TAG: /* Ptyp_object */4,
-                  _0: /* [] */0,
-                  _1: /* Closed */0
-                });
+            TAG: /* Ptyp_object */4,
+            _0: /* [] */0,
+            _1: /* Closed */0
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_class */5,
-                  _0: {
-                    txt: _2,
-                    loc: rhs_loc(2)
-                  },
-                  _1: /* [] */0
-                });
+            TAG: /* Ptyp_class */5,
+            _0: {
+              txt: _2,
+              loc: rhs_loc(2)
+            },
+            _1: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_class */5,
-                  _0: {
-                    txt: _3,
-                    loc: rhs_loc(3)
-                  },
-                  _1: {
-                    hd: _1,
-                    tl: /* [] */0
-                  }
-                });
+            TAG: /* Ptyp_class */5,
+            _0: {
+              txt: _3,
+              loc: rhs_loc(3)
+            },
+            _1: {
+              hd: _1,
+              tl: /* [] */0
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_class */5,
-                  _0: {
-                    txt: _5,
-                    loc: rhs_loc(5)
-                  },
-                  _1: Stdlib__List.rev(_2)
-                });
+            TAG: /* Ptyp_class */5,
+            _0: {
+              txt: _5,
+              loc: rhs_loc(5)
+            },
+            _1: Stdlib__List.rev(_2)
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: {
-                    hd: _2,
-                    tl: /* [] */0
-                  },
-                  _1: /* Closed */0,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: {
+              hd: _2,
+              tl: /* [] */0
+            },
+            _1: /* Closed */0,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: Stdlib__List.rev(_3),
-                  _1: /* Closed */0,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: Stdlib__List.rev(_3),
+            _1: /* Closed */0,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: {
-                    hd: _2,
-                    tl: Stdlib__List.rev(_4)
-                  },
-                  _1: /* Closed */0,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: {
+              hd: _2,
+              tl: Stdlib__List.rev(_4)
+            },
+            _1: /* Closed */0,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: Stdlib__List.rev(_3),
-                  _1: /* Open */1,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: Stdlib__List.rev(_3),
+            _1: /* Open */1,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: /* [] */0,
-                  _1: /* Open */1,
-                  _2: undefined
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: /* [] */0,
+            _1: /* Open */1,
+            _2: undefined
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: Stdlib__List.rev(_3),
-                  _1: /* Closed */0,
-                  _2: /* [] */0
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: Stdlib__List.rev(_3),
+            _1: /* Closed */0,
+            _2: /* [] */0
+          });
     }),
   (function (__caml_parser_env) {
       Stdlib__Parsing.peek_val(__caml_parser_env, 4);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_variant */7,
-                  _0: Stdlib__List.rev(_3),
-                  _1: /* Closed */0,
-                  _2: Stdlib__List.rev(_5)
-                });
+            TAG: /* Ptyp_variant */7,
+            _0: Stdlib__List.rev(_3),
+            _1: /* Closed */0,
+            _2: Stdlib__List.rev(_5)
+          });
     }),
   (function (__caml_parser_env) {
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return mktyp({
-                  TAG: /* Ptyp_package */9,
-                  _0: _3
-                });
+            TAG: /* Ptyp_package */9,
+            _0: _3
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_extension */10,
-                  _0: _1
-                });
+            TAG: /* Ptyp_extension */10,
+            _0: _1
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              /* [] */0
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        /* [] */0
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _1,
-                loc: rhs_loc(1)
-              },
-              _3
-            ];
+        {
+          txt: _1,
+          loc: rhs_loc(1)
+        },
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                txt: _2,
-                loc: rhs_loc(2)
-              },
-              _4
-            ];
+        {
+          txt: _2,
+          loc: rhs_loc(2)
+        },
+        _4
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _3
-            };
+        hd: _1,
+        tl: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -12635,9 +12635,9 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Rinherit */1,
-              _0: _1
-            };
+        TAG: /* Rinherit */1,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 4);
@@ -12645,23 +12645,23 @@ const yyact = [
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _5 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Rtag */0,
-              _0: _1,
-              _1: _5,
-              _2: _3,
-              _3: Stdlib__List.rev(_4)
-            };
+        TAG: /* Rtag */0,
+        _0: _1,
+        _1: _5,
+        _2: _3,
+        _3: Stdlib__List.rev(_4)
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Rtag */0,
-              _0: _1,
-              _1: _2,
-              _2: true,
-              _3: /* [] */0
-            };
+        TAG: /* Rtag */0,
+        _0: _1,
+        _1: _2,
+        _2: true,
+        _3: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       return true;
@@ -12672,32 +12672,32 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _2,
-              tl: _1
-            };
+        hd: _2,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -12706,12 +12706,12 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_tuple */2,
-                  _0: {
-                    hd: _1,
-                    tl: Stdlib__List.rev(_3)
-                  }
-                });
+            TAG: /* Ptyp_tuple */2,
+            _0: {
+              hd: _1,
+              tl: Stdlib__List.rev(_3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -12720,95 +12720,95 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return mktyp({
-                  TAG: /* Ptyp_tuple */2,
-                  _0: {
-                    hd: _1,
-                    tl: Stdlib__List.rev(_3)
-                  }
-                });
+            TAG: /* Ptyp_tuple */2,
+            _0: {
+              hd: _1,
+              tl: Stdlib__List.rev(_3)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: /* [] */0
-            };
+        hd: _1,
+        tl: /* [] */0
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _3,
-              tl: _1
-            };
+        hd: _3,
+        tl: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: _3[0]
-              },
-              _3[1]
-            ];
+        {
+          hd: _1,
+          tl: _3[0]
+        },
+        _3[1]
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              {
-                hd: _1,
-                tl: /* [] */0
-              },
-              /* Closed */0
-            ];
+        {
+          hd: _1,
+          tl: /* [] */0
+        },
+        /* Closed */0
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* [] */0,
-              /* Open */1
-            ];
+        /* [] */0,
+        /* Open */1
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _1,
-              _4,
-              _3
-            ];
+        _1,
+        _4,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -12816,52 +12816,52 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int */0,
-              _0: _1
-            };
+        TAG: /* Const_int */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_char */1,
-              _0: _1
-            };
+        TAG: /* Const_char */1,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_string */2,
-              _0: _1[0],
-              _1: _1[1]
-            };
+        TAG: /* Const_string */2,
+        _0: _1[0],
+        _1: _1[1]
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_float */3,
-              _0: _1
-            };
+        TAG: /* Const_float */3,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int32 */4,
-              _0: _1
-            };
+        TAG: /* Const_int32 */4,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int64 */5,
-              _0: _1
-            };
+        TAG: /* Const_int64 */5,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_nativeint */6,
-              _0: _1
-            };
+        TAG: /* Const_nativeint */6,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -12869,72 +12869,72 @@ const yyact = [
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int */0,
-              _0: -_2 | 0
-            };
+        TAG: /* Const_int */0,
+        _0: -_2 | 0
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_float */3,
-              _0: "-" + _2
-            };
+        TAG: /* Const_float */3,
+        _0: "-" + _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int32 */4,
-              _0: -_2 | 0
-            };
+        TAG: /* Const_int32 */4,
+        _0: -_2 | 0
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int64 */5,
-              _0: Caml_int64.neg(_2)
-            };
+        TAG: /* Const_int64 */5,
+        _0: Caml_int64.neg(_2)
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_nativeint */6,
-              _0: Caml_external_polyfill.resolve("nativeint_neg")(_2)
-            };
+        TAG: /* Const_nativeint */6,
+        _0: Caml_external_polyfill.resolve("nativeint_neg")(_2)
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int */0,
-              _0: _2
-            };
+        TAG: /* Const_int */0,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_float */3,
-              _0: _2
-            };
+        TAG: /* Const_float */3,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int32 */4,
-              _0: _2
-            };
+        TAG: /* Const_int32 */4,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_int64 */5,
-              _0: _2
-            };
+        TAG: /* Const_int64 */5,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Const_nativeint */6,
-              _0: _2
-            };
+        TAG: /* Const_nativeint */6,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -13045,253 +13045,253 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Lident */0,
-              _0: "[]"
-            };
+        TAG: /* Lident */0,
+        _0: "[]"
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Lident */0,
-              _0: "()"
-            };
+        TAG: /* Lident */0,
+        _0: "()"
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Lident */0,
-              _0: "false"
-            };
+        TAG: /* Lident */0,
+        _0: "false"
+      };
     }),
   (function (__caml_parser_env) {
       return {
-              TAG: /* Lident */0,
-              _0: "true"
-            };
+        TAG: /* Lident */0,
+        _0: "true"
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 3);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       if (applicative_functors.contents) {
         return {
-                TAG: /* Lapply */2,
-                _0: _1,
-                _1: _3
-              };
+          TAG: /* Lapply */2,
+          _0: _1,
+          _1: _3
+        };
       }
       throw new Caml_js_exceptions.MelangeError($$Error$1, {
-                MEL_EXN_ID: $$Error$1,
-                _1: {
-                  TAG: /* Applicative_path */3,
-                  _0: symbol_rloc(undefined)
-                }
-              });
+            MEL_EXN_ID: $$Error$1,
+            _1: {
+              TAG: /* Applicative_path */3,
+              _0: symbol_rloc(undefined)
+            }
+          });
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
-      return {
-              TAG: /* Lident */0,
-              _0: _1
-            };
+      return {
+        TAG: /* Lident */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ldot */1,
-              _0: _1,
-              _1: _3
-            };
+        TAG: /* Ldot */1,
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: /* Pdir_none */0
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: /* Pdir_none */0
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_string */0,
-                _0: _3[0]
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_string */0,
+          _0: _3[0]
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_int */1,
-                _0: _3
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_int */1,
+          _0: _3
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_ident */2,
-                _0: _3
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_ident */2,
+          _0: _3
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_ident */2,
-                _0: _3
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_ident */2,
+          _0: _3
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_bool */3,
-                _0: false
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_bool */3,
+          _0: false
+        }
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return {
-              TAG: /* Ptop_dir */1,
-              _0: _2,
-              _1: {
-                TAG: /* Pdir_bool */3,
-                _0: true
-              }
-            };
+        TAG: /* Ptop_dir */1,
+        _0: _2,
+        _1: {
+          TAG: /* Pdir_bool */3,
+          _0: true
+        }
+      };
     }),
   (function (__caml_parser_env) {
       return Stdlib__Parsing.peek_val(__caml_parser_env, 0);
@@ -13334,33 +13334,33 @@ const yyact = [
     }),
   (function (__caml_parser_env) {
       return [
-              /* Public */1,
-              /* Concrete */1
-            ];
+        /* Public */1,
+        /* Concrete */1
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Private */0,
-              /* Concrete */1
-            ];
+        /* Private */0,
+        /* Concrete */1
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Public */1,
-              /* Virtual */0
-            ];
+        /* Public */1,
+        /* Virtual */0
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Private */0,
-              /* Virtual */0
-            ];
+        /* Private */0,
+        /* Virtual */0
+      ];
     }),
   (function (__caml_parser_env) {
       return [
-              /* Private */0,
-              /* Virtual */0
-            ];
+        /* Private */0,
+        /* Virtual */0
+      ];
     }),
   (function (__caml_parser_env) {
       return /* Fresh */1;
@@ -13545,41 +13545,41 @@ const yyact = [
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              txt: _1,
-              loc: symbol_rloc(undefined)
-            };
+        txt: _1,
+        loc: symbol_rloc(undefined)
+      };
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              txt: _1 + ("." + _3.txt),
-              loc: symbol_rloc(undefined)
-            };
+        txt: _1 + ("." + _3.txt),
+        loc: symbol_rloc(undefined)
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -13588,9 +13588,9 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       return /* [] */0;
@@ -13599,123 +13599,123 @@ const yyact = [
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              hd: _1,
-              tl: _2
-            };
+        hd: _1,
+        tl: _2
+      };
     }),
   (function (__caml_parser_env) {
       return [
-              undefined,
-              /* [] */0
-            ];
+        undefined,
+        /* [] */0
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              undefined,
-              {
-                hd: _1,
-                tl: _2
-              }
-            ];
+        undefined,
+        {
+          hd: _1,
+          tl: _2
+        }
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _3 = Stdlib__Parsing.peek_val(__caml_parser_env, 1);
       return [
-              _2,
-              _3
-            ];
+        _2,
+        _3
+      ];
     }),
   (function (__caml_parser_env) {
       const _1 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* PStr */0,
-              _0: _1
-            };
+        TAG: /* PStr */0,
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* PTyp */1,
-              _0: _2
-            };
+        TAG: /* PTyp */1,
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* PPat */2,
-              _0: _2,
-              _1: undefined
-            };
+        TAG: /* PPat */2,
+        _0: _2,
+        _1: undefined
+      };
     }),
   (function (__caml_parser_env) {
       const _2 = Stdlib__Parsing.peek_val(__caml_parser_env, 2);
       const _4 = Stdlib__Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: /* PPat */2,
-              _0: _2,
-              _1: _4
-            };
+        TAG: /* PPat */2,
+        _0: _2,
+        _1: _4
+      };
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     }),
   (function (__caml_parser_env) {
       throw new Caml_js_exceptions.MelangeError(Stdlib__Parsing.YYexit, {
-                MEL_EXN_ID: Stdlib__Parsing.YYexit,
-                _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
-              });
+            MEL_EXN_ID: Stdlib__Parsing.YYexit,
+            _1: Stdlib__Parsing.peek_val(__caml_parser_env, 0)
+          });
     })
 ];
 
@@ -13816,14 +13816,14 @@ function assert_same_type(lexbuf, x, y) {
   const rhs = type_of_directive(y);
   if (lhs !== rhs) {
     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-              MEL_EXN_ID: $$Error$2,
-              _1: {
-                TAG: /* Conditional_expr_expected_type */7,
-                _0: lhs,
-                _1: rhs
-              },
-              _2: curr(lexbuf)
-            });
+          MEL_EXN_ID: $$Error$2,
+          _1: {
+            TAG: /* Conditional_expr_expected_type */7,
+            _0: lhs,
+            _1: rhs
+          },
+          _2: curr(lexbuf)
+        });
   }
   return y;
 }
@@ -13910,23 +13910,23 @@ function semantic_version_parse(str, start, last_index) {
       const start = _start;
       if (start > last_index) {
         return [
-                acc,
-                start
-              ];
+          acc,
+          start
+        ];
       }
       const c = str.charCodeAt(start);
       if (c === /* '.' */46) {
         return [
-                acc,
-                start + 1 | 0
-              ];
+          acc,
+          start + 1 | 0
+        ];
       }
       const v = c - /* '0' */48 | 0;
       if (!(v >= 0 && v <= 9)) {
         return [
-                acc,
-                start
-              ];
+          acc,
+          start
+        ];
       }
       _acc = Math.imul(acc, 10) + v | 0;
       _start = start + 1 | 0;
@@ -13939,26 +13939,26 @@ function semantic_version_parse(str, start, last_index) {
   const patch_end = match$2[1];
   const additional = Stdlib__String.sub(str, patch_end, (last_index - patch_end | 0) + 1 | 0);
   return [
-          [
-            match[0],
-            match$1[0],
-            match$2[0]
-          ],
-          additional
-        ];
+    [
+      match[0],
+      match$1[0],
+      match$2[0]
+    ],
+    additional
+  ];
 }
 
 function semver(loc, lhs, str) {
   const last_index = str.length - 1 | 0;
   if (last_index < 0) {
     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-              MEL_EXN_ID: $$Error$2,
-              _1: {
-                TAG: /* Illegal_semver */6,
-                _0: str
-              },
-              _2: loc
-            });
+          MEL_EXN_ID: $$Error$2,
+          _1: {
+            TAG: /* Illegal_semver */6,
+            _0: str
+          },
+          _2: loc
+        });
   }
   const v = str.charCodeAt(0);
   let match;
@@ -13978,13 +13978,13 @@ function semver(loc, lhs, str) {
         case 60 :
             if (last_index === 0) {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: {
-                          TAG: /* Illegal_semver */6,
-                          _0: str
-                        },
-                        _2: loc
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: {
+                      TAG: /* Illegal_semver */6,
+                      _0: str
+                    },
+                    _2: loc
+                  });
             }
             match = str[1] === "=" ? [
                 "Le",
@@ -14000,13 +14000,13 @@ function semver(loc, lhs, str) {
         case 62 :
             if (last_index === 0) {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: {
-                          TAG: /* Illegal_semver */6,
-                          _0: str
-                        },
-                        _2: loc
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: {
+                      TAG: /* Illegal_semver */6,
+                      _0: str
+                    },
+                    _2: loc
+                  });
             }
             match = str[1] === "=" ? [
                 "Ge",
@@ -14076,14 +14076,14 @@ function pp_directive_value(fmt, x) {
         return Stdlib__Format.pp_print_int(fmt, x._0);
     case /* Dir_string */3 :
         return Curry._1(Stdlib__Format.fprintf(fmt)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Caml_string */3,
-                          _0: /* No_padding */0,
-                          _1: /* End_of_format */0
-                        },
-                        _1: "%S"
-                      }), x._0);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Caml_string */3,
+                    _0: /* No_padding */0,
+                    _1: /* End_of_format */0
+                  },
+                  _1: "%S"
+                }), x._0);
     
   }
 }
@@ -14172,38 +14172,38 @@ function query(loc, str) {
         const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
         if (exn$1.MEL_EXN_ID === Stdlib.Not_found) {
           return {
-                  TAG: /* Dir_bool */0,
-                  _0: false
-                };
+            TAG: /* Dir_bool */0,
+            _0: false
+          };
         }
         throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
       }
       if (exit === 2) {
         try {
           return {
-                  TAG: /* Dir_bool */0,
-                  _0: Stdlib.bool_of_string(v$1)
-                };
+            TAG: /* Dir_bool */0,
+            _0: Stdlib.bool_of_string(v$1)
+          };
         }
         catch (exn$2){
           try {
             return {
-                    TAG: /* Dir_int */2,
-                    _0: Caml_format.caml_int_of_string(v$1)
-                  };
+              TAG: /* Dir_int */2,
+              _0: Caml_format.caml_int_of_string(v$1)
+            };
           }
           catch (exn$3){
             try {
               return {
-                      TAG: /* Dir_float */1,
-                      _0: Caml_format.caml_float_of_string(v$1)
-                    };
+                TAG: /* Dir_float */1,
+                _0: Caml_format.caml_float_of_string(v$1)
+              };
             }
             catch (exn$4){
               return {
-                      TAG: /* Dir_string */3,
-                      _0: v$1
-                    };
+                TAG: /* Dir_string */3,
+                _0: v$1
+              };
             }
           }
         }
@@ -14215,9 +14215,9 @@ function query(loc, str) {
   }
   if (/* tag */typeof v === "number" || typeof v === "string") {
     return {
-            TAG: /* Dir_bool */0,
-            _0: false
-          };
+      TAG: /* Dir_bool */0,
+      _0: false
+    };
   } else {
     return v;
   }
@@ -14265,46 +14265,46 @@ function value_of_token(loc, t) {
     switch (t) {
       case /* FALSE */29 :
           return {
-                  TAG: /* Dir_bool */0,
-                  _0: false
-                };
+            TAG: /* Dir_bool */0,
+            _0: false
+          };
       case /* TRUE */91 :
           return {
-                  TAG: /* Dir_bool */0,
-                  _0: true
-                };
+            TAG: /* Dir_bool */0,
+            _0: true
+          };
       default:
         throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                  MEL_EXN_ID: $$Error$2,
-                  _1: /* Unexpected_token_in_conditional */4,
-                  _2: loc
-                });
+              MEL_EXN_ID: $$Error$2,
+              _1: /* Unexpected_token_in_conditional */4,
+              _2: loc
+            });
     }
   } else {
     switch (t.TAG) {
       case /* FLOAT */1 :
           return {
-                  TAG: /* Dir_float */1,
-                  _0: Caml_format.caml_float_of_string(t._0)
-                };
+            TAG: /* Dir_float */1,
+            _0: Caml_format.caml_float_of_string(t._0)
+          };
       case /* INT */7 :
           return {
-                  TAG: /* Dir_int */2,
-                  _0: t._0
-                };
+            TAG: /* Dir_int */2,
+            _0: t._0
+          };
       case /* STRING */16 :
           return {
-                  TAG: /* Dir_string */3,
-                  _0: t._0[0]
-                };
+            TAG: /* Dir_string */3,
+            _0: t._0[0]
+          };
       case /* UIDENT */17 :
           return query(loc, t._0);
       default:
         throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                  MEL_EXN_ID: $$Error$2,
-                  _1: /* Unexpected_token_in_conditional */4,
-                  _2: loc
-                });
+              MEL_EXN_ID: $$Error$2,
+              _1: /* Unexpected_token_in_conditional */4,
+              _2: loc
+            });
     }
   }
 }
@@ -14326,10 +14326,10 @@ function directive_parse(token_with_comments, lexbuf) {
         switch (t) {
           case /* EOF */25 :
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: /* Unterminated_if */2,
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: /* Unterminated_if */2,
+                    _2: curr(lexbuf)
+                  });
           case /* EOL */100 :
               _param = undefined;
               continue ;
@@ -14351,13 +14351,13 @@ function directive_parse(token_with_comments, lexbuf) {
   const push = function (e) {
     if (look_ahead.contents !== undefined) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "parsing/lexer.mll",
-                  312,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "parsing/lexer.mll",
+              312,
+              4
+            ]
+          });
     }
     look_ahead.contents = e;
   };
@@ -14400,27 +14400,27 @@ function directive_parse(token_with_comments, lexbuf) {
               }
               if (exit$2 === 3) {
                 throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                          MEL_EXN_ID: $$Error$2,
-                          _1: {
-                            TAG: /* Conditional_expr_expected_type */7,
-                            _0: /* Dir_type_string */3,
-                            _1: type_of_directive(lhs)
-                          },
-                          _2: curr(lexbuf)
-                        });
+                      MEL_EXN_ID: $$Error$2,
+                      _1: {
+                        TAG: /* Conditional_expr_expected_type */7,
+                        _0: /* Dir_type_string */3,
+                        _1: type_of_directive(lhs)
+                      },
+                      _2: curr(lexbuf)
+                    });
               }
               
             }
             if (exit$1 === 2) {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: {
-                          TAG: /* Conditional_expr_expected_type */7,
-                          _0: /* Dir_type_string */3,
-                          _1: type_of_directive(lhs)
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: {
+                      TAG: /* Conditional_expr_expected_type */7,
+                      _0: /* Dir_type_string */3,
+                      _1: type_of_directive(lhs)
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             break;
         case "<=" :
@@ -14465,13 +14465,13 @@ function directive_parse(token_with_comments, lexbuf) {
       }
       if (exit$3 === 2) {
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "parsing/lexer.mll",
-                    331,
-                    17
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "parsing/lexer.mll",
+                331,
+                17
+              ]
+            });
       }
       const curr_loc$1 = curr(lexbuf);
       const rhs$1 = value_of_token(curr_loc$1, token(undefined));
@@ -14498,52 +14498,52 @@ function directive_parse(token_with_comments, lexbuf) {
                 return v;
               }
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: /* Unterminated_paren_in_conditional */1,
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: /* Unterminated_paren_in_conditional */1,
+                    _2: curr(lexbuf)
+                  });
             } else {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: /* Unterminated_paren_in_conditional */1,
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: /* Unterminated_paren_in_conditional */1,
+                    _2: curr(lexbuf)
+                  });
             }
         case /* TRUE */91 :
             return true;
         default:
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: /* Unexpected_token_in_conditional */4,
-                    _2: curr_loc
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: /* Unexpected_token_in_conditional */4,
+                _2: curr_loc
+              });
       }
     } else {
       switch (curr_token.TAG) {
         case /* FLOAT */1 :
             return token_op(calc, (function (e) {
-                          throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                    MEL_EXN_ID: $$Error$2,
-                                    _1: {
-                                      TAG: /* Conditional_expr_expected_type */7,
-                                      _0: /* Dir_type_bool */0,
-                                      _1: /* Dir_type_float */1
-                                    },
-                                    _2: curr_loc
-                                  });
-                        }), {
-                        TAG: /* Dir_float */1,
-                        _0: Caml_format.caml_float_of_string(curr_token._0)
-                      });
+                    throw new Caml_js_exceptions.MelangeError($$Error$2, {
+                          MEL_EXN_ID: $$Error$2,
+                          _1: {
+                            TAG: /* Conditional_expr_expected_type */7,
+                            _0: /* Dir_type_bool */0,
+                            _1: /* Dir_type_float */1
+                          },
+                          _2: curr_loc
+                        });
+                  }), {
+                  TAG: /* Dir_float */1,
+                  _0: Caml_format.caml_float_of_string(curr_token._0)
+                });
         case /* INT */7 :
             const v$1 = curr_token._0;
             return token_op(calc, (function (e) {
-                          push(e);
-                          return v$1 !== 0;
-                        }), {
-                        TAG: /* Dir_int */2,
-                        _0: v$1
-                      });
+                    push(e);
+                    return v$1 !== 0;
+                  }), {
+                  TAG: /* Dir_int */2,
+                  _0: v$1
+                });
         case /* LIDENT */11 :
             const r = curr_token._0;
             switch (r) {
@@ -14552,19 +14552,19 @@ function directive_parse(token_with_comments, lexbuf) {
                   break;
               default:
                 throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                          MEL_EXN_ID: $$Error$2,
-                          _1: /* Unexpected_token_in_conditional */4,
-                          _2: curr_loc
-                        });
+                      MEL_EXN_ID: $$Error$2,
+                      _1: /* Unexpected_token_in_conditional */4,
+                      _2: curr_loc
+                    });
             }
             const t = token(undefined);
             const loc = curr(lexbuf);
             if (/* tag */typeof t === "number" || typeof t === "string") {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: /* Unexpected_token_in_conditional */4,
-                        _2: loc
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: /* Unexpected_token_in_conditional */4,
+                    _2: loc
+                  });
             }
             if (t.TAG === /* UIDENT */17) {
               const s = t._0;
@@ -14579,50 +14579,50 @@ function directive_parse(token_with_comments, lexbuf) {
               }
             }
             throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                      MEL_EXN_ID: $$Error$2,
-                      _1: /* Unexpected_token_in_conditional */4,
-                      _2: loc
-                    });
+                  MEL_EXN_ID: $$Error$2,
+                  _1: /* Unexpected_token_in_conditional */4,
+                  _2: loc
+                });
             break;
         case /* STRING */16 :
             return token_op(calc, (function (e) {
-                          throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                    MEL_EXN_ID: $$Error$2,
-                                    _1: {
-                                      TAG: /* Conditional_expr_expected_type */7,
-                                      _0: /* Dir_type_bool */0,
-                                      _1: /* Dir_type_string */3
-                                    },
-                                    _2: curr_loc
-                                  });
-                        }), {
-                        TAG: /* Dir_string */3,
-                        _0: curr_token._0[0]
-                      });
+                    throw new Caml_js_exceptions.MelangeError($$Error$2, {
+                          MEL_EXN_ID: $$Error$2,
+                          _1: {
+                            TAG: /* Conditional_expr_expected_type */7,
+                            _0: /* Dir_type_bool */0,
+                            _1: /* Dir_type_string */3
+                          },
+                          _2: curr_loc
+                        });
+                  }), {
+                  TAG: /* Dir_string */3,
+                  _0: curr_token._0[0]
+                });
         case /* UIDENT */17 :
             const value_v = query(curr_loc, curr_token._0);
             return token_op(calc, (function (e) {
-                          push(e);
-                          if (!/* tag */(typeof value_v === "number" || typeof value_v === "string") && value_v.TAG === /* Dir_bool */0) {
-                            return value_v._0;
-                          }
-                          const ty = type_of_directive(value_v);
-                          throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                    MEL_EXN_ID: $$Error$2,
-                                    _1: {
-                                      TAG: /* Conditional_expr_expected_type */7,
-                                      _0: /* Dir_type_bool */0,
-                                      _1: ty
-                                    },
-                                    _2: curr_loc
-                                  });
-                        }), value_v);
+                    push(e);
+                    if (!/* tag */(typeof value_v === "number" || typeof value_v === "string") && value_v.TAG === /* Dir_bool */0) {
+                      return value_v._0;
+                    }
+                    const ty = type_of_directive(value_v);
+                    throw new Caml_js_exceptions.MelangeError($$Error$2, {
+                          MEL_EXN_ID: $$Error$2,
+                          _1: {
+                            TAG: /* Conditional_expr_expected_type */7,
+                            _0: /* Dir_type_bool */0,
+                            _1: ty
+                          },
+                          _2: curr_loc
+                        });
+                  }), value_v);
         default:
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: /* Unexpected_token_in_conditional */4,
-                    _2: curr_loc
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: /* Unexpected_token_in_conditional */4,
+                _2: curr_loc
+              });
       }
     }
   };
@@ -14671,16 +14671,16 @@ function directive_parse(token_with_comments, lexbuf) {
       return v;
     }
     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-              MEL_EXN_ID: $$Error$2,
-              _1: /* Expect_hash_then_in_conditional */5,
-              _2: curr(lexbuf)
-            });
+          MEL_EXN_ID: $$Error$2,
+          _1: /* Expect_hash_then_in_conditional */5,
+          _2: curr(lexbuf)
+        });
   } else {
     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-              MEL_EXN_ID: $$Error$2,
-              _1: /* Expect_hash_then_in_conditional */5,
-              _2: curr(lexbuf)
-            });
+          MEL_EXN_ID: $$Error$2,
+          _1: /* Expect_hash_then_in_conditional */5,
+          _2: curr(lexbuf)
+        });
   }
 }
 
@@ -15139,9 +15139,9 @@ function with_comment_buffer(comment, lexbuf) {
     loc_ghost: loc_loc_ghost
   };
   return [
-          s,
-          loc
-        ];
+    s,
+    loc
+  ];
 }
 
 function char_for_backslash(c) {
@@ -15180,13 +15180,13 @@ function char_for_decimal_code(lexbuf, i) {
     return /* 'x' */120;
   }
   throw new Caml_js_exceptions.MelangeError($$Error$2, {
-            MEL_EXN_ID: $$Error$2,
-            _1: {
-              TAG: /* Illegal_escape */1,
-              _0: Stdlib__Lexing.lexeme(lexbuf)
-            },
-            _2: curr(lexbuf)
-          });
+        MEL_EXN_ID: $$Error$2,
+        _1: {
+          TAG: /* Illegal_escape */1,
+          _0: Stdlib__Lexing.lexeme(lexbuf)
+        },
+        _2: curr(lexbuf)
+      });
 }
 
 function char_for_hexadecimal_code(lexbuf, i) {
@@ -15215,13 +15215,13 @@ function cvt_int64_literal(s) {
 
 function cvt_nativeint_literal(s) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "parsing/lexer.mll",
-              622,
-              30
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "parsing/lexer.mll",
+          622,
+          30
+        ]
+      });
 }
 
 function remove_underscores(s) {
@@ -15256,13 +15256,13 @@ function get_label_name(lexbuf) {
   const name = Stdlib__String.sub(s, 1, s.length - 2 | 0);
   if (Stdlib__Hashtbl.mem(keyword_table, name)) {
     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-              MEL_EXN_ID: $$Error$2,
-              _1: {
-                TAG: /* Keyword_as_label */4,
-                _0: name
-              },
-              _2: curr(lexbuf)
-            });
+          MEL_EXN_ID: $$Error$2,
+          _1: {
+            TAG: /* Keyword_as_label */4,
+            _0: name
+          },
+          _2: curr(lexbuf)
+        });
   }
   return name;
 }
@@ -15313,217 +15313,217 @@ function report_error$2(ppf, c) {
     switch (c) {
       case /* Unterminated_string */0 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "String literal not terminated",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "String literal not terminated"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "String literal not terminated",
+                  _1: /* End_of_format */0
+                },
+                _1: "String literal not terminated"
+              });
       case /* Unterminated_paren_in_conditional */1 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Unterminated parens in conditional predicate",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Unterminated parens in conditional predicate"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Unterminated parens in conditional predicate",
+                  _1: /* End_of_format */0
+                },
+                _1: "Unterminated parens in conditional predicate"
+              });
       case /* Unterminated_if */2 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "#if not terminated",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "#if not terminated"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "#if not terminated",
+                  _1: /* End_of_format */0
+                },
+                _1: "#if not terminated"
+              });
       case /* Unterminated_else */3 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "#else not terminated",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "#else not terminated"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "#else not terminated",
+                  _1: /* End_of_format */0
+                },
+                _1: "#else not terminated"
+              });
       case /* Unexpected_token_in_conditional */4 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Unexpected token in conditional predicate",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Unexpected token in conditional predicate"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Unexpected token in conditional predicate",
+                  _1: /* End_of_format */0
+                },
+                _1: "Unexpected token in conditional predicate"
+              });
       case /* Expect_hash_then_in_conditional */5 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Expect `then` after conditional predicate",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Expect `then` after conditional predicate"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Expect `then` after conditional predicate",
+                  _1: /* End_of_format */0
+                },
+                _1: "Expect `then` after conditional predicate"
+              });
       case /* Unexpected_directive */6 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Unexpected directive",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Unexpected directive"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Unexpected directive",
+                  _1: /* End_of_format */0
+                },
+                _1: "Unexpected directive"
+              });
       
     }
   } else {
     switch (c.TAG) {
       case /* Illegal_character */0 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Illegal character (",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ')' */41,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "Illegal character (%s)"
-                        }), Stdlib__Char.escaped(c._0));
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Illegal character (",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ')' */41,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "Illegal character (%s)"
+                  }), Stdlib__Char.escaped(c._0));
       case /* Illegal_escape */1 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Illegal backslash escape in string or character (",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ')' */41,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "Illegal backslash escape in string or character (%s)"
-                        }), c._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Illegal backslash escape in string or character (",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ')' */41,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "Illegal backslash escape in string or character (%s)"
+                  }), c._0);
       case /* Unterminated_comment */2 :
           return Stdlib__Format.fprintf(ppf)({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "Comment not terminated",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "Comment not terminated"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "Comment not terminated",
+                  _1: /* End_of_format */0
+                },
+                _1: "Comment not terminated"
+              });
       case /* Unterminated_string_in_comment */3 :
           return Curry._2(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "This comment contains an unterminated string literal",
+                      _1: {
+                        TAG: /* Formatting_lit */17,
+                        _0: /* Flush_newline */4,
+                        _1: {
+                          TAG: /* Alpha */15,
                           _0: {
                             TAG: /* String_literal */11,
-                            _0: "This comment contains an unterminated string literal",
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: /* Flush_newline */4,
-                              _1: {
-                                TAG: /* Alpha */15,
-                                _0: {
-                                  TAG: /* String_literal */11,
-                                  _0: "String literal begins here",
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
-                          },
-                          _1: "This comment contains an unterminated string literal@.%aString literal begins here"
-                        }), print_error, c._1);
+                            _0: "String literal begins here",
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      }
+                    },
+                    _1: "This comment contains an unterminated string literal@.%aString literal begins here"
+                  }), print_error, c._1);
       case /* Keyword_as_label */4 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '`' */96,
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: "' is a keyword, it cannot be used as label name",
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "`%s' is a keyword, it cannot be used as label name"
-                        }), c._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '`' */96,
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: "' is a keyword, it cannot be used as label name",
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "`%s' is a keyword, it cannot be used as label name"
+                  }), c._0);
       case /* Literal_overflow */5 :
           return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Integer literal exceeds the range of representable integers of type ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          },
-                          _1: "Integer literal exceeds the range of representable integers of type %s"
-                        }), c._0);
-      case /* Illegal_semver */6 :
-          return Curry._1(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Illegal semantic version string ",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            }
-                          },
-                          _1: "Illegal semantic version string %s"
-                        }), c._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Integer literal exceeds the range of representable integers of type ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
+                      }
+                    },
+                    _1: "Integer literal exceeds the range of representable integers of type %s"
+                  }), c._0);
+      case /* Illegal_semver */6 :
+          return Curry._1(Stdlib__Format.fprintf(ppf)({
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Illegal semantic version string ",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: /* End_of_format */0
+                      }
+                    },
+                    _1: "Illegal semantic version string %s"
+                  }), c._0);
       case /* Conditional_expr_expected_type */7 :
           return Curry._2(Stdlib__Format.fprintf(ppf)({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Conditional expression type mismatch (",
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Conditional expression type mismatch (",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ',' */44,
+                          _1: {
+                            TAG: /* String */2,
+                            _0: /* No_padding */0,
                             _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ',' */44,
-                                _1: {
-                                  TAG: /* String */2,
-                                  _0: /* No_padding */0,
-                                  _1: {
-                                    TAG: /* Char_literal */12,
-                                    _0: /* ')' */41,
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                              TAG: /* Char_literal */12,
+                              _0: /* ')' */41,
+                              _1: /* End_of_format */0
                             }
-                          },
-                          _1: "Conditional expression type mismatch (%s,%s)"
-                        }), string_of_type_directive(c._0), string_of_type_directive(c._1));
+                          }
+                        }
+                      }
+                    },
+                    _1: "Conditional expression type mismatch (%s,%s)"
+                  }), string_of_type_directive(c._0), string_of_type_directive(c._1));
       
     }
   }
@@ -15560,13 +15560,13 @@ function token(lexbuf) {
       case 0 :
           if (!escaped_newlines.contents) {
             throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                      MEL_EXN_ID: $$Error$2,
-                      _1: {
-                        TAG: /* Illegal_character */0,
-                        _0: Stdlib__Lexing.lexeme_char(lexbuf, 0)
-                      },
-                      _2: curr(lexbuf)
-                    });
+                  MEL_EXN_ID: $$Error$2,
+                  _1: {
+                    TAG: /* Illegal_character */0,
+                    _0: Stdlib__Lexing.lexeme_char(lexbuf, 0)
+                  },
+                  _2: curr(lexbuf)
+                });
           }
           update_loc(lexbuf, undefined, 1, false, 0);
           return token(lexbuf);
@@ -15581,34 +15581,34 @@ function token(lexbuf) {
           return /* TILDE */89;
       case 5 :
           return {
-                  TAG: /* LABEL */10,
-                  _0: get_label_name(lexbuf)
-                };
+            TAG: /* LABEL */10,
+            _0: get_label_name(lexbuf)
+          };
       case 6 :
           prerr_warning(curr(lexbuf), {
                 TAG: /* Deprecated */0,
                 _0: "ISO-Latin1 characters in identifiers"
               });
           return {
-                  TAG: /* LABEL */10,
-                  _0: get_label_name(lexbuf)
-                };
+            TAG: /* LABEL */10,
+            _0: get_label_name(lexbuf)
+          };
       case 7 :
           return /* QUESTION */76;
       case 8 :
           return {
-                  TAG: /* OPTLABEL */13,
-                  _0: get_label_name(lexbuf)
-                };
+            TAG: /* OPTLABEL */13,
+            _0: get_label_name(lexbuf)
+          };
       case 9 :
           prerr_warning(curr(lexbuf), {
                 TAG: /* Deprecated */0,
                 _0: "ISO-Latin1 characters in identifiers"
               });
           return {
-                  TAG: /* OPTLABEL */13,
-                  _0: get_label_name(lexbuf)
-                };
+            TAG: /* OPTLABEL */13,
+            _0: get_label_name(lexbuf)
+          };
       case 10 :
           const s = Stdlib__Lexing.lexeme(lexbuf);
           try {
@@ -15618,9 +15618,9 @@ function token(lexbuf) {
             const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn.MEL_EXN_ID === Stdlib.Not_found) {
               return {
-                      TAG: /* LIDENT */11,
-                      _0: s
-                    };
+                TAG: /* LIDENT */11,
+                _0: s
+              };
             }
             throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
           }
@@ -15630,109 +15630,109 @@ function token(lexbuf) {
                 _0: "ISO-Latin1 characters in identifiers"
               });
           return {
-                  TAG: /* LIDENT */11,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* LIDENT */11,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 12 :
           return {
-                  TAG: /* UIDENT */17,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* UIDENT */17,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 13 :
           prerr_warning(curr(lexbuf), {
                 TAG: /* Deprecated */0,
                 _0: "ISO-Latin1 characters in identifiers"
               });
           return {
-                  TAG: /* UIDENT */17,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* UIDENT */17,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 14 :
           try {
             return {
-                    TAG: /* INT */7,
-                    _0: cvt_int_literal(Stdlib__Lexing.lexeme(lexbuf))
-                  };
+              TAG: /* INT */7,
+              _0: cvt_int_literal(Stdlib__Lexing.lexeme(lexbuf))
+            };
           }
           catch (raw_exn$1){
             const exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
             if (exn$1.MEL_EXN_ID === Stdlib.Failure) {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: {
-                          TAG: /* Literal_overflow */5,
-                          _0: "int"
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: {
+                      TAG: /* Literal_overflow */5,
+                      _0: "int"
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
           }
       case 15 :
           return {
-                  TAG: /* FLOAT */1,
-                  _0: remove_underscores(Stdlib__Lexing.lexeme(lexbuf))
-                };
+            TAG: /* FLOAT */1,
+            _0: remove_underscores(Stdlib__Lexing.lexeme(lexbuf))
+          };
       case 16 :
           try {
             return {
-                    TAG: /* INT32 */8,
-                    _0: cvt_int32_literal(Stdlib__Lexing.lexeme(lexbuf))
-                  };
+              TAG: /* INT32 */8,
+              _0: cvt_int32_literal(Stdlib__Lexing.lexeme(lexbuf))
+            };
           }
           catch (raw_exn$2){
             const exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn$2);
             if (exn$2.MEL_EXN_ID === Stdlib.Failure) {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: {
-                          TAG: /* Literal_overflow */5,
-                          _0: "int32"
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: {
+                      TAG: /* Literal_overflow */5,
+                      _0: "int32"
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$2.MEL_EXN_ID, exn$2);
           }
       case 17 :
           try {
             return {
-                    TAG: /* INT64 */9,
-                    _0: cvt_int64_literal(Stdlib__Lexing.lexeme(lexbuf))
-                  };
+              TAG: /* INT64 */9,
+              _0: cvt_int64_literal(Stdlib__Lexing.lexeme(lexbuf))
+            };
           }
           catch (raw_exn$3){
             const exn$3 = Caml_js_exceptions.internalToOCamlException(raw_exn$3);
             if (exn$3.MEL_EXN_ID === Stdlib.Failure) {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: {
-                          TAG: /* Literal_overflow */5,
-                          _0: "int64"
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: {
+                      TAG: /* Literal_overflow */5,
+                      _0: "int64"
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$3.MEL_EXN_ID, exn$3);
           }
       case 18 :
           try {
             return {
-                    TAG: /* NATIVEINT */12,
-                    _0: cvt_nativeint_literal(Stdlib__Lexing.lexeme(lexbuf))
-                  };
+              TAG: /* NATIVEINT */12,
+              _0: cvt_nativeint_literal(Stdlib__Lexing.lexeme(lexbuf))
+            };
           }
           catch (raw_exn$4){
             const exn$4 = Caml_js_exceptions.internalToOCamlException(raw_exn$4);
             if (exn$4.MEL_EXN_ID === Stdlib.Failure) {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: {
-                          TAG: /* Literal_overflow */5,
-                          _0: "nativeint"
-                        },
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: {
+                      TAG: /* Literal_overflow */5,
+                      _0: "nativeint"
+                    },
+                    _2: curr(lexbuf)
+                  });
             }
             throw new Caml_js_exceptions.MelangeError(exn$4.MEL_EXN_ID, exn$4);
           }
@@ -15745,12 +15745,12 @@ function token(lexbuf) {
           is_in_string.contents = false;
           lexbuf.lex_start_p = string_start;
           return {
-                  TAG: /* STRING */16,
-                  _0: [
-                    get_stored_string(undefined),
-                    undefined
-                  ]
-                };
+            TAG: /* STRING */16,
+            _0: [
+              get_stored_string(undefined),
+              undefined
+            ]
+          };
       case 20 :
           reset_string_buffer(undefined);
           const delim = Stdlib__Lexing.lexeme(lexbuf);
@@ -15762,64 +15762,64 @@ function token(lexbuf) {
           is_in_string.contents = false;
           lexbuf.lex_start_p = string_start$1;
           return {
-                  TAG: /* STRING */16,
-                  _0: [
-                    get_stored_string(undefined),
-                    delim$1
-                  ]
-                };
+            TAG: /* STRING */16,
+            _0: [
+              get_stored_string(undefined),
+              delim$1
+            ]
+          };
       case 21 :
           update_loc(lexbuf, undefined, 1, false, 1);
           return {
-                  TAG: /* CHAR */0,
-                  _0: Stdlib__Lexing.lexeme_char(lexbuf, 1)
-                };
+            TAG: /* CHAR */0,
+            _0: Stdlib__Lexing.lexeme_char(lexbuf, 1)
+          };
       case 22 :
           return {
-                  TAG: /* CHAR */0,
-                  _0: Stdlib__Lexing.lexeme_char(lexbuf, 1)
-                };
+            TAG: /* CHAR */0,
+            _0: Stdlib__Lexing.lexeme_char(lexbuf, 1)
+          };
       case 23 :
           return {
-                  TAG: /* CHAR */0,
-                  _0: char_for_backslash(Stdlib__Lexing.lexeme_char(lexbuf, 2))
-                };
+            TAG: /* CHAR */0,
+            _0: char_for_backslash(Stdlib__Lexing.lexeme_char(lexbuf, 2))
+          };
       case 24 :
           return {
-                  TAG: /* CHAR */0,
-                  _0: char_for_decimal_code(lexbuf, 2)
-                };
+            TAG: /* CHAR */0,
+            _0: char_for_decimal_code(lexbuf, 2)
+          };
       case 25 :
           return {
-                  TAG: /* CHAR */0,
-                  _0: char_for_hexadecimal_code(lexbuf, 3)
-                };
+            TAG: /* CHAR */0,
+            _0: char_for_hexadecimal_code(lexbuf, 3)
+          };
       case 26 :
           const l = Stdlib__Lexing.lexeme(lexbuf);
           const esc = Stdlib__String.sub(l, 1, l.length - 1 | 0);
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: {
-                      TAG: /* Illegal_escape */1,
-                      _0: esc
-                    },
-                    _2: curr(lexbuf)
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: {
+                  TAG: /* Illegal_escape */1,
+                  _0: esc
+                },
+                _2: curr(lexbuf)
+              });
       case 27 :
           const match = with_comment_buffer(comment, lexbuf);
           return {
-                  TAG: /* COMMENT */18,
-                  _0: [
-                    match[0],
-                    match[1]
-                  ]
-                };
+            TAG: /* COMMENT */18,
+            _0: [
+              match[0],
+              match[1]
+            ]
+          };
       case 28 :
           const match$1 = with_comment_buffer(comment, lexbuf);
           return {
-                  TAG: /* DOCSTRING */19,
-                  _0: docstring(match$1[0], match$1[1])
-                };
+            TAG: /* DOCSTRING */19,
+            _0: docstring(match$1[0], match$1[1])
+          };
       case 29 :
           const stars = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos);
           const match$2 = with_comment_buffer((function (lexbuf) {
@@ -15827,33 +15827,33 @@ function token(lexbuf) {
                   return __ocaml_lex_comment_rec(lexbuf, 132);
                 }), lexbuf);
           return {
-                  TAG: /* COMMENT */18,
-                  _0: [
-                    match$2[0],
-                    match$2[1]
-                  ]
-                };
+            TAG: /* COMMENT */18,
+            _0: [
+              match$2[0],
+              match$2[1]
+            ]
+          };
       case 30 :
           if (print_warnings.contents) {
             prerr_warning(curr(lexbuf), /* Comment_start */0);
           }
           const match$3 = with_comment_buffer(comment, lexbuf);
           return {
-                  TAG: /* COMMENT */18,
-                  _0: [
-                    match$3[0],
-                    match$3[1]
-                  ]
-                };
+            TAG: /* COMMENT */18,
+            _0: [
+              match$3[0],
+              match$3[1]
+            ]
+          };
       case 31 :
           const stars$1 = Stdlib__Lexing.sub_lexeme(lexbuf, lexbuf.lex_start_pos, lexbuf.lex_curr_pos - 2 | 0);
           return {
-                  TAG: /* COMMENT */18,
-                  _0: [
-                    stars$1,
-                    curr(lexbuf)
-                  ]
-                };
+            TAG: /* COMMENT */18,
+            _0: [
+              stars$1,
+              curr(lexbuf)
+            ]
+          };
       case 32 :
           const loc = curr(lexbuf);
           prerr_warning(loc, /* Comment_not_end */1);
@@ -15955,9 +15955,9 @@ function token(lexbuf) {
           return /* BANG */6;
       case 75 :
           return {
-                  TAG: /* INFIXOP0 */2,
-                  _0: "!="
-                };
+            TAG: /* INFIXOP0 */2,
+            _0: "!="
+          };
       case 76 :
           return /* PLUS */72;
       case 77 :
@@ -15971,66 +15971,66 @@ function token(lexbuf) {
       case 81 :
       case 82 :
           return {
-                  TAG: /* PREFIXOP */14,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* PREFIXOP */14,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 83 :
           return {
-                  TAG: /* INFIXOP0 */2,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP0 */2,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 84 :
           return {
-                  TAG: /* INFIXOP1 */3,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP1 */3,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 85 :
           return {
-                  TAG: /* INFIXOP2 */4,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP2 */4,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 86 :
           return {
-                  TAG: /* INFIXOP4 */6,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP4 */6,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 87 :
           return /* PERCENT */71;
       case 88 :
           return {
-                  TAG: /* INFIXOP3 */5,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* INFIXOP3 */5,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 89 :
           return {
-                  TAG: /* SHARPOP */15,
-                  _0: Stdlib__Lexing.lexeme(lexbuf)
-                };
+            TAG: /* SHARPOP */15,
+            _0: Stdlib__Lexing.lexeme(lexbuf)
+          };
       case 90 :
           if (if_then_else.contents === /* Dir_out */2) {
             return /* EOF */25;
           }
           if (if_then_else.contents === /* Dir_if_true */0) {
             throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                      MEL_EXN_ID: $$Error$2,
-                      _1: /* Unterminated_if */2,
-                      _2: curr(lexbuf)
-                    });
+                  MEL_EXN_ID: $$Error$2,
+                  _1: /* Unterminated_if */2,
+                  _2: curr(lexbuf)
+                });
           }
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: /* Unterminated_else */3,
-                    _2: curr(lexbuf)
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: /* Unterminated_else */3,
+                _2: curr(lexbuf)
+              });
       case 91 :
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: {
-                      TAG: /* Illegal_character */0,
-                      _0: Stdlib__Lexing.lexeme_char(lexbuf, 0)
-                    },
-                    _2: curr(lexbuf)
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: {
+                  TAG: /* Illegal_character */0,
+                  _0: Stdlib__Lexing.lexeme_char(lexbuf, 0)
+                },
+                _2: curr(lexbuf)
+              });
       default:
         Curry._1(lexbuf.refill_buff, lexbuf);
         ___ocaml_lex_state = __ocaml_lex_state$1;
@@ -16080,10 +16080,10 @@ function string(lexbuf) {
       case 7 :
           is_in_string.contents = false;
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: /* Unterminated_string */0,
-                    _2: string_start_loc.contents
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: /* Unterminated_string */0,
+                _2: string_start_loc.contents
+              });
       case 8 :
           store_string_char(Stdlib__Lexing.lexeme_char(lexbuf, 0));
           return string(lexbuf);
@@ -16121,13 +16121,13 @@ function __ocaml_lex_comment_rec(lexbuf, ___ocaml_lex_state) {
             return curr(lexbuf);
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "parsing/lexer.mll",
-                      992,
-                      16
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "parsing/lexer.mll",
+                  992,
+                  16
+                ]
+              });
       case 2 :
           string_start_loc.contents = curr(lexbuf);
           store_string_char(/* '"' */34);
@@ -16146,23 +16146,23 @@ function __ocaml_lex_comment_rec(lexbuf, ___ocaml_lex_state) {
                     const start = Stdlib__List.hd(Stdlib__List.rev(comment_start_loc.contents));
                     comment_start_loc.contents = /* [] */0;
                     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                              MEL_EXN_ID: $$Error$2,
-                              _1: {
-                                TAG: /* Unterminated_string_in_comment */3,
-                                _0: start,
-                                _1: exn._2
-                              },
-                              _2: match$1.hd
-                            });
+                          MEL_EXN_ID: $$Error$2,
+                          _1: {
+                            TAG: /* Unterminated_string_in_comment */3,
+                            _0: start,
+                            _1: exn._2
+                          },
+                          _2: match$1.hd
+                        });
                   }
                   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                            MEL_EXN_ID: "Assert_failure",
-                            _1: [
-                              "parsing/lexer.mll",
-                              1006,
-                              18
-                            ]
-                          });
+                        MEL_EXN_ID: "Assert_failure",
+                        _1: [
+                          "parsing/lexer.mll",
+                          1006,
+                          18
+                        ]
+                      });
                 }
                 throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
               } else {
@@ -16196,23 +16196,23 @@ function __ocaml_lex_comment_rec(lexbuf, ___ocaml_lex_state) {
                     const start$1 = Stdlib__List.hd(Stdlib__List.rev(comment_start_loc.contents));
                     comment_start_loc.contents = /* [] */0;
                     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                              MEL_EXN_ID: $$Error$2,
-                              _1: {
-                                TAG: /* Unterminated_string_in_comment */3,
-                                _0: start$1,
-                                _1: exn$1._2
-                              },
-                              _2: match$2.hd
-                            });
+                          MEL_EXN_ID: $$Error$2,
+                          _1: {
+                            TAG: /* Unterminated_string_in_comment */3,
+                            _0: start$1,
+                            _1: exn$1._2
+                          },
+                          _2: match$2.hd
+                        });
                   }
                   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                            MEL_EXN_ID: "Assert_failure",
-                            _1: [
-                              "parsing/lexer.mll",
-                              1026,
-                              18
-                            ]
-                          });
+                        MEL_EXN_ID: "Assert_failure",
+                        _1: [
+                          "parsing/lexer.mll",
+                          1026,
+                          18
+                        ]
+                      });
                 }
                 throw new Caml_js_exceptions.MelangeError(exn$1.MEL_EXN_ID, exn$1);
               } else {
@@ -16239,22 +16239,22 @@ function __ocaml_lex_comment_rec(lexbuf, ___ocaml_lex_state) {
             const start$2 = Stdlib__List.hd(Stdlib__List.rev(comment_start_loc.contents));
             comment_start_loc.contents = /* [] */0;
             throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                      MEL_EXN_ID: $$Error$2,
-                      _1: {
-                        TAG: /* Unterminated_comment */2,
-                        _0: start$2
-                      },
-                      _2: match$3.hd
-                    });
+                  MEL_EXN_ID: $$Error$2,
+                  _1: {
+                    TAG: /* Unterminated_comment */2,
+                    _0: start$2
+                  },
+                  _2: match$3.hd
+                });
           }
           throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                    MEL_EXN_ID: "Assert_failure",
-                    _1: [
-                      "parsing/lexer.mll",
-                      1056,
-                      16
-                    ]
-                  });
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "parsing/lexer.mll",
+                  1056,
+                  16
+                ]
+              });
       case 11 :
           update_loc(lexbuf, undefined, 1, false, 0);
           store_string(Stdlib__Lexing.lexeme(lexbuf));
@@ -16290,10 +16290,10 @@ function __ocaml_lex_quoted_string_rec(delim, lexbuf, ___ocaml_lex_state) {
       case 1 :
           is_in_string.contents = false;
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: /* Unterminated_string */0,
-                    _2: string_start_loc.contents
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: /* Unterminated_string */0,
+                _2: string_start_loc.contents
+              });
       case 2 :
           const edelim = Stdlib__Lexing.lexeme(lexbuf);
           const edelim$1 = Stdlib__String.sub(edelim, 1, edelim.length - 2 | 0);
@@ -16365,10 +16365,10 @@ function interpret_directive(lexbuf, cont, look_ahead) {
             case /* Dir_if_false */1 :
             case /* Dir_out */2 :
                 throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                          MEL_EXN_ID: $$Error$2,
-                          _1: /* Unexpected_directive */6,
-                          _2: curr(lexbuf)
-                        });
+                      MEL_EXN_ID: $$Error$2,
+                      _1: /* Unexpected_directive */6,
+                      _2: curr(lexbuf)
+                    });
             
           }
           break;
@@ -16380,10 +16380,10 @@ function interpret_directive(lexbuf, cont, look_ahead) {
                 return Curry._1(cont, lexbuf);
             case /* Dir_out */2 :
                 throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                          MEL_EXN_ID: $$Error$2,
-                          _1: /* Unexpected_directive */6,
-                          _2: curr(lexbuf)
-                        });
+                      MEL_EXN_ID: $$Error$2,
+                      _1: /* Unexpected_directive */6,
+                      _2: curr(lexbuf)
+                    });
             
           }
       case /* IF */37 :
@@ -16391,10 +16391,10 @@ function interpret_directive(lexbuf, cont, look_ahead) {
             case /* Dir_if_true */0 :
             case /* Dir_if_false */1 :
                 throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                          MEL_EXN_ID: $$Error$2,
-                          _1: /* Unexpected_directive */6,
-                          _2: curr(lexbuf)
-                        });
+                      MEL_EXN_ID: $$Error$2,
+                      _1: /* Unexpected_directive */6,
+                      _2: curr(lexbuf)
+                    });
             case /* Dir_out */2 :
                 if (directive_parse(token_with_comments, lexbuf)) {
                   if_then_else.contents = /* Dir_if_true */0;
@@ -16405,10 +16405,10 @@ function interpret_directive(lexbuf, cont, look_ahead) {
                     const token = token_with_comments(lexbuf);
                     if (Caml_obj.caml_equal(token, /* EOF */25)) {
                       throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                MEL_EXN_ID: $$Error$2,
-                                _1: /* Unterminated_if */2,
-                                _2: curr(lexbuf)
-                              });
+                            MEL_EXN_ID: $$Error$2,
+                            _1: /* Unterminated_if */2,
+                            _2: curr(lexbuf)
+                          });
                     }
                     if (Caml_obj.caml_equal(token, /* SHARP */84) && at_bol(lexbuf)) {
                       const token$1 = token_with_comments(lexbuf);
@@ -16422,10 +16422,10 @@ function interpret_directive(lexbuf, cont, look_ahead) {
                               return Curry._1(cont, lexbuf);
                           case /* IF */37 :
                               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                        MEL_EXN_ID: $$Error$2,
-                                        _1: /* Unexpected_directive */6,
-                                        _2: curr(lexbuf)
-                                      });
+                                    MEL_EXN_ID: $$Error$2,
+                                    _1: /* Unexpected_directive */6,
+                                    _2: curr(lexbuf)
+                                  });
                           default:
                             
                         }
@@ -16459,10 +16459,10 @@ function interpret_directive(lexbuf, cont, look_ahead) {
       case /* Dir_if_false */1 :
       case /* Dir_out */2 :
           throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                    MEL_EXN_ID: $$Error$2,
-                    _1: /* Unexpected_directive */6,
-                    _2: curr(lexbuf)
-                  });
+                MEL_EXN_ID: $$Error$2,
+                _1: /* Unexpected_directive */6,
+                _2: curr(lexbuf)
+              });
       
     }
   }
@@ -16474,10 +16474,10 @@ function interpret_directive(lexbuf, cont, look_ahead) {
           const token$2 = token_with_comments(lexbuf);
           if (Caml_obj.caml_equal(token$2, /* EOF */25)) {
             throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                      MEL_EXN_ID: $$Error$2,
-                      _1: /* Unterminated_else */3,
-                      _2: curr(lexbuf)
-                    });
+                  MEL_EXN_ID: $$Error$2,
+                  _1: /* Unterminated_else */3,
+                  _2: curr(lexbuf)
+                });
           }
           if (Caml_obj.caml_equal(token$2, /* SHARP */84) && at_bol(lexbuf)) {
             const token$3 = token_with_comments(lexbuf);
@@ -16486,10 +16486,10 @@ function interpret_directive(lexbuf, cont, look_ahead) {
                 case /* ELSE */23 :
                     if (else_seen) {
                       throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                                MEL_EXN_ID: $$Error$2,
-                                _1: /* Unexpected_directive */6,
-                                _2: curr(lexbuf)
-                              });
+                            MEL_EXN_ID: $$Error$2,
+                            _1: /* Unexpected_directive */6,
+                            _2: curr(lexbuf)
+                          });
                     }
                     _else_seen = true;
                     continue ;
@@ -16498,20 +16498,20 @@ function interpret_directive(lexbuf, cont, look_ahead) {
                     return Curry._1(cont, lexbuf);
                 case /* IF */37 :
                     throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                              MEL_EXN_ID: $$Error$2,
-                              _1: /* Unexpected_directive */6,
-                              _2: curr(lexbuf)
-                            });
+                          MEL_EXN_ID: $$Error$2,
+                          _1: /* Unexpected_directive */6,
+                          _2: curr(lexbuf)
+                        });
                 default:
                   
               }
             }
             if (else_seen && is_elif(token$3)) {
               throw new Caml_js_exceptions.MelangeError($$Error$2, {
-                        MEL_EXN_ID: $$Error$2,
-                        _1: /* Unexpected_directive */6,
-                        _2: curr(lexbuf)
-                      });
+                    MEL_EXN_ID: $$Error$2,
+                    _1: /* Unexpected_directive */6,
+                    _2: curr(lexbuf)
+                  });
             }
             continue ;
           }
@@ -16574,11 +16574,11 @@ function token$1(lexbuf) {
           case /* SHARP */84 :
               if (at_bol(lexbuf)) {
                 return interpret_directive(lexbuf, (function (lexbuf) {
-                              return loop(lines, docs, lexbuf);
-                            }), (function (token) {
-                              sharp_look_ahead.contents = token;
-                              return /* SHARP */84;
-                            }));
+                        return loop(lines, docs, lexbuf);
+                      }), (function (token) {
+                        sharp_look_ahead.contents = token;
+                        return /* SHARP */84;
+                      }));
               }
               break;
           case /* EOL */100 :
@@ -16745,26 +16745,26 @@ function filter_directive(pos, acc, lexbuf) {
       switch (match) {
         case /* EOF */25 :
             return {
-                    hd: [
-                      pos,
-                      lexbuf.lex_curr_p.pos_cnum
-                    ],
-                    tl: acc
-                  };
+              hd: [
+                pos,
+                lexbuf.lex_curr_p.pos_cnum
+              ],
+              tl: acc
+            };
         case /* SHARP */84 :
             if (at_bol(lexbuf)) {
               const start_pos = lexbuf.lex_start_p.pos_cnum;
               return interpret_directive(lexbuf, (function (lexbuf) {
-                            return filter_directive(lexbuf.lex_curr_p.pos_cnum, {
-                                        hd: [
-                                          pos,
-                                          start_pos
-                                        ],
-                                        tl: acc
-                                      }, lexbuf);
-                          }), (function (_token) {
-                            return filter_directive(pos, acc, lexbuf);
-                          }));
+                      return filter_directive(lexbuf.lex_curr_p.pos_cnum, {
+                            hd: [
+                              pos,
+                              start_pos
+                            ],
+                            tl: acc
+                          }, lexbuf);
+                    }), (function (_token) {
+                      return filter_directive(pos, acc, lexbuf);
+                    }));
             }
             continue ;
         default:
@@ -16901,12 +16901,12 @@ function wrap(parsing_fun, lexbuf) {
       maybe_skip_phrase(lexbuf);
     }
     throw new Caml_js_exceptions.MelangeError($$Error$1, {
-              MEL_EXN_ID: $$Error$1,
-              _1: {
-                TAG: /* Other */5,
-                _0: loc
-              }
-            });
+          MEL_EXN_ID: $$Error$1,
+          _1: {
+            TAG: /* Other */5,
+            _0: loc
+          }
+        });
   }
 }
 
diff --git a/jscomp/test/dist/jscomp/test/pipe_send_readline.js b/jscomp/test/dist/jscomp/test/pipe_send_readline.js
index e607a02a5..9c2590884 100644
--- a/jscomp/test/dist/jscomp/test/pipe_send_readline.js
+++ b/jscomp/test/dist/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/dist/jscomp/test/pipe_syntax.js b/jscomp/test/dist/jscomp/test/pipe_syntax.js
index 3f1cee66b..5658054b8 100644
--- a/jscomp/test/dist/jscomp/test/pipe_syntax.js
+++ b/jscomp/test/dist/jscomp/test/pipe_syntax.js
@@ -23,17 +23,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) {
   const __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) {
@@ -53,9 +53,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) {
@@ -71,10 +71,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) {
@@ -83,8 +83,8 @@ function f8(a) {
 
 function hi(x) {
   return Belt__Belt_Array.map(x, (function (x) {
-                return x + 1 | 0;
-              }));
+          return x + 1 | 0;
+        }));
 }
 
 const with_poly = {
diff --git a/jscomp/test/dist/jscomp/test/polymorphic_raw_test.js b/jscomp/test/dist/jscomp/test/polymorphic_raw_test.js
index b8439f176..d2e61da97 100644
--- a/jscomp/test/dist/jscomp/test/polymorphic_raw_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/polymorphism_test.js b/jscomp/test/dist/jscomp/test/polymorphism_test.js
index 92e4af0f4..9290bf34b 100644
--- a/jscomp/test/dist/jscomp/test/polymorphism_test.js
+++ b/jscomp/test/dist/jscomp/test/polymorphism_test.js
@@ -8,9 +8,9 @@ function map(f, param) {
   }
   const r = f(param.hd);
   return {
-          hd: r,
-          tl: map(f, param.tl)
-        };
+    hd: r,
+    tl: map(f, param.tl)
+  };
 }
 
 exports.map = map;
diff --git a/jscomp/test/dist/jscomp/test/ppx_apply_test.js b/jscomp/test/dist/jscomp/test/ppx_apply_test.js
index 070045b82..2e638b856 100644
--- a/jscomp/test/dist/jscomp/test/ppx_apply_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/ppx_this_obj_field.js b/jscomp/test/dist/jscomp/test/ppx_this_obj_field.js
index 36ee01a1b..880442bc2 100644
--- a/jscomp/test/dist/jscomp/test/ppx_this_obj_field.js
+++ b/jscomp/test/dist/jscomp/test/ppx_this_obj_field.js
@@ -20,10 +20,10 @@ function eq(loc, param) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -37,9 +37,9 @@ const v5 = {
       let self = this;
       self.y = 2;
       return [
-              self.y,
-              v
-            ];
+        self.y,
+        v
+      ];
     }),
   say: (function () {
       let self = this;
diff --git a/jscomp/test/dist/jscomp/test/ppx_this_obj_test.js b/jscomp/test/dist/jscomp/test/ppx_this_obj_test.js
index 99c89a437..af47f7549 100644
--- a/jscomp/test/dist/jscomp/test/ppx_this_obj_test.js
+++ b/jscomp/test/dist/jscomp/test/ppx_this_obj_test.js
@@ -20,10 +20,10 @@ function eq(loc, param) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/pq_test.js b/jscomp/test/dist/jscomp/test/pq_test.js
index 220bb305e..e5f43cf5f 100644
--- a/jscomp/test/dist/jscomp/test/pq_test.js
+++ b/jscomp/test/dist/jscomp/test/pq_test.js
@@ -7,12 +7,12 @@ const Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 function insert(queue, prio, elt) {
   if (/* tag */typeof queue === "number" || typeof queue === "string") {
     return {
-            TAG: /* Node */0,
-            _0: prio,
-            _1: elt,
-            _2: /* Empty */0,
-            _3: /* Empty */0
-          };
+      TAG: /* Node */0,
+      _0: prio,
+      _1: elt,
+      _2: /* Empty */0,
+      _3: /* Empty */0
+    };
   }
   const right = queue._3;
   const left = queue._2;
@@ -20,20 +20,20 @@ function insert(queue, prio, elt) {
   const p = queue._0;
   if (prio <= p) {
     return {
-            TAG: /* Node */0,
-            _0: prio,
-            _1: elt,
-            _2: insert(right, p, e),
-            _3: left
-          };
+      TAG: /* Node */0,
+      _0: prio,
+      _1: elt,
+      _2: insert(right, p, e),
+      _3: left
+    };
   } else {
     return {
-            TAG: /* Node */0,
-            _0: p,
-            _1: e,
-            _2: insert(right, prio, elt),
-            _3: left
-          };
+      TAG: /* Node */0,
+      _0: p,
+      _1: e,
+      _2: insert(right, prio, elt),
+      _3: left
+    };
   }
 }
 
@@ -42,8 +42,8 @@ const Queue_is_empty = /* @__PURE__ */Caml_exceptions.create("Pq_test.PrioQueue.
 function remove_top(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError(Queue_is_empty, {
-              MEL_EXN_ID: Queue_is_empty
-            });
+          MEL_EXN_ID: Queue_is_empty
+        });
   }
   const left = param._2;
   let tmp = param._3;
@@ -58,34 +58,34 @@ function remove_top(param) {
   const lprio = left._0;
   if (lprio <= rprio) {
     return {
-            TAG: /* Node */0,
-            _0: lprio,
-            _1: left._1,
-            _2: remove_top(left),
-            _3: right
-          };
+      TAG: /* Node */0,
+      _0: lprio,
+      _1: left._1,
+      _2: remove_top(left),
+      _3: right
+    };
   } else {
     return {
-            TAG: /* Node */0,
-            _0: rprio,
-            _1: right._1,
-            _2: left,
-            _3: remove_top(right)
-          };
+      TAG: /* Node */0,
+      _0: rprio,
+      _1: right._1,
+      _2: left,
+      _3: remove_top(right)
+    };
   }
 }
 
 function extract(queue) {
   if (!/* tag */(typeof queue === "number" || typeof queue === "string")) {
     return [
-            queue._0,
-            queue._1,
-            remove_top(queue)
-          ];
+      queue._0,
+      queue._1,
+      remove_top(queue)
+    ];
   }
   throw new Caml_js_exceptions.MelangeError(Queue_is_empty, {
-            MEL_EXN_ID: Queue_is_empty
-          });
+        MEL_EXN_ID: Queue_is_empty
+      });
 }
 
 const PrioQueue = {
diff --git a/jscomp/test/dist/jscomp/test/pr_regression_test.js b/jscomp/test/dist/jscomp/test/pr_regression_test.js
index 194bf1a1f..0b4820461 100644
--- a/jscomp/test/dist/jscomp/test/pr_regression_test.js
+++ b/jscomp/test/dist/jscomp/test/pr_regression_test.js
@@ -93,20 +93,20 @@ Mt.from_pair_suites("Pr_regression_test", {
         "partial",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: [
-                      5,
-                      5,
-                      5,
-                      5
-                    ],
-                    _1: [
-                      a,
-                      b,
-                      c,
-                      d
-                    ]
-                  };
+              TAG: /* Eq */0,
+              _0: [
+                5,
+                5,
+                5,
+                5
+              ],
+              _1: [
+                a,
+                b,
+                c,
+                d
+              ]
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/print_alpha_test.js b/jscomp/test/dist/jscomp/test/print_alpha_test.js
index 50a2ad32b..e27830c5c 100644
--- a/jscomp/test/dist/jscomp/test/print_alpha_test.js
+++ b/jscomp/test/dist/jscomp/test/print_alpha_test.js
@@ -14,12 +14,12 @@ Mt.from_pair_suites("Print_alpha_test", {
         "File \"jscomp/test/print_alpha_test.ml\", line 15, characters 4-11",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: f((function (prim0, prim1) {
-                              return prim0 + prim1 | 0;
-                            }), undefined)(1, 2),
-                    _1: 3
-                  };
+              TAG: /* Eq */0,
+              _0: f((function (prim0, prim1) {
+                        return prim0 + prim1 | 0;
+                      }), undefined)(1, 2),
+              _1: 3
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/printf_test.js b/jscomp/test/dist/jscomp/test/printf_test.js
index e2e7595b4..eeba549a2 100644
--- a/jscomp/test/dist/jscomp/test/printf_test.js
+++ b/jscomp/test/dist/jscomp/test/printf_test.js
@@ -42,24 +42,24 @@ const suites_0 = [
   "sprintf_simple",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: "3232",
-              _1: Curry._2(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* Int */4,
-                            _0: /* Int_d */0,
-                            _1: /* No_padding */0,
-                            _2: /* No_precision */0,
-                            _3: /* End_of_format */0
-                          }
-                        },
-                        _1: "%s%d"
-                      }), "32", 32)
-            };
+        TAG: /* Eq */0,
+        _0: "3232",
+        _1: Curry._2(Stdlib__Printf.sprintf({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* Int */4,
+                      _0: /* Int_d */0,
+                      _1: /* No_padding */0,
+                      _2: /* No_precision */0,
+                      _3: /* End_of_format */0
+                    }
+                  },
+                  _1: "%s%d"
+                }), "32", 32)
+      };
     })
 ];
 
@@ -68,18 +68,18 @@ const suites_1 = {
     "print_asprintf",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: "xx",
-                _1: Stdlib__Format.asprintf({
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "xx",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "xx"
-                    })
-              };
+          TAG: /* Eq */0,
+          _0: "xx",
+          _1: Stdlib__Format.asprintf({
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "xx",
+                  _1: /* End_of_format */0
+                },
+                _1: "xx"
+              })
+        };
       })
   ],
   tl: {
@@ -87,20 +87,20 @@ const suites_1 = {
       "print_pair",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: "(1,2)",
-                  _1: Curry._2(Stdlib__Format.asprintf({
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* Alpha */15,
-                              _0: /* End_of_format */0
-                            },
-                            _1: "%a"
-                          }), print_pair, [
-                        1,
-                        2
-                      ])
-                };
+            TAG: /* Eq */0,
+            _0: "(1,2)",
+            _1: Curry._2(Stdlib__Format.asprintf({
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Alpha */15,
+                        _0: /* End_of_format */0
+                      },
+                      _1: "%a"
+                    }), print_pair, [
+                  1,
+                  2
+                ])
+          };
         })
     ],
     tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/promise_catch_test.js b/jscomp/test/dist/jscomp/test/promise_catch_test.js
index f775fab43..acb7e460b 100644
--- a/jscomp/test/dist/jscomp/test/promise_catch_test.js
+++ b/jscomp/test/dist/jscomp/test/promise_catch_test.js
@@ -23,10 +23,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -43,13 +43,13 @@ function handler(e) {
     return Promise.resolve(0);
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/promise_catch_test.ml",
-              21,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/promise_catch_test.ml",
+          21,
+          9
+        ]
+      });
 }
 
 function myHandler(match) {
@@ -85,13 +85,13 @@ catch (raw_e){
 
 if (exit === 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/promise_catch_test.ml",
-              38,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/promise_catch_test.ml",
+          38,
+          9
+        ]
+      });
 }
 
 Mt.from_pair_suites("Promise_catch_test", suites.contents);
diff --git a/jscomp/test/dist/jscomp/test/qcc.js b/jscomp/test/dist/jscomp/test/qcc.js
index 4e200be0a..2ab3a796a 100644
--- a/jscomp/test/dist/jscomp/test/qcc.js
+++ b/jscomp/test/dist/jscomp/test/qcc.js
@@ -31,29 +31,29 @@ function bufferize(f) {
     contents: undefined
   };
   return [
-          (function (param) {
-              const x = buf.contents;
-              if (x !== undefined) {
-                buf.contents = undefined;
-                return Caml_option.valFromOption(x);
-              } else {
-                return Curry._1(f, undefined);
-              }
-            }),
-          (function (x) {
-              if (buf.contents !== undefined) {
-                throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/qcc.ml",
-                            17,
-                            4
-                          ]
-                        });
-              }
-              buf.contents = Caml_option.some(x);
-            })
-        ];
+    (function (param) {
+        const x = buf.contents;
+        if (x !== undefined) {
+          buf.contents = undefined;
+          return Caml_option.valFromOption(x);
+        } else {
+          return Curry._1(f, undefined);
+        }
+      }),
+    (function (x) {
+        if (buf.contents !== undefined) {
+          throw new Caml_js_exceptions.MelangeError("Assert_failure", {
+                MEL_EXN_ID: "Assert_failure",
+                _1: [
+                  "jscomp/test/qcc.ml",
+                  17,
+                  4
+                ]
+              });
+        }
+        buf.contents = Caml_option.some(x);
+      })
+  ];
 }
 
 const match = bufferize(function (param) {
@@ -100,13 +100,13 @@ function addsym(s) {
 function symstr(n) {
   if (n >= syms.contents) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/qcc.ml",
-                40,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/qcc.ml",
+            40,
+            4
+          ]
+        });
   }
   return Caml_array.get(symtab, n);
 }
@@ -199,9 +199,9 @@ function next(param) {
   }
   if (c === undefined) {
     return {
-            TAG: /* Op */0,
-            _0: "EOF!"
-          };
+      TAG: /* Op */0,
+      _0: "EOF!"
+    };
   }
   if (c === 34) {
     let b = gpos.contents;
@@ -217,10 +217,10 @@ function next(param) {
       Curry._1(getch, undefined);
       gpos.contents = e + 8 & -8;
       return {
-              TAG: /* SLit */2,
-              _0: (b + 232 | 0) + 4194304 | 0,
-              _1: Stdlib__Bytes.to_string(Stdlib__Bytes.sub(glo, b, e - b | 0))
-            };
+        TAG: /* SLit */2,
+        _0: (b + 232 | 0) + 4194304 | 0,
+        _1: Stdlib__Bytes.to_string(Stdlib__Bytes.sub(glo, b, e - b | 0))
+      };
     };
   }
   if (c >= 48) {
@@ -231,9 +231,9 @@ function next(param) {
         const match$1 = peekch(undefined);
         if (match$1 > 57 || match$1 < 48) {
           return {
-                  TAG: /* ILit */1,
-                  _0: n
-                };
+            TAG: /* ILit */1,
+            _0: n
+          };
         }
         _n = (Math.imul(10, n) + Curry._1(getch, undefined) | 0) - 48 | 0;
         continue ;
@@ -245,14 +245,14 @@ function next(param) {
     const qt = Curry._1(getch, undefined);
     if (qt !== /* '\'' */39) {
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: "syntax error"
-              });
+            MEL_EXN_ID: "Failure",
+            _1: "syntax error"
+          });
     }
     return {
-            TAG: /* ILit */1,
-            _0: ch
-          };
+      TAG: /* ILit */1,
+      _0: ch
+    };
   }
   if (isid(c)) {
     let _n$1 = 0;
@@ -263,9 +263,9 @@ function next(param) {
       Caml_bytes.set(s, n$1, ch$1);
       if (!isid(peekch(undefined))) {
         return {
-                TAG: /* Sym */3,
-                _0: addsym(Stdlib__Bytes.to_string(Stdlib__Bytes.sub(s, 0, n$1 + 1 | 0)))
-              };
+          TAG: /* Sym */3,
+          _0: addsym(Stdlib__Bytes.to_string(Stdlib__Bytes.sub(s, 0, n$1 + 1 | 0)))
+        };
       }
       _ch = Curry._1(getch, undefined);
       _n$1 = n$1 + 1 | 0;
@@ -307,17 +307,17 @@ function next(param) {
       const param$1 = _param;
       if (!param$1) {
         return {
-                TAG: /* Op */0,
-                _0: Caml_bytes.bytes_to_string(Stdlib__Bytes.make(1, c))
-              };
+          TAG: /* Op */0,
+          _0: Caml_bytes.bytes_to_string(Stdlib__Bytes.make(1, c))
+        };
       }
       const lop = param$1.hd;
       if (Caml_string.get(lop, 0) === c && Caml_string.get(lop, 1) === peekch(undefined)) {
         Curry._1(getch, undefined);
         return {
-                TAG: /* Op */0,
-                _0: lop
-              };
+          TAG: /* Op */0,
+          _0: lop
+        };
       }
       _param = param$1.tl;
       continue ;
@@ -368,13 +368,13 @@ function get32(l) {
 function patch(rel, loc, n) {
   if (n >= 0) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/qcc.ml",
-                157,
-                2
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/qcc.ml",
+            157,
+            2
+          ]
+        });
   }
   if (loc === 0) {
     return ;
@@ -962,9 +962,9 @@ function unary(stk) {
                 ];
               } else {
                 throw new Caml_js_exceptions.MelangeError("Failure", {
-                          MEL_EXN_ID: "Failure",
-                          _1: "[cast] expected"
-                        });
+                      MEL_EXN_ID: "Failure",
+                      _1: "[cast] expected"
+                    });
               }
               for (let _k = 1 ,_k_finish = match[1]; _k <= _k_finish; ++_k) {
                 Curry._1(next$1, undefined);
@@ -1013,9 +1013,9 @@ function unary(stk) {
                         _1: "unknown operator %s"
                       }), o);
               throw new Caml_js_exceptions.MelangeError("Failure", {
-                        MEL_EXN_ID: "Failure",
-                        _1: s
-                      });
+                    MEL_EXN_ID: "Failure",
+                    _1: s
+                  });
             }
             out(Stdlib__List.assoc(o, unops));
             if (o === "!") {
@@ -1035,13 +1035,13 @@ function unary(stk) {
           const l = Stdlib__List.assoc(i$1, stk);
           if (l <= -256) {
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "jscomp/test/qcc.ml",
-                        295,
-                        6
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "jscomp/test/qcc.ml",
+                    295,
+                    6
+                  ]
+                });
           }
           out(4754245);
           out(l & 255);
@@ -1233,9 +1233,9 @@ function decl(g, _n, _stk) {
                   _0: ";"
                 })) {
             return [
-                    n,
-                    stk
-                  ];
+              n,
+              stk
+            ];
           }
           const s = Curry._1(next$1, undefined);
           if (s.TAG === /* Sym */3) {
@@ -1246,9 +1246,9 @@ function decl(g, _n, _stk) {
               const glo = Caml_array.get(globs, s$1);
               if (glo.va >= 0) {
                 throw new Caml_js_exceptions.MelangeError("Failure", {
-                          MEL_EXN_ID: "Failure",
-                          _1: "symbol defined twice"
-                        });
+                      MEL_EXN_ID: "Failure",
+                      _1: "symbol defined twice"
+                    });
               }
               const va = (gpos.contents + 232 | 0) + 4194304 | 0;
               Caml_array.set(globs, s$1, {
@@ -1271,9 +1271,9 @@ function decl(g, _n, _stk) {
                     _0: ","
                   })) {
               return [
-                      n$p,
-                      stk$p
-                    ];
+                n$p,
+                stk$p
+              ];
             }
             Curry._1(next$1, undefined);
             _stk = stk$p;
@@ -1281,9 +1281,9 @@ function decl(g, _n, _stk) {
             continue ;
           }
           throw new Caml_js_exceptions.MelangeError("Failure", {
-                    MEL_EXN_ID: "Failure",
-                    _1: "[var] expected in [decl]"
-                  });
+                MEL_EXN_ID: "Failure",
+                _1: "[var] expected in [decl]"
+              });
         };
       };
       const match = vars(0, stk);
@@ -1317,13 +1317,13 @@ function decl(g, _n, _stk) {
     if (!g && n !== 0) {
       if ((n << 3) >= 256) {
         throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/test/qcc.ml",
-                    436,
-                    6
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/test/qcc.ml",
+                436,
+                6
+              ]
+            });
       }
       out(4752364);
       out((n << 3));
@@ -1333,9 +1333,9 @@ function decl(g, _n, _stk) {
       console.error("end of blk decls");
     }
     return [
-            n,
-            stk
-          ];
+      n,
+      stk
+    ];
   };
 }
 
@@ -1444,13 +1444,13 @@ function stmt(brk, stk) {
     const n = align.contents - brk[1] | 0;
     if (n < 0) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/qcc.ml",
-                  515,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/qcc.ml",
+              515,
+              4
+            ]
+          });
     }
     if (n !== 0) {
       out(4752324);
@@ -1516,9 +1516,9 @@ function top(_param) {
       const g = Caml_array.get(globs, f$1);
       if (g.va >= 0) {
         throw new Caml_js_exceptions.MelangeError("Failure", {
-                  MEL_EXN_ID: "Failure",
-                  _1: "symbol defined twice"
-                });
+              MEL_EXN_ID: "Failure",
+              _1: "symbol defined twice"
+            });
       }
       Caml_array.set(globs, f$1, {
             loc: g.loc,
@@ -1536,15 +1536,15 @@ function top(_param) {
                   return stk;
                 }
                 throw new Caml_js_exceptions.MelangeError("Failure", {
-                          MEL_EXN_ID: "Failure",
-                          _1: "[var] or ) expected"
-                        });
+                      MEL_EXN_ID: "Failure",
+                      _1: "[var] or ) expected"
+                    });
             case /* ILit */1 :
             case /* SLit */2 :
                 throw new Caml_js_exceptions.MelangeError("Failure", {
-                          MEL_EXN_ID: "Failure",
-                          _1: "[var] or ) expected"
-                        });
+                      MEL_EXN_ID: "Failure",
+                      _1: "[var] or ) expected"
+                    });
             case /* Sym */3 :
                 const r = Stdlib__List.hd(regs);
                 push(r);
@@ -1631,9 +1631,9 @@ function top(_param) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError("Failure", {
-              MEL_EXN_ID: "Failure",
-              _1: "[decl] or [fun] expected"
-            });
+          MEL_EXN_ID: "Failure",
+          _1: "[decl] or [fun] expected"
+        });
   };
 }
 
@@ -1857,13 +1857,13 @@ function elfgen(outf) {
   elfphdr(2, dyn + off | 0, tend - dyn | 0, 8);
   if (opos.contents !== 232) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/qcc.ml",
-                698,
-                2
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/qcc.ml",
+            698,
+            2
+          ]
+        });
   }
   patch(false, 24, va(entry));
   Stdlib.output_bytes(outf, Stdlib__Bytes.sub(obuf, 0, tend + off | 0));
@@ -1874,89 +1874,89 @@ function main(param) {
     switch (s.TAG) {
       case /* Op */0 :
           return Curry._1(Stdlib__Printf.printf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Operator '",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: "'\n",
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "Operator '%s'\n"
-                        }), s._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Operator '",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: "'\n",
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "Operator '%s'\n"
+                  }), s._0);
       case /* ILit */1 :
           return Curry._1(Stdlib__Printf.printf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Int literal ",
-                            _1: {
-                              TAG: /* Int */4,
-                              _0: /* Int_d */0,
-                              _1: /* No_padding */0,
-                              _2: /* No_precision */0,
-                              _3: {
-                                TAG: /* Char_literal */12,
-                                _0: /* '\n' */10,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "Int literal %d\n"
-                        }), s._0);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Int literal ",
+                      _1: {
+                        TAG: /* Int */4,
+                        _0: /* Int_d */0,
+                        _1: /* No_padding */0,
+                        _2: /* No_precision */0,
+                        _3: {
+                          TAG: /* Char_literal */12,
+                          _0: /* '\n' */10,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "Int literal %d\n"
+                  }), s._0);
       case /* SLit */2 :
           return Curry._1(Stdlib__Printf.printf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Str literal ",
-                            _1: {
-                              TAG: /* Caml_string */3,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* '\n' */10,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          },
-                          _1: "Str literal %S\n"
-                        }), s._1);
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Str literal ",
+                      _1: {
+                        TAG: /* Caml_string */3,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* Char_literal */12,
+                          _0: /* '\n' */10,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: "Str literal %S\n"
+                  }), s._1);
       case /* Sym */3 :
           const i = s._0;
           return Curry._2(Stdlib__Printf.printf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "Symbol '",
-                            _1: {
-                              TAG: /* String */2,
-                              _0: /* No_padding */0,
-                              _1: {
-                                TAG: /* String_literal */11,
-                                _0: "' (",
-                                _1: {
-                                  TAG: /* Int */4,
-                                  _0: /* Int_d */0,
-                                  _1: /* No_padding */0,
-                                  _2: /* No_precision */0,
-                                  _3: {
-                                    TAG: /* String_literal */11,
-                                    _0: ")\n",
-                                    _1: /* End_of_format */0
-                                  }
-                                }
-                              }
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "Symbol '",
+                      _1: {
+                        TAG: /* String */2,
+                        _0: /* No_padding */0,
+                        _1: {
+                          TAG: /* String_literal */11,
+                          _0: "' (",
+                          _1: {
+                            TAG: /* Int */4,
+                            _0: /* Int_d */0,
+                            _1: /* No_padding */0,
+                            _2: /* No_precision */0,
+                            _3: {
+                              TAG: /* String_literal */11,
+                              _0: ")\n",
+                              _1: /* End_of_format */0
                             }
-                          },
-                          _1: "Symbol '%s' (%d)\n"
-                        }), symstr(i), i);
+                          }
+                        }
+                      }
+                    },
+                    _1: "Symbol '%s' (%d)\n"
+                  }), symstr(i), i);
       
     }
   };
@@ -1984,14 +1984,14 @@ function main(param) {
           if (tok.TAG === /* Op */0) {
             if (tok._0 === "EOF!") {
               return Stdlib__Printf.printf({
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "End of input stream\n",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "End of input stream\n"
-                        });
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "End of input stream\n",
+                      _1: /* End_of_format */0
+                    },
+                    _1: "End of input stream\n"
+                  });
             }
             ppsym(tok);
             _param = undefined;
diff --git a/jscomp/test/dist/jscomp/test/queue_test.js b/jscomp/test/dist/jscomp/test/queue_test.js
index d4273145e..4be10db75 100644
--- a/jscomp/test/dist/jscomp/test/queue_test.js
+++ b/jscomp/test/dist/jscomp/test/queue_test.js
@@ -24,9 +24,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) {
@@ -65,10 +65,10 @@ const suites_0 = [
         2
       ];
       return {
-              TAG: /* Eq */0,
-              _0: x,
-              _1: queue_1(x)
-            };
+        TAG: /* Eq */0,
+        _0: x,
+        _1: queue_1(x)
+      };
     })
 ];
 
diff --git a/jscomp/test/dist/jscomp/test/raw_hash_tbl_bench.js b/jscomp/test/dist/jscomp/test/raw_hash_tbl_bench.js
index 9c715de03..52365a3c8 100644
--- a/jscomp/test/dist/jscomp/test/raw_hash_tbl_bench.js
+++ b/jscomp/test/dist/jscomp/test/raw_hash_tbl_bench.js
@@ -12,13 +12,13 @@ function bench(param) {
   for (let i$1 = 0; i$1 <= 1000000; ++i$1) {
     if (!Stdlib__Hashtbl.mem(table, i$1)) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/raw_hash_tbl_bench.ml",
-                  9,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/raw_hash_tbl_bench.ml",
+              9,
+              4
+            ]
+          });
     }
     
   }
diff --git a/jscomp/test/dist/jscomp/test/rbset.js b/jscomp/test/dist/jscomp/test/rbset.js
index e106c0159..1bdf9ee37 100644
--- a/jscomp/test/dist/jscomp/test/rbset.js
+++ b/jscomp/test/dist/jscomp/test/rbset.js
@@ -6,20 +6,20 @@ const Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 function blackify(s) {
   if (/* tag */typeof s === "number" || typeof s === "string" || s._0 === /* Black */0) {
     return [
-            s,
-            true
-          ];
+      s,
+      true
+    ];
   } else {
     return [
-            {
-              TAG: /* Node */0,
-              _0: /* Black */0,
-              _1: s._1,
-              _2: s._2,
-              _3: s._3
-            },
-            false
-          ];
+      {
+        TAG: /* Node */0,
+        _0: /* Black */0,
+        _1: s._1,
+        _2: s._2,
+        _3: s._3
+      },
+      false
+    ];
   }
 }
 
@@ -96,32 +96,32 @@ function balance_left(l, x, r) {
   switch (exit) {
     case 1 :
         return {
-                TAG: /* Node */0,
-                _0: /* Black */0,
-                _1: l,
-                _2: x,
-                _3: r
-              };
+          TAG: /* Node */0,
+          _0: /* Black */0,
+          _1: l,
+          _2: x,
+          _3: r
+        };
     case 2 :
         return {
-                TAG: /* Node */0,
-                _0: /* Red */1,
-                _1: {
-                  TAG: /* Node */0,
-                  _0: /* Black */0,
-                  _1: a,
-                  _2: x$1,
-                  _3: b
-                },
-                _2: y,
-                _3: {
-                  TAG: /* Node */0,
-                  _0: /* Black */0,
-                  _1: c,
-                  _2: z,
-                  _3: d
-                }
-              };
+          TAG: /* Node */0,
+          _0: /* Red */1,
+          _1: {
+            TAG: /* Node */0,
+            _0: /* Black */0,
+            _1: a,
+            _2: x$1,
+            _3: b
+          },
+          _2: y,
+          _3: {
+            TAG: /* Node */0,
+            _0: /* Black */0,
+            _1: c,
+            _2: z,
+            _3: d
+          }
+        };
     
   }
 }
@@ -172,44 +172,44 @@ function balance_right(l, x, r) {
   switch (exit) {
     case 1 :
         return {
-                TAG: /* Node */0,
-                _0: /* Black */0,
-                _1: l,
-                _2: x,
-                _3: r
-              };
+          TAG: /* Node */0,
+          _0: /* Black */0,
+          _1: l,
+          _2: x,
+          _3: r
+        };
     case 2 :
         return {
-                TAG: /* Node */0,
-                _0: /* Red */1,
-                _1: {
-                  TAG: /* Node */0,
-                  _0: /* Black */0,
-                  _1: a,
-                  _2: x$1,
-                  _3: b
-                },
-                _2: y,
-                _3: {
-                  TAG: /* Node */0,
-                  _0: /* Black */0,
-                  _1: c,
-                  _2: z,
-                  _3: d
-                }
-              };
+          TAG: /* Node */0,
+          _0: /* Red */1,
+          _1: {
+            TAG: /* Node */0,
+            _0: /* Black */0,
+            _1: a,
+            _2: x$1,
+            _3: b
+          },
+          _2: y,
+          _3: {
+            TAG: /* Node */0,
+            _0: /* Black */0,
+            _1: c,
+            _2: z,
+            _3: d
+          }
+        };
     
   }
 }
 
 function singleton(x) {
   return {
-          TAG: /* Node */0,
-          _0: /* Black */0,
-          _1: /* Empty */0,
-          _2: x,
-          _3: /* Empty */0
-        };
+    TAG: /* Node */0,
+    _0: /* Black */0,
+    _1: /* Empty */0,
+    _2: x,
+    _3: /* Empty */0
+  };
 }
 
 function unbalanced_left(param) {
@@ -219,34 +219,34 @@ function unbalanced_left(param) {
       if (!/* tag */(typeof match === "number" || typeof match === "string")) {
         if (match._0 === /* Black */0) {
           return [
-                  balance_left({
-                        TAG: /* Node */0,
-                        _0: /* Red */1,
-                        _1: match._1,
-                        _2: match._2,
-                        _3: match._3
-                      }, param._2, param._3),
-                  true
-                ];
+            balance_left({
+                  TAG: /* Node */0,
+                  _0: /* Red */1,
+                  _1: match._1,
+                  _2: match._2,
+                  _3: match._3
+                }, param._2, param._3),
+            true
+          ];
         }
         const match$1 = match._3;
         if (!/* tag */(typeof match$1 === "number" || typeof match$1 === "string") && match$1._0 === /* Black */0) {
           return [
-                  {
+            {
+              TAG: /* Node */0,
+              _0: /* Black */0,
+              _1: match._1,
+              _2: match._2,
+              _3: balance_left({
                     TAG: /* Node */0,
-                    _0: /* Black */0,
-                    _1: match._1,
-                    _2: match._2,
-                    _3: balance_left({
-                          TAG: /* Node */0,
-                          _0: /* Red */1,
-                          _1: match$1._1,
-                          _2: match$1._2,
-                          _3: match$1._3
-                        }, param._2, param._3)
-                  },
-                  false
-                ];
+                    _0: /* Red */1,
+                    _1: match$1._1,
+                    _2: match$1._2,
+                    _3: match$1._3
+                  }, param._2, param._3)
+            },
+            false
+          ];
         }
         
       }
@@ -255,27 +255,27 @@ function unbalanced_left(param) {
       const match$2 = param._1;
       if (!/* tag */(typeof match$2 === "number" || typeof match$2 === "string") && match$2._0 === /* Black */0) {
         return [
-                balance_left({
-                      TAG: /* Node */0,
-                      _0: /* Red */1,
-                      _1: match$2._1,
-                      _2: match$2._2,
-                      _3: match$2._3
-                    }, param._2, param._3),
-                false
-              ];
+          balance_left({
+                TAG: /* Node */0,
+                _0: /* Red */1,
+                _1: match$2._1,
+                _2: match$2._2,
+                _3: match$2._3
+              }, param._2, param._3),
+          false
+        ];
       }
       
     }
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/rbset.ml",
-              57,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/rbset.ml",
+          57,
+          9
+        ]
+      });
 }
 
 function unbalanced_right(param) {
@@ -287,34 +287,34 @@ function unbalanced_right(param) {
       if (!/* tag */(typeof match === "number" || typeof match === "string")) {
         if (match._0 === /* Black */0) {
           return [
-                  balance_right(a, x, {
-                        TAG: /* Node */0,
-                        _0: /* Red */1,
-                        _1: match._1,
-                        _2: match._2,
-                        _3: match._3
-                      }),
-                  true
-                ];
+            balance_right(a, x, {
+                  TAG: /* Node */0,
+                  _0: /* Red */1,
+                  _1: match._1,
+                  _2: match._2,
+                  _3: match._3
+                }),
+            true
+          ];
         }
         const match$1 = match._1;
         if (!/* tag */(typeof match$1 === "number" || typeof match$1 === "string") && match$1._0 === /* Black */0) {
           return [
-                  {
+            {
+              TAG: /* Node */0,
+              _0: /* Black */0,
+              _1: balance_right(a, x, {
                     TAG: /* Node */0,
-                    _0: /* Black */0,
-                    _1: balance_right(a, x, {
-                          TAG: /* Node */0,
-                          _0: /* Red */1,
-                          _1: match$1._1,
-                          _2: match$1._2,
-                          _3: match$1._3
-                        }),
-                    _2: match._2,
-                    _3: match._3
-                  },
-                  false
-                ];
+                    _0: /* Red */1,
+                    _1: match$1._1,
+                    _2: match$1._2,
+                    _3: match$1._3
+                  }),
+              _2: match._2,
+              _3: match._3
+            },
+            false
+          ];
         }
         
       }
@@ -323,109 +323,109 @@ function unbalanced_right(param) {
       const match$2 = param._3;
       if (!/* tag */(typeof match$2 === "number" || typeof match$2 === "string") && match$2._0 === /* Black */0) {
         return [
-                balance_right(param._1, param._2, {
-                      TAG: /* Node */0,
-                      _0: /* Red */1,
-                      _1: match$2._1,
-                      _2: match$2._2,
-                      _3: match$2._3
-                    }),
-                false
-              ];
+          balance_right(param._1, param._2, {
+                TAG: /* Node */0,
+                _0: /* Red */1,
+                _1: match$2._1,
+                _2: match$2._2,
+                _3: match$2._3
+              }),
+          false
+        ];
       }
       
     }
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/rbset.ml",
-              63,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/rbset.ml",
+          63,
+          9
+        ]
+      });
 }
 
 function lbalance(x1, x2, x3) {
   if (/* tag */typeof x1 === "number" || typeof x1 === "string") {
     return {
-            TAG: /* Node */0,
-            _0: /* Black */0,
-            _1: x1,
-            _2: x2,
-            _3: x3
-          };
+      TAG: /* Node */0,
+      _0: /* Black */0,
+      _1: x1,
+      _2: x2,
+      _3: x3
+    };
   }
   if (x1._0 === /* Black */0) {
     return {
-            TAG: /* Node */0,
-            _0: /* Black */0,
-            _1: x1,
-            _2: x2,
-            _3: x3
-          };
+      TAG: /* Node */0,
+      _0: /* Black */0,
+      _1: x1,
+      _2: x2,
+      _3: x3
+    };
   }
   const r = x1._3;
   const l = x1._1;
   if (!/* tag */(typeof l === "number" || typeof l === "string") && l._0 !== /* Black */0) {
     return {
-            TAG: /* Node */0,
-            _0: /* Red */1,
-            _1: {
-              TAG: /* Node */0,
-              _0: /* Black */0,
-              _1: l._1,
-              _2: l._2,
-              _3: l._3
-            },
-            _2: x1._2,
-            _3: {
-              TAG: /* Node */0,
-              _0: /* Black */0,
-              _1: r,
-              _2: x2,
-              _3: x3
-            }
-          };
+      TAG: /* Node */0,
+      _0: /* Red */1,
+      _1: {
+        TAG: /* Node */0,
+        _0: /* Black */0,
+        _1: l._1,
+        _2: l._2,
+        _3: l._3
+      },
+      _2: x1._2,
+      _3: {
+        TAG: /* Node */0,
+        _0: /* Black */0,
+        _1: r,
+        _2: x2,
+        _3: x3
+      }
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     return {
-            TAG: /* Node */0,
-            _0: /* Black */0,
-            _1: x1,
-            _2: x2,
-            _3: x3
-          };
+      TAG: /* Node */0,
+      _0: /* Black */0,
+      _1: x1,
+      _2: x2,
+      _3: x3
+    };
   }
   if (r._0 === /* Black */0) {
     return {
-            TAG: /* Node */0,
-            _0: /* Black */0,
-            _1: x1,
-            _2: x2,
-            _3: x3
-          };
+      TAG: /* Node */0,
+      _0: /* Black */0,
+      _1: x1,
+      _2: x2,
+      _3: x3
+    };
   }
   const y = r._2;
   return {
-          TAG: /* Node */0,
-          _0: /* Red */1,
-          _1: {
-            TAG: /* Node */0,
-            _0: /* Black */0,
-            _1: l,
-            _2: y,
-            _3: r._1
-          },
-          _2: y,
-          _3: {
-            TAG: /* Node */0,
-            _0: /* Black */0,
-            _1: r._3,
-            _2: x2,
-            _3: x3
-          }
-        };
+    TAG: /* Node */0,
+    _0: /* Red */1,
+    _1: {
+      TAG: /* Node */0,
+      _0: /* Black */0,
+      _1: l,
+      _2: y,
+      _3: r._1
+    },
+    _2: y,
+    _3: {
+      TAG: /* Node */0,
+      _0: /* Black */0,
+      _1: r._3,
+      _2: x2,
+      _3: x3
+    }
+  };
 }
 
 function rbalance(x1, x2, x3) {
@@ -437,24 +437,24 @@ function rbalance(x1, x2, x3) {
     } else {
       if (b._0 !== /* Black */0) {
         return {
-                TAG: /* Node */0,
-                _0: /* Red */1,
-                _1: {
-                  TAG: /* Node */0,
-                  _0: /* Black */0,
-                  _1: x1,
-                  _2: x2,
-                  _3: b._1
-                },
-                _2: b._2,
-                _3: {
-                  TAG: /* Node */0,
-                  _0: /* Black */0,
-                  _1: b._3,
-                  _2: x3._2,
-                  _3: x3._3
-                }
-              };
+          TAG: /* Node */0,
+          _0: /* Red */1,
+          _1: {
+            TAG: /* Node */0,
+            _0: /* Black */0,
+            _1: x1,
+            _2: x2,
+            _3: b._1
+          },
+          _2: b._2,
+          _3: {
+            TAG: /* Node */0,
+            _0: /* Black */0,
+            _1: b._3,
+            _2: x3._2,
+            _3: x3._3
+          }
+        };
       }
       exit = 2;
     }
@@ -462,47 +462,47 @@ function rbalance(x1, x2, x3) {
       const match = x3._3;
       if (!/* tag */(typeof match === "number" || typeof match === "string") && match._0 !== /* Black */0) {
         return {
-                TAG: /* Node */0,
-                _0: /* Red */1,
-                _1: {
-                  TAG: /* Node */0,
-                  _0: /* Black */0,
-                  _1: x1,
-                  _2: x2,
-                  _3: b
-                },
-                _2: x3._2,
-                _3: {
-                  TAG: /* Node */0,
-                  _0: /* Black */0,
-                  _1: match._1,
-                  _2: match._2,
-                  _3: match._3
-                }
-              };
+          TAG: /* Node */0,
+          _0: /* Red */1,
+          _1: {
+            TAG: /* Node */0,
+            _0: /* Black */0,
+            _1: x1,
+            _2: x2,
+            _3: b
+          },
+          _2: x3._2,
+          _3: {
+            TAG: /* Node */0,
+            _0: /* Black */0,
+            _1: match._1,
+            _2: match._2,
+            _3: match._3
+          }
+        };
       }
       
     }
     
   }
   return {
-          TAG: /* Node */0,
-          _0: /* Black */0,
-          _1: x1,
-          _2: x2,
-          _3: x3
-        };
+    TAG: /* Node */0,
+    _0: /* Black */0,
+    _1: x1,
+    _2: x2,
+    _3: x3
+  };
 }
 
 function ins(x, s) {
   if (/* tag */typeof s === "number" || typeof s === "string") {
     return {
-            TAG: /* Node */0,
-            _0: /* Red */1,
-            _1: /* Empty */0,
-            _2: x,
-            _3: /* Empty */0
-          };
+      TAG: /* Node */0,
+      _0: /* Red */1,
+      _1: /* Empty */0,
+      _2: x,
+      _3: /* Empty */0
+    };
   }
   if (s._0 === /* Black */0) {
     const y = s._2;
@@ -525,20 +525,20 @@ function ins(x, s) {
   const a$1 = s._1;
   if (x < y$1) {
     return {
-            TAG: /* Node */0,
-            _0: /* Red */1,
-            _1: ins(x, a$1),
-            _2: y$1,
-            _3: b$1
-          };
+      TAG: /* Node */0,
+      _0: /* Red */1,
+      _1: ins(x, a$1),
+      _2: y$1,
+      _3: b$1
+    };
   } else {
     return {
-            TAG: /* Node */0,
-            _0: /* Red */1,
-            _1: a$1,
-            _2: y$1,
-            _3: ins(x, b$1)
-          };
+      TAG: /* Node */0,
+      _0: /* Red */1,
+      _1: a$1,
+      _2: y$1,
+      _3: ins(x, b$1)
+    };
   }
 }
 
@@ -548,25 +548,25 @@ function add(x, s) {
     return s$1;
   } else {
     return {
-            TAG: /* Node */0,
-            _0: /* Black */0,
-            _1: s$1._1,
-            _2: s$1._2,
-            _3: s$1._3
-          };
+      TAG: /* Node */0,
+      _0: /* Black */0,
+      _1: s$1._1,
+      _2: s$1._2,
+      _3: s$1._3
+    };
   }
 }
 
 function remove_min(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/rbset.ml",
-                115,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/rbset.ml",
+            115,
+            4
+          ]
+        });
   }
   const c = param._0;
   if (c === /* Black */0) {
@@ -576,42 +576,42 @@ function remove_min(param) {
       const x = param._2;
       if (/* tag */typeof match === "number" || typeof match === "string") {
         return [
-                /* Empty */0,
-                x,
-                true
-              ];
+          /* Empty */0,
+          x,
+          true
+        ];
       }
       if (match._0 !== /* Black */0) {
         return [
-                {
-                  TAG: /* Node */0,
-                  _0: /* Black */0,
-                  _1: match._1,
-                  _2: match._2,
-                  _3: match._3
-                },
-                x,
-                false
-              ];
+          {
+            TAG: /* Node */0,
+            _0: /* Black */0,
+            _1: match._1,
+            _2: match._2,
+            _3: match._3
+          },
+          x,
+          false
+        ];
       }
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/rbset.ml",
-                  115,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/rbset.ml",
+              115,
+              4
+            ]
+          });
     }
     
   } else {
     let tmp$1 = param._1;
     if (/* tag */typeof tmp$1 === "number" || typeof tmp$1 === "string") {
       return [
-              param._3,
-              param._2,
-              false
-            ];
+        param._3,
+        param._2,
+        false
+      ];
     }
     
   }
@@ -629,25 +629,25 @@ function remove_min(param) {
   };
   if (!match$1[2]) {
     return [
-            s,
-            y,
-            false
-          ];
+      s,
+      y,
+      false
+    ];
   }
   const 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 (/* tag */typeof n === "number" || typeof n === "string") {
     return [
-            /* Empty */0,
-            false
-          ];
+      /* Empty */0,
+      false
+    ];
   }
   const r = n._3;
   const y = n._2;
@@ -657,9 +657,9 @@ function remove_aux(x, n) {
     if (/* tag */typeof r === "number" || typeof r === "string") {
       if (c === /* Red */1) {
         return [
-                l,
-                false
-              ];
+          l,
+          false
+        ];
       } else {
         return blackify(l);
       }
@@ -678,9 +678,9 @@ function remove_aux(x, n) {
       return unbalanced_left(n$1);
     } else {
       return [
-              n$1,
-              false
-            ];
+        n$1,
+        false
+      ];
     }
   }
   if (x < y) {
@@ -697,9 +697,9 @@ function remove_aux(x, n) {
       return unbalanced_right(n$2);
     } else {
       return [
-              n$2,
-              false
-            ];
+        n$2,
+        false
+      ];
     }
   }
   const match$2 = remove_aux(x, r);
@@ -715,9 +715,9 @@ function remove_aux(x, n) {
     return unbalanced_left(n$3);
   } else {
     return [
-            n$3,
-            false
-          ];
+      n$3,
+      false
+    ];
   }
 }
 
diff --git a/jscomp/test/dist/jscomp/test/re_or_res/method_string_name.js b/jscomp/test/dist/jscomp/test/re_or_res/method_string_name.js
index a03063dea..cd11b93aa 100644
--- a/jscomp/test/dist/jscomp/test/re_or_res/method_string_name.js
+++ b/jscomp/test/dist/jscomp/test/re_or_res/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/dist/jscomp/test/re_or_res/reactDOMRe.js b/jscomp/test/dist/jscomp/test/re_or_res/reactDOMRe.js
index 3c6fdb6e8..6e1c6901e 100644
--- a/jscomp/test/dist/jscomp/test/re_or_res/reactDOMRe.js
+++ b/jscomp/test/dist/jscomp/test/re_or_res/reactDOMRe.js
@@ -28,14 +28,14 @@ function createRootWithClassName(className) {
   const elements = document.getElementsByClassName(className);
   if (elements.length) {
     return {
-            TAG: /* Ok */0,
-            _0: ReactDom.createRoot(elements[0])
-          };
+      TAG: /* Ok */0,
+      _0: ReactDom.createRoot(elements[0])
+    };
   } else {
     return {
-            TAG: /* Error */1,
-            _0: "ReactDOMRe.Unstable.createRootWithClassName: no element of class " + (className + " found in the HTML.")
-          };
+      TAG: /* Error */1,
+      _0: "ReactDOMRe.Unstable.createRootWithClassName: no element of class " + (className + " found in the HTML.")
+    };
   }
 }
 
@@ -43,14 +43,14 @@ function createRootWithId(id) {
   const element = document.getElementById(id);
   if (element == null) {
     return {
-            TAG: /* Error */1,
-            _0: "ReactDOMRe.Unstable.createRootWithId: no element of id " + (id + " found in the HTML.")
-          };
+      TAG: /* Error */1,
+      _0: "ReactDOMRe.Unstable.createRootWithId: no element of id " + (id + " found in the HTML.")
+    };
   } else {
     return {
-            TAG: /* Ok */0,
-            _0: ReactDom.createRoot(element)
-          };
+      TAG: /* Ok */0,
+      _0: ReactDom.createRoot(element)
+    };
   }
 }
 
@@ -72,9 +72,9 @@ function hydrateToElementWithId(reactElement, id) {
   const element = document.getElementById(id);
   if (element == null) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Invalid_argument, {
-              MEL_EXN_ID: Stdlib.Invalid_argument,
-              _1: "ReactDOMRe.hydrateToElementWithId : no element of id " + (id + " found in the HTML.")
-            });
+          MEL_EXN_ID: Stdlib.Invalid_argument,
+          _1: "ReactDOMRe.hydrateToElementWithId : no element of id " + (id + " found in the HTML.")
+        });
   }
   ReactDom.hydrate(reactElement, element);
 }
diff --git a/jscomp/test/dist/jscomp/test/re_or_res/reactTestUtils.js b/jscomp/test/dist/jscomp/test/re_or_res/reactTestUtils.js
index df3be9483..601ea9574 100644
--- a/jscomp/test/dist/jscomp/test/re_or_res/reactTestUtils.js
+++ b/jscomp/test/dist/jscomp/test/re_or_res/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,15 +53,15 @@ function findByAllSelector(element, selector) {
 
 function findBySelectorAndTextContent(element, selector, content) {
   return Belt__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__Belt_Array.getBy(Array.from(element.querySelectorAll(selector)), (function (node) {
-                const arg = node.textContent;
-                return arg.includes(content, undefined);
-              }));
+          const arg = node.textContent;
+          return arg.includes(content, undefined);
+        }));
 }
 
 const DOM = {
diff --git a/jscomp/test/dist/jscomp/test/re_or_res/reactjs_ppx_custom.js b/jscomp/test/dist/jscomp/test/re_or_res/reactjs_ppx_custom.js
index 73c372af7..ca2fcd69b 100644
--- a/jscomp/test/dist/jscomp/test/re_or_res/reactjs_ppx_custom.js
+++ b/jscomp/test/dist/jscomp/test/re_or_res/reactjs_ppx_custom.js
@@ -6,13 +6,13 @@ const JsxRuntime = require("react/jsx-runtime");
 
 function Reactjs_ppx_custom$Internal$header(Props) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/re_or_res/reactjs_ppx_custom.re",
-              4,
-              21
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/re_or_res/reactjs_ppx_custom.re",
+          4,
+          21
+        ]
+      });
 }
 
 const Internal = {
diff --git a/jscomp/test/dist/jscomp/test/re_or_res/reasonReact.js b/jscomp/test/dist/jscomp/test/re_or_res/reasonReact.js
index b5d5fb83d..e5beb0542 100644
--- a/jscomp/test/dist/jscomp/test/re_or_res/reasonReact.js
+++ b/jscomp/test/dist/jscomp/test/re_or_res/reasonReact.js
@@ -47,286 +47,286 @@ function convertPropsIfTheyreFromJs(props, jsPropsToReason, debugName) {
   }
   if (jsPropsToReason !== undefined) {
     return {
-            TAG: /* Element */0,
-            _0: jsPropsToReason(props)
-          };
+      TAG: /* Element */0,
+      _0: jsPropsToReason(props)
+    };
   }
   throw new Caml_js_exceptions.MelangeError(Stdlib.Invalid_argument, {
-            MEL_EXN_ID: Stdlib.Invalid_argument,
-            _1: "A JS component called the Reason component " + (debugName + " which didn't implement the JS->Reason React props conversion.")
-          });
+        MEL_EXN_ID: Stdlib.Invalid_argument,
+        _1: "A JS component called the Reason component " + (debugName + " which didn't implement the JS->Reason React props conversion.")
+      });
 }
 
 function createClass(debugName) {
   return ReasonReactOptimizedCreateClass.createClass({
-              displayName: debugName,
-              subscriptions: null,
-              self: (function (state, retainedProps) {
-                  let $$this = this;
-                  const _x = $$this.handleMethod;
-                  return {
-                          handle: _x,
-                          state: state,
-                          retainedProps: retainedProps,
-                          send: $$this.sendMethod,
-                          onUnmount: $$this.onUnmountMethod
-                        };
-                }),
-              getInitialState: (function () {
-                  const thisJs = this;
-                  const convertedReasonProps = convertPropsIfTheyreFromJs(thisJs.props, thisJs.jsPropsToReason, debugName);
-                  return {
-                          reasonState: Curry._1(convertedReasonProps._0.initialState, undefined)
-                        };
-                }),
-              componentDidMount: (function () {
-                  let $$this = this;
-                  const thisJs = this;
-                  const convertedReasonProps = convertPropsIfTheyreFromJs(thisJs.props, thisJs.jsPropsToReason, debugName);
-                  const component = convertedReasonProps._0;
-                  const curTotalState = thisJs.state;
-                  const curReasonState = curTotalState.reasonState;
-                  const self = $$this.self(curReasonState, component.retainedProps);
-                  if (component.didMount !== anyToUnit) {
-                    return Curry._1(component.didMount, self);
-                  }
-                  
-                }),
-              componentDidUpdate: (function (prevProps, prevState) {
-                  let $$this = this;
-                  const thisJs = this;
-                  const curState = thisJs.state;
-                  const curReasonState = curState.reasonState;
-                  const newJsProps = thisJs.props;
-                  const newConvertedReasonProps = convertPropsIfTheyreFromJs(newJsProps, thisJs.jsPropsToReason, debugName);
-                  const newComponent = newConvertedReasonProps._0;
-                  if (newComponent.didUpdate === anyToUnit) {
-                    return ;
-                  }
-                  const oldConvertedReasonProps = prevProps === newJsProps ? newConvertedReasonProps : convertPropsIfTheyreFromJs(prevProps, thisJs.jsPropsToReason, debugName);
-                  const prevReasonState = prevState.reasonState;
-                  const newSelf = $$this.self(curReasonState, newComponent.retainedProps);
-                  const oldSelf_handle = newSelf.handle;
-                  const oldSelf_retainedProps = oldConvertedReasonProps._0.retainedProps;
-                  const oldSelf_send = newSelf.send;
-                  const oldSelf_onUnmount = newSelf.onUnmount;
-                  const oldSelf = {
-                    handle: oldSelf_handle,
-                    state: prevReasonState,
-                    retainedProps: oldSelf_retainedProps,
-                    send: oldSelf_send,
-                    onUnmount: oldSelf_onUnmount
-                  };
-                  Curry._1(newComponent.didUpdate, {
-                        oldSelf: oldSelf,
-                        newSelf: newSelf
-                      });
-                }),
-              componentWillUnmount: (function () {
-                  let $$this = this;
-                  const thisJs = this;
-                  const convertedReasonProps = convertPropsIfTheyreFromJs(thisJs.props, thisJs.jsPropsToReason, debugName);
-                  const component = convertedReasonProps._0;
-                  const curState = thisJs.state;
-                  const curReasonState = curState.reasonState;
-                  if (component.willUnmount !== anyToUnit) {
-                    Curry._1(component.willUnmount, $$this.self(curReasonState, component.retainedProps));
-                  }
-                  const subs = $$this.subscriptions;
-                  if (subs !== null) {
-                    subs.forEach(function (unsubscribe) {
-                          Curry._1(unsubscribe, undefined);
-                        });
-                    return ;
-                  }
+        displayName: debugName,
+        subscriptions: null,
+        self: (function (state, retainedProps) {
+            let $$this = this;
+            const _x = $$this.handleMethod;
+            return {
+              handle: _x,
+              state: state,
+              retainedProps: retainedProps,
+              send: $$this.sendMethod,
+              onUnmount: $$this.onUnmountMethod
+            };
+          }),
+        getInitialState: (function () {
+            const thisJs = this;
+            const convertedReasonProps = convertPropsIfTheyreFromJs(thisJs.props, thisJs.jsPropsToReason, debugName);
+            return {
+              reasonState: Curry._1(convertedReasonProps._0.initialState, undefined)
+            };
+          }),
+        componentDidMount: (function () {
+            let $$this = this;
+            const thisJs = this;
+            const convertedReasonProps = convertPropsIfTheyreFromJs(thisJs.props, thisJs.jsPropsToReason, debugName);
+            const component = convertedReasonProps._0;
+            const curTotalState = thisJs.state;
+            const curReasonState = curTotalState.reasonState;
+            const self = $$this.self(curReasonState, component.retainedProps);
+            if (component.didMount !== anyToUnit) {
+              return Curry._1(component.didMount, self);
+            }
+            
+          }),
+        componentDidUpdate: (function (prevProps, prevState) {
+            let $$this = this;
+            const thisJs = this;
+            const curState = thisJs.state;
+            const curReasonState = curState.reasonState;
+            const newJsProps = thisJs.props;
+            const newConvertedReasonProps = convertPropsIfTheyreFromJs(newJsProps, thisJs.jsPropsToReason, debugName);
+            const newComponent = newConvertedReasonProps._0;
+            if (newComponent.didUpdate === anyToUnit) {
+              return ;
+            }
+            const oldConvertedReasonProps = prevProps === newJsProps ? newConvertedReasonProps : convertPropsIfTheyreFromJs(prevProps, thisJs.jsPropsToReason, debugName);
+            const prevReasonState = prevState.reasonState;
+            const newSelf = $$this.self(curReasonState, newComponent.retainedProps);
+            const oldSelf_handle = newSelf.handle;
+            const oldSelf_retainedProps = oldConvertedReasonProps._0.retainedProps;
+            const oldSelf_send = newSelf.send;
+            const oldSelf_onUnmount = newSelf.onUnmount;
+            const oldSelf = {
+              handle: oldSelf_handle,
+              state: prevReasonState,
+              retainedProps: oldSelf_retainedProps,
+              send: oldSelf_send,
+              onUnmount: oldSelf_onUnmount
+            };
+            Curry._1(newComponent.didUpdate, {
+                  oldSelf: oldSelf,
+                  newSelf: newSelf
+                });
+          }),
+        componentWillUnmount: (function () {
+            let $$this = this;
+            const thisJs = this;
+            const convertedReasonProps = convertPropsIfTheyreFromJs(thisJs.props, thisJs.jsPropsToReason, debugName);
+            const component = convertedReasonProps._0;
+            const curState = thisJs.state;
+            const curReasonState = curState.reasonState;
+            if (component.willUnmount !== anyToUnit) {
+              Curry._1(component.willUnmount, $$this.self(curReasonState, component.retainedProps));
+            }
+            const subs = $$this.subscriptions;
+            if (subs !== null) {
+              subs.forEach(function (unsubscribe) {
+                    Curry._1(unsubscribe, undefined);
+                  });
+              return ;
+            }
+            
+          }),
+        componentWillUpdate: (function (nextProps, nextState) {
+            let $$this = this;
+            const thisJs = this;
+            const newConvertedReasonProps = convertPropsIfTheyreFromJs(nextProps, thisJs.jsPropsToReason, debugName);
+            const newComponent = newConvertedReasonProps._0;
+            if (newComponent.willUpdate === anyToUnit) {
+              return ;
+            }
+            const oldJsProps = thisJs.props;
+            const oldConvertedReasonProps = nextProps === oldJsProps ? newConvertedReasonProps : convertPropsIfTheyreFromJs(oldJsProps, thisJs.jsPropsToReason, debugName);
+            const curState = thisJs.state;
+            const curReasonState = curState.reasonState;
+            const nextReasonState = nextState.reasonState;
+            const newSelf = $$this.self(nextReasonState, newComponent.retainedProps);
+            const oldSelf_handle = newSelf.handle;
+            const oldSelf_retainedProps = oldConvertedReasonProps._0.retainedProps;
+            const oldSelf_send = newSelf.send;
+            const oldSelf_onUnmount = newSelf.onUnmount;
+            const oldSelf = {
+              handle: oldSelf_handle,
+              state: curReasonState,
+              retainedProps: oldSelf_retainedProps,
+              send: oldSelf_send,
+              onUnmount: oldSelf_onUnmount
+            };
+            Curry._1(newComponent.willUpdate, {
+                  oldSelf: oldSelf,
+                  newSelf: newSelf
+                });
+          }),
+        componentWillReceiveProps: (function (nextProps) {
+            let $$this = this;
+            const thisJs = this;
+            const newConvertedReasonProps = convertPropsIfTheyreFromJs(nextProps, thisJs.jsPropsToReason, debugName);
+            const newComponent = newConvertedReasonProps._0;
+            if (newComponent.willReceiveProps === willReceivePropsDefault) {
+              return ;
+            }
+            const oldJsProps = thisJs.props;
+            const oldConvertedReasonProps = nextProps === oldJsProps ? newConvertedReasonProps : convertPropsIfTheyreFromJs(oldJsProps, thisJs.jsPropsToReason, debugName);
+            const oldComponent = oldConvertedReasonProps._0;
+            thisJs.setState((function (curTotalState, param) {
+                    const curReasonState = curTotalState.reasonState;
+                    const oldSelf = $$this.self(curReasonState, oldComponent.retainedProps);
+                    const nextReasonState = Curry._1(newComponent.willReceiveProps, oldSelf);
+                    if (nextReasonState !== curTotalState) {
+                      return {
+                        reasonState: nextReasonState
+                      };
+                    } else {
+                      return curTotalState;
+                    }
+                  }), null);
+          }),
+        shouldComponentUpdate: (function (nextJsProps, nextState, param) {
+            let $$this = this;
+            const thisJs = this;
+            const curJsProps = thisJs.props;
+            const oldConvertedReasonProps = convertPropsIfTheyreFromJs(thisJs.props, thisJs.jsPropsToReason, debugName);
+            const newConvertedReasonProps = nextJsProps === curJsProps ? oldConvertedReasonProps : convertPropsIfTheyreFromJs(nextJsProps, thisJs.jsPropsToReason, debugName);
+            const newComponent = newConvertedReasonProps._0;
+            const nextReasonState = nextState.reasonState;
+            const newSelf = $$this.self(nextReasonState, newComponent.retainedProps);
+            if (newComponent.shouldUpdate === anyToTrue) {
+              return true;
+            }
+            const curState = thisJs.state;
+            const curReasonState = curState.reasonState;
+            const oldSelf_handle = newSelf.handle;
+            const oldSelf_retainedProps = oldConvertedReasonProps._0.retainedProps;
+            const oldSelf_send = newSelf.send;
+            const oldSelf_onUnmount = newSelf.onUnmount;
+            const oldSelf = {
+              handle: oldSelf_handle,
+              state: curReasonState,
+              retainedProps: oldSelf_retainedProps,
+              send: oldSelf_send,
+              onUnmount: oldSelf_onUnmount
+            };
+            return Curry._1(newComponent.shouldUpdate, {
+                  oldSelf: oldSelf,
+                  newSelf: newSelf
+                });
+          }),
+        onUnmountMethod: (function (subscription) {
+            let $$this = this;
+            const subs = $$this.subscriptions;
+            if (subs !== null) {
+              subs.push(subscription);
+            } else {
+              $$this.subscriptions = [subscription];
+            }
+          }),
+        handleMethod: (function (callback) {
+            let $$this = this;
+            const thisJs = this;
+            return function (callbackPayload) {
+              const curState = thisJs.state;
+              const curReasonState = curState.reasonState;
+              const convertedReasonProps = convertPropsIfTheyreFromJs(thisJs.props, thisJs.jsPropsToReason, debugName);
+              Curry._2(callback, callbackPayload, $$this.self(curReasonState, convertedReasonProps._0.retainedProps));
+            };
+          }),
+        sendMethod: (function (action) {
+            let $$this = this;
+            const thisJs = this;
+            const convertedReasonProps = convertPropsIfTheyreFromJs(thisJs.props, thisJs.jsPropsToReason, debugName);
+            const component = convertedReasonProps._0;
+            if (component.reducer === reducerDefault) {
+              return ;
+            }
+            const sideEffects = {
+              contents: (function (prim) {
                   
-                }),
-              componentWillUpdate: (function (nextProps, nextState) {
-                  let $$this = this;
-                  const thisJs = this;
-                  const newConvertedReasonProps = convertPropsIfTheyreFromJs(nextProps, thisJs.jsPropsToReason, debugName);
-                  const newComponent = newConvertedReasonProps._0;
-                  if (newComponent.willUpdate === anyToUnit) {
-                    return ;
-                  }
-                  const oldJsProps = thisJs.props;
-                  const oldConvertedReasonProps = nextProps === oldJsProps ? newConvertedReasonProps : convertPropsIfTheyreFromJs(oldJsProps, thisJs.jsPropsToReason, debugName);
-                  const curState = thisJs.state;
-                  const curReasonState = curState.reasonState;
-                  const nextReasonState = nextState.reasonState;
-                  const newSelf = $$this.self(nextReasonState, newComponent.retainedProps);
-                  const oldSelf_handle = newSelf.handle;
-                  const oldSelf_retainedProps = oldConvertedReasonProps._0.retainedProps;
-                  const oldSelf_send = newSelf.send;
-                  const oldSelf_onUnmount = newSelf.onUnmount;
-                  const oldSelf = {
-                    handle: oldSelf_handle,
-                    state: curReasonState,
-                    retainedProps: oldSelf_retainedProps,
-                    send: oldSelf_send,
-                    onUnmount: oldSelf_onUnmount
-                  };
-                  Curry._1(newComponent.willUpdate, {
-                        oldSelf: oldSelf,
-                        newSelf: newSelf
-                      });
-                }),
-              componentWillReceiveProps: (function (nextProps) {
-                  let $$this = this;
-                  const thisJs = this;
-                  const newConvertedReasonProps = convertPropsIfTheyreFromJs(nextProps, thisJs.jsPropsToReason, debugName);
-                  const newComponent = newConvertedReasonProps._0;
-                  if (newComponent.willReceiveProps === willReceivePropsDefault) {
-                    return ;
-                  }
-                  const oldJsProps = thisJs.props;
-                  const oldConvertedReasonProps = nextProps === oldJsProps ? newConvertedReasonProps : convertPropsIfTheyreFromJs(oldJsProps, thisJs.jsPropsToReason, debugName);
-                  const oldComponent = oldConvertedReasonProps._0;
-                  thisJs.setState((function (curTotalState, param) {
-                          const curReasonState = curTotalState.reasonState;
-                          const oldSelf = $$this.self(curReasonState, oldComponent.retainedProps);
-                          const nextReasonState = Curry._1(newComponent.willReceiveProps, oldSelf);
-                          if (nextReasonState !== curTotalState) {
-                            return {
-                                    reasonState: nextReasonState
-                                  };
-                          } else {
-                            return curTotalState;
-                          }
-                        }), null);
-                }),
-              shouldComponentUpdate: (function (nextJsProps, nextState, param) {
-                  let $$this = this;
-                  const thisJs = this;
-                  const curJsProps = thisJs.props;
-                  const oldConvertedReasonProps = convertPropsIfTheyreFromJs(thisJs.props, thisJs.jsPropsToReason, debugName);
-                  const newConvertedReasonProps = nextJsProps === curJsProps ? oldConvertedReasonProps : convertPropsIfTheyreFromJs(nextJsProps, thisJs.jsPropsToReason, debugName);
-                  const newComponent = newConvertedReasonProps._0;
-                  const nextReasonState = nextState.reasonState;
-                  const newSelf = $$this.self(nextReasonState, newComponent.retainedProps);
-                  if (newComponent.shouldUpdate === anyToTrue) {
-                    return true;
-                  }
-                  const curState = thisJs.state;
-                  const curReasonState = curState.reasonState;
-                  const oldSelf_handle = newSelf.handle;
-                  const oldSelf_retainedProps = oldConvertedReasonProps._0.retainedProps;
-                  const oldSelf_send = newSelf.send;
-                  const oldSelf_onUnmount = newSelf.onUnmount;
-                  const oldSelf = {
-                    handle: oldSelf_handle,
-                    state: curReasonState,
-                    retainedProps: oldSelf_retainedProps,
-                    send: oldSelf_send,
-                    onUnmount: oldSelf_onUnmount
-                  };
-                  return Curry._1(newComponent.shouldUpdate, {
-                              oldSelf: oldSelf,
-                              newSelf: newSelf
-                            });
-                }),
-              onUnmountMethod: (function (subscription) {
-                  let $$this = this;
-                  const subs = $$this.subscriptions;
-                  if (subs !== null) {
-                    subs.push(subscription);
-                  } else {
-                    $$this.subscriptions = [subscription];
-                  }
-                }),
-              handleMethod: (function (callback) {
-                  let $$this = this;
-                  const thisJs = this;
-                  return function (callbackPayload) {
-                    const curState = thisJs.state;
-                    const curReasonState = curState.reasonState;
-                    const convertedReasonProps = convertPropsIfTheyreFromJs(thisJs.props, thisJs.jsPropsToReason, debugName);
-                    Curry._2(callback, callbackPayload, $$this.self(curReasonState, convertedReasonProps._0.retainedProps));
-                  };
-                }),
-              sendMethod: (function (action) {
-                  let $$this = this;
-                  const thisJs = this;
-                  const convertedReasonProps = convertPropsIfTheyreFromJs(thisJs.props, thisJs.jsPropsToReason, debugName);
-                  const component = convertedReasonProps._0;
-                  if (component.reducer === reducerDefault) {
-                    return ;
-                  }
-                  const sideEffects = {
-                    contents: (function (prim) {
-                        
-                      })
-                  };
-                  const partialStateApplication = Curry._1(component.reducer, action);
-                  thisJs.setState((function (curTotalState, param) {
-                          const curReasonState = curTotalState.reasonState;
-                          const reasonStateUpdate = Curry._1(partialStateApplication, curReasonState);
-                          if (reasonStateUpdate === /* NoUpdate */0) {
-                            return null;
-                          }
-                          let nextTotalState;
-                          if (/* tag */typeof reasonStateUpdate === "number" || typeof reasonStateUpdate === "string") {
-                            nextTotalState = curTotalState;
-                          } else {
-                            switch (reasonStateUpdate.TAG) {
-                              case /* Update */0 :
-                                  nextTotalState = {
-                                    reasonState: reasonStateUpdate._0
-                                  };
-                                  break;
-                              case /* SideEffects */1 :
-                                  sideEffects.contents = reasonStateUpdate._0;
-                                  nextTotalState = curTotalState;
-                                  break;
-                              case /* UpdateWithSideEffects */2 :
-                                  sideEffects.contents = reasonStateUpdate._1;
-                                  nextTotalState = {
-                                    reasonState: reasonStateUpdate._0
-                                  };
-                                  break;
-                              
-                            }
-                          }
-                          if (nextTotalState !== curTotalState) {
-                            return nextTotalState;
-                          } else {
-                            return null;
-                          }
-                        }), $$this.handleMethod(function (param, self) {
-                            Curry._1(sideEffects.contents, self);
-                          }));
-                }),
-              render: (function () {
-                  let $$this = this;
-                  const thisJs = this;
-                  const convertedReasonProps = convertPropsIfTheyreFromJs(thisJs.props, thisJs.jsPropsToReason, debugName);
-                  const created = convertedReasonProps._0;
-                  const curState = thisJs.state;
-                  const curReasonState = curState.reasonState;
-                  return Curry._1(created.render, $$this.self(curReasonState, created.retainedProps));
                 })
-            });
+            };
+            const partialStateApplication = Curry._1(component.reducer, action);
+            thisJs.setState((function (curTotalState, param) {
+                    const curReasonState = curTotalState.reasonState;
+                    const reasonStateUpdate = Curry._1(partialStateApplication, curReasonState);
+                    if (reasonStateUpdate === /* NoUpdate */0) {
+                      return null;
+                    }
+                    let nextTotalState;
+                    if (/* tag */typeof reasonStateUpdate === "number" || typeof reasonStateUpdate === "string") {
+                      nextTotalState = curTotalState;
+                    } else {
+                      switch (reasonStateUpdate.TAG) {
+                        case /* Update */0 :
+                            nextTotalState = {
+                              reasonState: reasonStateUpdate._0
+                            };
+                            break;
+                        case /* SideEffects */1 :
+                            sideEffects.contents = reasonStateUpdate._0;
+                            nextTotalState = curTotalState;
+                            break;
+                        case /* UpdateWithSideEffects */2 :
+                            sideEffects.contents = reasonStateUpdate._1;
+                            nextTotalState = {
+                              reasonState: reasonStateUpdate._0
+                            };
+                            break;
+                        
+                      }
+                    }
+                    if (nextTotalState !== curTotalState) {
+                      return nextTotalState;
+                    } else {
+                      return null;
+                    }
+                  }), $$this.handleMethod(function (param, self) {
+                      Curry._1(sideEffects.contents, self);
+                    }));
+          }),
+        render: (function () {
+            let $$this = this;
+            const thisJs = this;
+            const convertedReasonProps = convertPropsIfTheyreFromJs(thisJs.props, thisJs.jsPropsToReason, debugName);
+            const created = convertedReasonProps._0;
+            const curState = thisJs.state;
+            const curReasonState = curState.reasonState;
+            return Curry._1(created.render, $$this.self(curReasonState, created.retainedProps));
+          })
+      });
 }
 
 function basicComponent(debugName) {
   return {
-          debugName: debugName,
-          reactClassInternal: createClass(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: createClass(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
+  };
 }
 
 const statelessComponent = basicComponent;
@@ -349,10 +349,10 @@ function element(keyOpt, refOpt, component) {
     return Curry._2(Caml_option.valFromOption(jsElementWrapped), key, ref);
   } else {
     return React.createElement(component.reactClassInternal, {
-                key: key,
-                ref: ref,
-                reasonProps: element$1
-              });
+          key: key,
+          ref: ref,
+          reasonProps: element$1
+        });
   }
 }
 
@@ -377,21 +377,21 @@ function wrapJsForReason(reactClass, props, children) {
       return 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
+  };
 }
 
 exports.statelessComponent = statelessComponent;
diff --git a/jscomp/test/dist/jscomp/test/re_or_res/reasonReactRouter.js b/jscomp/test/dist/jscomp/test/re_or_res/reasonReactRouter.js
index ef148498f..fcaa09e5f 100644
--- a/jscomp/test/dist/jscomp/test/re_or_res/reasonReactRouter.js
+++ b/jscomp/test/dist/jscomp/test/re_or_res/reasonReactRouter.js
@@ -129,10 +129,10 @@ function urlNotEqual(a, b) {
 
 function url(param) {
   return {
-          path: path(undefined),
-          hash: hash(undefined),
-          search: search(undefined)
-        };
+    path: path(undefined),
+    hash: hash(undefined),
+    search: search(undefined)
+  };
 }
 
 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/dist/jscomp/test/re_or_res/recursive_react_component.js b/jscomp/test/dist/jscomp/test/re_or_res/recursive_react_component.js
index 9c8066f3a..487e4a3b8 100644
--- a/jscomp/test/dist/jscomp/test/re_or_res/recursive_react_component.js
+++ b/jscomp/test/dist/jscomp/test/re_or_res/recursive_react_component.js
@@ -6,8 +6,8 @@ const React = require("react");
 function make(Props) {
   let foo = Props.foo;
   return React.createElement(make, {
-              foo: foo
-            });
+        foo: foo
+      });
 }
 
 exports.make = make;
diff --git a/jscomp/test/dist/jscomp/test/rec_fun_test.js b/jscomp/test/dist/jscomp/test/rec_fun_test.js
index bd275ab10..22af9c8ae 100644
--- a/jscomp/test/dist/jscomp/test/rec_fun_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/rec_module_test.js b/jscomp/test/dist/jscomp/test/rec_module_test.js
index c57297a30..b2407e377 100644
--- a/jscomp/test/dist/jscomp/test/rec_module_test.js
+++ b/jscomp/test/dist/jscomp/test/rec_module_test.js
@@ -113,12 +113,12 @@ function create(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r.h;
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, v, r) {
@@ -129,9 +129,9 @@ function bal(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const lr = l.r;
     const lv = l.v;
@@ -143,24 +143,24 @@ function bal(l, v, r) {
       return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   const rr = r.r;
   const rv = r.v;
@@ -172,20 +172,20 @@ function bal(l, v, r) {
     return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Set.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Set.bal"
+      });
 }
 
 function add(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = t.r;
   const v = t.v;
@@ -212,12 +212,12 @@ function add(x, t) {
 
 function singleton(x) {
   return {
-          TAG: /* Node */0,
-          l: /* Empty */0,
-          v: x,
-          r: /* Empty */0,
-          h: 1
-        };
+    TAG: /* Node */0,
+    l: /* Empty */0,
+    v: x,
+    r: /* Empty */0,
+    h: 1
+  };
 }
 
 function add_min_element(x, param) {
@@ -259,8 +259,8 @@ function min_elt(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -291,8 +291,8 @@ function max_elt(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
@@ -321,9 +321,9 @@ function max_elt_opt(_param) {
 function remove_min_elt(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.remove_min_elt"
+        });
   }
   const l = param.l;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -346,10 +346,10 @@ function concat(t1, t2) {
 function split(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            false,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      false,
+      /* Empty */0
+    ];
   }
   const r = param.r;
   const v = param.v;
@@ -357,25 +357,25 @@ function split(x, param) {
   const c = Curry._2(AAA.compare, x, v);
   if (c === 0) {
     return [
-            l,
-            true,
-            r
-          ];
+      l,
+      true,
+      r
+    ];
   }
   if (c < 0) {
     const match = split(x, l);
     return [
-            match[0],
-            match[1],
-            join(match[2], v, r)
-          ];
+      match[0],
+      match[1],
+      join(match[2], v, r)
+    ];
   }
   const 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) {
@@ -481,12 +481,12 @@ function inter(s1, s2) {
 function split_bis(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return {
-            TAG: /* NotFound */0,
-            _0: /* Empty */0,
-            _1: (function (param) {
-                return /* Empty */0;
-              })
-          };
+      TAG: /* NotFound */0,
+      _0: /* Empty */0,
+      _1: (function (param) {
+          return /* Empty */0;
+        })
+    };
   }
   const r = param.r;
   const v = param.v;
@@ -502,22 +502,22 @@ function split_bis(x, param) {
     }
     const rl = match._1;
     return {
-            TAG: /* NotFound */0,
-            _0: match._0,
-            _1: (function (param) {
-                return join(Curry._1(rl, undefined), v, r);
-              })
-          };
+      TAG: /* NotFound */0,
+      _0: match._0,
+      _1: (function (param) {
+          return join(Curry._1(rl, undefined), v, r);
+        })
+    };
   }
   const match$1 = split_bis(x, r);
   if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
     return /* Found */0;
   } else {
     return {
-            TAG: /* NotFound */0,
-            _0: join(l, v, match$1._0),
-            _1: match$1._1
-          };
+      TAG: /* NotFound */0,
+      _0: join(l, v, match$1._0),
+      _1: match$1._1
+    };
   }
 }
 
@@ -749,9 +749,9 @@ function filter(p, t) {
 function partition(p, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      /* Empty */0
+    ];
   }
   const v = param.v;
   const match = partition(p, param.l);
@@ -763,14 +763,14 @@ function partition(p, param) {
   const 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)
+    ];
   }
 }
 
@@ -807,8 +807,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     const c = Curry._2(AAA.compare, x, v);
@@ -825,8 +825,8 @@ function find_first(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -889,8 +889,8 @@ function find_last(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -1044,21 +1044,21 @@ function of_list(l) {
         switch (n) {
           case 0 :
               return [
-                      /* Empty */0,
-                      l
-                    ];
+                /* Empty */0,
+                l
+              ];
           case 1 :
               if (l) {
                 return [
-                        {
-                          TAG: /* Node */0,
-                          l: /* Empty */0,
-                          v: l.hd,
-                          r: /* Empty */0,
-                          h: 1
-                        },
-                        l.tl
-                      ];
+                  {
+                    TAG: /* Node */0,
+                    l: /* Empty */0,
+                    v: l.hd,
+                    r: /* Empty */0,
+                    h: 1
+                  },
+                  l.tl
+                ];
               }
               break;
           case 2 :
@@ -1066,21 +1066,21 @@ function of_list(l) {
                 const match = l.tl;
                 if (match) {
                   return [
-                          {
-                            TAG: /* Node */0,
-                            l: {
-                              TAG: /* Node */0,
-                              l: /* Empty */0,
-                              v: l.hd,
-                              r: /* Empty */0,
-                              h: 1
-                            },
-                            v: match.hd,
-                            r: /* Empty */0,
-                            h: 2
-                          },
-                          match.tl
-                        ];
+                    {
+                      TAG: /* Node */0,
+                      l: {
+                        TAG: /* Node */0,
+                        l: /* Empty */0,
+                        v: l.hd,
+                        r: /* Empty */0,
+                        h: 1
+                      },
+                      v: match.hd,
+                      r: /* Empty */0,
+                      h: 2
+                    },
+                    match.tl
+                  ];
                 }
                 
               }
@@ -1092,27 +1092,27 @@ function of_list(l) {
                   const match$2 = match$1.tl;
                   if (match$2) {
                     return [
-                            {
-                              TAG: /* Node */0,
-                              l: {
-                                TAG: /* Node */0,
-                                l: /* Empty */0,
-                                v: l.hd,
-                                r: /* Empty */0,
-                                h: 1
-                              },
-                              v: match$1.hd,
-                              r: {
-                                TAG: /* Node */0,
-                                l: /* Empty */0,
-                                v: match$2.hd,
-                                r: /* Empty */0,
-                                h: 1
-                              },
-                              h: 2
-                            },
-                            match$2.tl
-                          ];
+                      {
+                        TAG: /* Node */0,
+                        l: {
+                          TAG: /* Node */0,
+                          l: /* Empty */0,
+                          v: l.hd,
+                          r: /* Empty */0,
+                          h: 1
+                        },
+                        v: match$1.hd,
+                        r: {
+                          TAG: /* Node */0,
+                          l: /* Empty */0,
+                          v: match$2.hd,
+                          r: /* Empty */0,
+                          h: 1
+                        },
+                        h: 2
+                      },
+                      match$2.tl
+                    ];
                   }
                   
                 }
@@ -1128,18 +1128,18 @@ function of_list(l) {
         if (l$1) {
           const 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 new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/stdlib/set.ml",
-                    571,
-                    18
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/stdlib/set.ml",
+                571,
+                18
+              ]
+            });
       };
       return sub(Stdlib__List.length(l$1), l$1)[0];
     } else {
@@ -1152,8 +1152,8 @@ function of_list(l) {
 
 function add_seq(i, m) {
   return Stdlib__Seq.fold_left((function (s, x) {
-                return add(x, s);
-              }), m, i);
+          return add(x, s);
+        }), m, i);
 }
 
 function of_seq(i) {
@@ -1166,12 +1166,12 @@ function seq_of_enum_(c, param) {
   }
   const partial_arg = cons_enum(c._1, c._2);
   return {
-          TAG: /* Cons */0,
-          _0: c._0,
-          _1: (function (param) {
-              return seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: c._0,
+    _1: (function (param) {
+        return seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_seq(c) {
@@ -1205,12 +1205,12 @@ function rev_seq_of_enum_(c, param) {
   }
   const partial_arg = snoc_enum(c._1, c._2);
   return {
-          TAG: /* Cons */0,
-          _0: c._0,
-          _1: (function (param) {
-              return rev_seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: c._0,
+    _1: (function (param) {
+        return rev_seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_rev_seq(c) {
@@ -1233,11 +1233,11 @@ function to_seq_from(low, s) {
       const n = Curry._2(AAA.compare, v, low);
       if (n === 0) {
         return {
-                TAG: /* More */0,
-                _0: v,
-                _1: r,
-                _2: c
-              };
+          TAG: /* More */0,
+          _0: v,
+          _1: r,
+          _2: c
+        };
       }
       if (n < 0) {
         _s = r;
@@ -1309,20 +1309,20 @@ const suites_0 = [
   "test1",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _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,
+        _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)
+        ]
+      };
     })
 ];
 
@@ -1331,10 +1331,10 @@ const suites_1 = {
     "test2",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: Curry._1(y, undefined),
-                _1: 32
-              };
+          TAG: /* Eq */0,
+          _0: Curry._1(y, undefined),
+          _1: 32
+        };
       })
   ],
   tl: {
@@ -1342,10 +1342,10 @@ const suites_1 = {
       "test3",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: Curry._1(x, undefined),
-                  _1: 35
-                };
+            TAG: /* Eq */0,
+            _0: Curry._1(x, undefined),
+            _1: 35
+          };
         })
     ],
     tl: {
@@ -1353,10 +1353,10 @@ const suites_1 = {
         "test4",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: true,
-                    _1: Curry._1(A.even, 2)
-                  };
+              TAG: /* Eq */0,
+              _0: true,
+              _1: Curry._1(A.even, 2)
+            };
           })
       ],
       tl: {
@@ -1364,10 +1364,10 @@ const suites_1 = {
           "test4",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: true,
-                      _1: Curry._1(even$1, 4)
-                    };
+                TAG: /* Eq */0,
+                _0: true,
+                _1: Curry._1(even$1, 4)
+              };
             })
         ],
         tl: {
@@ -1375,10 +1375,10 @@ const suites_1 = {
             "test5",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: false,
-                        _1: Curry._1(B.odd, 2)
-                      };
+                  TAG: /* Eq */0,
+                  _0: false,
+                  _1: Curry._1(B.odd, 2)
+                };
               })
           ],
           tl: {
@@ -1386,28 +1386,28 @@ const suites_1 = {
               "test6",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: 2,
-                          _1: Curry._1(cardinal, Curry._1(of_list, {
-                                    hd: {
-                                      TAG: /* Leaf */0,
-                                      _0: "a"
-                                    },
-                                    tl: {
-                                      hd: {
-                                        TAG: /* Leaf */0,
-                                        _0: "b"
-                                      },
-                                      tl: {
-                                        hd: {
-                                          TAG: /* Leaf */0,
-                                          _0: "a"
-                                        },
-                                        tl: /* [] */0
-                                      }
-                                    }
-                                  }))
-                        };
+                    TAG: /* Eq */0,
+                    _0: 2,
+                    _1: Curry._1(cardinal, Curry._1(of_list, {
+                              hd: {
+                                TAG: /* Leaf */0,
+                                _0: "a"
+                              },
+                              tl: {
+                                hd: {
+                                  TAG: /* Leaf */0,
+                                  _0: "b"
+                                },
+                                tl: {
+                                  hd: {
+                                    TAG: /* Leaf */0,
+                                    _0: "a"
+                                  },
+                                  tl: /* [] */0
+                                }
+                              }
+                            }))
+                  };
                 })
             ],
             tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/rec_value_test.js b/jscomp/test/dist/jscomp/test/rec_value_test.js
index 5047ec7d0..926c14b08 100644
--- a/jscomp/test/dist/jscomp/test/rec_value_test.js
+++ b/jscomp/test/dist/jscomp/test/rec_value_test.js
@@ -82,13 +82,13 @@ const h = {
 const v = {
   contents: (function (param) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/rec_value_test.ml",
-                  36,
-                  24
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/rec_value_test.ml",
+              36,
+              24
+            ]
+          });
     })
 };
 
@@ -246,49 +246,49 @@ const rec_variant_a = {
 function phd(l) {
   if (typeof l === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/rec_value_test.ml",
-                107,
-                9
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/rec_value_test.ml",
+            107,
+            9
+          ]
+        });
   }
   if (l.NAME === "Cons") {
     return l.VAL[0];
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/rec_value_test.ml",
-              107,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/rec_value_test.ml",
+          107,
+          9
+        ]
+      });
 }
 
 function ptl(l) {
   if (typeof l === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/rec_value_test.ml",
-                112,
-                9
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/rec_value_test.ml",
+            112,
+            9
+          ]
+        });
   }
   if (l.NAME === "Cons") {
     return l.VAL[1];
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/rec_value_test.ml",
-              112,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/rec_value_test.ml",
+          112,
+          9
+        ]
+      });
 }
 
 let y00 = {};
@@ -311,10 +311,10 @@ const suites_0 = [
   "File \"jscomp/test/rec_value_test.ml\", line 128, characters 2-9",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: 1,
-              _1: phd(ptl(ptl(x0)))
-            };
+        TAG: /* Eq */0,
+        _0: 1,
+        _1: phd(ptl(ptl(x0)))
+      };
     })
 ];
 
@@ -323,10 +323,10 @@ const suites_1 = {
     "File \"jscomp/test/rec_value_test.ml\", line 130, characters 2-9",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: 1,
-                _1: 1
-              };
+          TAG: /* Eq */0,
+          _0: 1,
+          _1: 1
+        };
       })
   ],
   tl: {
@@ -334,10 +334,10 @@ const suites_1 = {
       "hd",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: 1,
-                  _1: Stdlib__List.hd(Stdlib__List.tl(x))
-                };
+            TAG: /* Eq */0,
+            _0: 1,
+            _1: Stdlib__List.hd(Stdlib__List.tl(x))
+          };
         })
     ],
     tl: {
@@ -351,29 +351,29 @@ const suites_1 = {
                 tmp = match.hd;
               } else {
                 throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                          MEL_EXN_ID: "Assert_failure",
-                          _1: [
-                            "jscomp/test/rec_value_test.ml",
-                            142,
-                            2
-                          ]
-                        });
+                      MEL_EXN_ID: "Assert_failure",
+                      _1: [
+                        "jscomp/test/rec_value_test.ml",
+                        142,
+                        2
+                      ]
+                    });
               }
             } else {
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/rec_value_test.ml",
-                          142,
-                          2
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/rec_value_test.ml",
+                      142,
+                      2
+                    ]
+                  });
             }
             return {
-                    TAG: /* Eq */0,
-                    _0: 3,
-                    _1: tmp
-                  };
+              TAG: /* Eq */0,
+              _0: 3,
+              _1: tmp
+            };
           })
       ],
       tl: {
@@ -381,10 +381,10 @@ const suites_1 = {
           "rec_sum",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: 55,
-                      _1: sum(0, 10)
-                    };
+                TAG: /* Eq */0,
+                _0: 55,
+                _1: sum(0, 10)
+              };
             })
         ],
         tl: {
@@ -392,16 +392,16 @@ const suites_1 = {
             "File \"jscomp/test/rec_value_test.ml\", line 145, characters 2-9",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: {
-                          hd: 1,
-                          tl: {
-                            hd: 2,
-                            tl: /* [] */0
-                          }
-                        },
-                        _1: fake_v
-                      };
+                  TAG: /* Eq */0,
+                  _0: {
+                    hd: 1,
+                    tl: {
+                      hd: 2,
+                      tl: /* [] */0
+                    }
+                  },
+                  _1: fake_v
+                };
               })
           ],
           tl: {
@@ -409,16 +409,16 @@ const suites_1 = {
               "File \"jscomp/test/rec_value_test.ml\", line 148, characters 2-9",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: {
-                            hd: 2,
-                            tl: {
-                              hd: 3,
-                              tl: /* [] */0
-                            }
-                          },
-                          _1: fake_y
-                        };
+                    TAG: /* Eq */0,
+                    _0: {
+                      hd: 2,
+                      tl: {
+                        hd: 3,
+                        tl: /* [] */0
+                      }
+                    },
+                    _1: fake_y
+                  };
                 })
             ],
             tl: {
@@ -426,19 +426,19 @@ const suites_1 = {
                 "File \"jscomp/test/rec_value_test.ml\", line 151, characters 2-9",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: {
-                              hd: 1,
-                              tl: {
-                                hd: 2,
-                                tl: {
-                                  hd: 3,
-                                  tl: /* [] */0
-                                }
-                              }
-                            },
-                            _1: fake_z
-                          };
+                      TAG: /* Eq */0,
+                      _0: {
+                        hd: 1,
+                        tl: {
+                          hd: 2,
+                          tl: {
+                            hd: 3,
+                            tl: /* [] */0
+                          }
+                        }
+                      },
+                      _1: fake_z
+                    };
                   })
               ],
               tl: {
@@ -446,22 +446,22 @@ const suites_1 = {
                   "File \"jscomp/test/rec_value_test.ml\", line 154, characters 2-9",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: {
-                                hd: 1,
-                                tl: {
-                                  hd: 55,
-                                  tl: {
-                                    hd: 2,
-                                    tl: {
-                                      hd: 3,
-                                      tl: /* [] */0
-                                    }
-                                  }
-                                }
-                              },
-                              _1: fake_z2
-                            };
+                        TAG: /* Eq */0,
+                        _0: {
+                          hd: 1,
+                          tl: {
+                            hd: 55,
+                            tl: {
+                              hd: 2,
+                              tl: {
+                                hd: 3,
+                                tl: /* [] */0
+                              }
+                            }
+                          }
+                        },
+                        _1: fake_z2
+                      };
                     })
                 ],
                 tl: {
@@ -469,16 +469,16 @@ const suites_1 = {
                     "File \"jscomp/test/rec_value_test.ml\", line 157, characters 2-9",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: {
-                                  hd: 2,
-                                  tl: {
-                                    hd: 3,
-                                    tl: /* [] */0
-                                  }
-                                },
-                                _1: fake_y2
-                              };
+                          TAG: /* Eq */0,
+                          _0: {
+                            hd: 2,
+                            tl: {
+                              hd: 3,
+                              tl: /* [] */0
+                            }
+                          },
+                          _1: fake_y2
+                        };
                       })
                   ],
                   tl: {
@@ -486,10 +486,10 @@ const suites_1 = {
                       "File \"jscomp/test/rec_value_test.ml\", line 160, characters 2-9",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: 3,
-                                  _1: 3
-                                };
+                            TAG: /* Eq */0,
+                            _0: 3,
+                            _1: 3
+                          };
                         })
                     ],
                     tl: {
@@ -498,19 +498,19 @@ const suites_1 = {
                         (function (param) {
                             if (rec_variant_b.TAG === /* B */0) {
                               return {
-                                      TAG: /* Eq */0,
-                                      _0: Curry._1(rec_variant_b_1, undefined),
-                                      _1: rec_variant_a
-                                    };
+                                TAG: /* Eq */0,
+                                _0: Curry._1(rec_variant_b_1, undefined),
+                                _1: rec_variant_a
+                              };
                             }
                             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                      MEL_EXN_ID: "Assert_failure",
-                                      _1: [
-                                        "jscomp/test/rec_value_test.ml",
-                                        166,
-                                        11
-                                      ]
-                                    });
+                                  MEL_EXN_ID: "Assert_failure",
+                                  _1: [
+                                    "jscomp/test/rec_value_test.ml",
+                                    166,
+                                    11
+                                  ]
+                                });
                           })
                       ],
                       tl: {
@@ -519,19 +519,19 @@ const suites_1 = {
                           (function (param) {
                               if (rec_variant_a.TAG !== /* B */0) {
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: Curry._1(rec_variant_a_1, undefined),
-                                        _1: rec_variant_b
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: Curry._1(rec_variant_a_1, undefined),
+                                  _1: rec_variant_b
+                                };
                               }
                               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                                        MEL_EXN_ID: "Assert_failure",
-                                        _1: [
-                                          "jscomp/test/rec_value_test.ml",
-                                          171,
-                                          11
-                                        ]
-                                      });
+                                    MEL_EXN_ID: "Assert_failure",
+                                    _1: [
+                                      "jscomp/test/rec_value_test.ml",
+                                      171,
+                                      11
+                                    ]
+                                  });
                             })
                         ],
                         tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/record_extension_test.js b/jscomp/test/dist/jscomp/test/record_extension_test.js
index 067d89dde..8ae0d481b 100644
--- a/jscomp/test/dist/jscomp/test/record_extension_test.js
+++ b/jscomp/test/dist/jscomp/test/record_extension_test.js
@@ -49,10 +49,10 @@ function f2_with(x) {
     return x;
   } else {
     return {
-            TAG: /* C */0,
-            x: 0,
-            y: x.y
-          };
+      TAG: /* C */0,
+      x: 0,
+      y: x.y
+    };
   }
 }
 
diff --git a/jscomp/test/dist/jscomp/test/record_name_test.js b/jscomp/test/dist/jscomp/test/record_name_test.js
index 1d020eca0..e8034b4c6 100644
--- a/jscomp/test/dist/jscomp/test/record_name_test.js
+++ b/jscomp/test/dist/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/dist/jscomp/test/record_with_test.js b/jscomp/test/dist/jscomp/test/record_with_test.js
index 308e6229d..b14f2603a 100644
--- a/jscomp/test/dist/jscomp/test/record_with_test.js
+++ b/jscomp/test/dist/jscomp/test/record_with_test.js
@@ -27,24 +27,24 @@ const u_v = {
 function f(g, h) {
   const 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
+  };
 }
 
 const suites_0 = [
   "eq_with",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: v,
-              _1: u_v
-            };
+        TAG: /* Eq */0,
+        _0: v,
+        _1: u_v
+      };
     })
 ];
 
diff --git a/jscomp/test/dist/jscomp/test/recursive_module_test.js b/jscomp/test/dist/jscomp/test/recursive_module_test.js
index eb76e9fcf..6ddf93c40 100644
--- a/jscomp/test/dist/jscomp/test/recursive_module_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -82,11 +82,11 @@ add([
       "File \"jscomp/test/recursive_module_test.ml\", line 34, characters 7-14",
       (function (param) {
           return {
-                  TAG: /* ThrowAny */7,
-                  _0: (function (param) {
-                      Curry._1(Int3.u, 3);
-                    })
-                };
+            TAG: /* ThrowAny */7,
+            _0: (function (param) {
+                Curry._1(Int3.u, 3);
+              })
+          };
         })
     ]);
 
diff --git a/jscomp/test/dist/jscomp/test/recursive_records_test.js b/jscomp/test/dist/jscomp/test/recursive_records_test.js
index 58e331d8e..bde09c156 100644
--- a/jscomp/test/dist/jscomp/test/recursive_records_test.js
+++ b/jscomp/test/dist/jscomp/test/recursive_records_test.js
@@ -70,13 +70,13 @@ function tl_exn(x) {
     return x.next;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/recursive_records_test.ml",
-              52,
-              11
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/recursive_records_test.ml",
+          52,
+          11
+        ]
+      });
 }
 
 eq("File \"jscomp/test/recursive_records_test.ml\", line 56, characters 6-13", (hd(rec_cell2) + hd(tl_exn(rec_cell2)) | 0) + hd(tl_exn(tl_exn(rec_cell2))) | 0, 9);
diff --git a/jscomp/test/dist/jscomp/test/recursive_unbound_module_test.js b/jscomp/test/dist/jscomp/test/recursive_unbound_module_test.js
index 2e9d0c931..c450e6c0c 100644
--- a/jscomp/test/dist/jscomp/test/recursive_unbound_module_test.js
+++ b/jscomp/test/dist/jscomp/test/recursive_unbound_module_test.js
@@ -11,8 +11,8 @@ function Make(X) {
     f: f
   };
   return {
-          M: M
-        };
+    M: M
+  };
 }
 
 const B = Caml_module.init_mod([
diff --git a/jscomp/test/dist/jscomp/test/return_check.js b/jscomp/test/dist/jscomp/test/return_check.js
index 8a41230de..e0625894a 100644
--- a/jscomp/test/dist/jscomp/test/return_check.js
+++ b/jscomp/test/dist/jscomp/test/return_check.js
@@ -20,13 +20,13 @@ function f_undefined(xs, i) {
     return k;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/return_check.ml",
-              30,
-              14
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/return_check.ml",
+          30,
+          14
+        ]
+      });
 }
 
 function f_escaped_not(xs, i) {
@@ -60,13 +60,13 @@ function f_null(xs, i) {
     return k;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/return_check.ml",
-              58,
-              14
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/return_check.ml",
+          58,
+          14
+        ]
+      });
 }
 
 function f_null_undefined(xs, i) {
@@ -75,13 +75,13 @@ function f_null_undefined(xs, i) {
     return k;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/return_check.ml",
-              67,
-              14
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/return_check.ml",
+          67,
+          14
+        ]
+      });
 }
 
 exports.test = test;
diff --git a/jscomp/test/dist/jscomp/test/scanf_io.js b/jscomp/test/dist/jscomp/test/scanf_io.js
index 6f124849b..419f5703f 100644
--- a/jscomp/test/dist/jscomp/test/scanf_io.js
+++ b/jscomp/test/dist/jscomp/test/scanf_io.js
@@ -128,9 +128,9 @@ function get_lines(fname) {
                 _1: "in file %s, %s"
               }), fname, s._1);
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: s$1
-              });
+            MEL_EXN_ID: "Failure",
+            _1: s$1
+          });
     }
     if (s.MEL_EXN_ID === Stdlib.End_of_file) {
       const s$2 = Curry._1(Stdlib__Printf.sprintf({
@@ -151,9 +151,9 @@ function get_lines(fname) {
                 _1: "in file %s, unexpected end of file"
               }), fname);
       throw new Caml_js_exceptions.MelangeError("Failure", {
-                MEL_EXN_ID: "Failure",
-                _1: s$2
-              });
+            MEL_EXN_ID: "Failure",
+            _1: s$2
+          });
     }
     throw new Caml_js_exceptions.MelangeError(s.MEL_EXN_ID, s);
   }
@@ -162,19 +162,19 @@ function get_lines(fname) {
 function add_digest_ib(ob, ib) {
   const scan_line = function (ib, f) {
     return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Scan_char_set */20,
-                      _0: undefined,
-                      _1: "\xff\xdb\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
-                      _2: {
-                        TAG: /* Char_literal */12,
-                        _0: /* '\n' */10,
-                        _1: /* End_of_format */0
-                      }
-                    },
-                    _1: "%[^\n\r]\n"
-                  }), f);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Scan_char_set */20,
+                _0: undefined,
+                _1: "\xff\xdb\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
+                _2: {
+                  TAG: /* Char_literal */12,
+                  _0: /* '\n' */10,
+                  _1: /* End_of_format */0
+                }
+              },
+              _1: "%[^\n\r]\n"
+            }), f);
   };
   const output_line_digest = function (s) {
     Stdlib__Buffer.add_string(ob, s);
diff --git a/jscomp/test/dist/jscomp/test/scanf_reference_error_regression_test.js b/jscomp/test/dist/jscomp/test/scanf_reference_error_regression_test.js
index 06a4615a8..eaa75153c 100644
--- a/jscomp/test/dist/jscomp/test/scanf_reference_error_regression_test.js
+++ b/jscomp/test/dist/jscomp/test/scanf_reference_error_regression_test.js
@@ -23,75 +23,75 @@ function eq(f, param) {
 
 function scan_rest(ib, accu) {
   return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Scan_char_set */20,
-                    _0: undefined,
-                    _1: "\0\0\0\0\0\0\0\0\0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                    _2: /* End_of_format */0
-                  },
-                  _1: "%[]]"
-                }), (function (param) {
-                if (param === "]") {
-                  return accu;
-                } else {
-                  return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* Char_literal */12,
-                                    _0: /* ' ' */32,
-                                    _1: {
-                                      TAG: /* Int */4,
-                                      _0: /* Int_i */3,
-                                      _1: /* No_padding */0,
-                                      _2: /* No_precision */0,
-                                      _3: {
-                                        TAG: /* Char_literal */12,
-                                        _0: /* ' ' */32,
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Scan_char_set */20,
+              _0: undefined,
+              _1: "\0\0\0\0\0\0\0\0\0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+              _2: /* End_of_format */0
+            },
+            _1: "%[]]"
+          }), (function (param) {
+          if (param === "]") {
+            return accu;
+          } else {
+            return Curry._1(Stdlib__Scanf.bscanf(ib, {
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Char_literal */12,
+                        _0: /* ' ' */32,
+                        _1: {
+                          TAG: /* Int */4,
+                          _0: /* Int_i */3,
+                          _1: /* No_padding */0,
+                          _2: /* No_precision */0,
+                          _3: {
+                            TAG: /* Char_literal */12,
+                            _0: /* ' ' */32,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      },
+                      _1: " %i "
+                    }), (function (i) {
+                    let accu$1 = {
+                      hd: i,
+                      tl: accu
+                    };
+                    return Curry._1(Stdlib__Scanf.bscanf(ib, {
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* Scan_char_set */20,
+                                _0: 1,
+                                _1: "\0\0\0\0\0\0\0\b\0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                                _2: /* End_of_format */0
+                              },
+                              _1: "%1[];]"
+                            }), (function (param) {
+                            switch (param) {
+                              case ";" :
+                                  return scan_rest(ib, accu$1);
+                              case "]" :
+                                  return accu$1;
+                              default:
+                                const s = Stdlib__Printf.sprintf({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* String_literal */11,
+                                        _0: "scan_int_list",
                                         _1: /* End_of_format */0
-                                      }
-                                    }
-                                  },
-                                  _1: " %i "
-                                }), (function (i) {
-                                let accu$1 = {
-                                  hd: i,
-                                  tl: accu
-                                };
-                                return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                                TAG: /* Format */0,
-                                                _0: {
-                                                  TAG: /* Scan_char_set */20,
-                                                  _0: 1,
-                                                  _1: "\0\0\0\0\0\0\0\b\0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                                                  _2: /* End_of_format */0
-                                                },
-                                                _1: "%1[];]"
-                                              }), (function (param) {
-                                              switch (param) {
-                                                case ";" :
-                                                    return scan_rest(ib, accu$1);
-                                                case "]" :
-                                                    return accu$1;
-                                                default:
-                                                  const s = Stdlib__Printf.sprintf({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "scan_int_list",
-                                                          _1: /* End_of_format */0
-                                                        },
-                                                        _1: "scan_int_list"
-                                                      });
-                                                  throw new Caml_js_exceptions.MelangeError("Failure", {
-                                                            MEL_EXN_ID: "Failure",
-                                                            _1: s
-                                                          });
-                                              }
-                                            }));
-                              }));
-                }
-              }));
+                                      },
+                                      _1: "scan_int_list"
+                                    });
+                                throw new Caml_js_exceptions.MelangeError("Failure", {
+                                      MEL_EXN_ID: "Failure",
+                                      _1: s
+                                    });
+                            }
+                          }));
+                  }));
+          }
+        }));
 }
 
 function scan_int_list(ib) {
diff --git a/jscomp/test/dist/jscomp/test/set_gen.js b/jscomp/test/dist/jscomp/test/set_gen.js
index d17dbaeb9..441e97938 100644
--- a/jscomp/test/dist/jscomp/test/set_gen.js
+++ b/jscomp/test/dist/jscomp/test/set_gen.js
@@ -39,8 +39,8 @@ function min_elt(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param._0;
     if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -56,8 +56,8 @@ function max_elt(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     let tmp = param._2;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
@@ -208,14 +208,14 @@ function check_height_and_diff(param) {
   const hr = check_height_and_diff(param._2);
   if (h !== (max_int_2(hl, hr) + 1 | 0)) {
     throw new Caml_js_exceptions.MelangeError(Height_invariant_broken, {
-              MEL_EXN_ID: Height_invariant_broken
-            });
+          MEL_EXN_ID: Height_invariant_broken
+        });
   }
   const diff = Stdlib.abs(hl - hr | 0);
   if (diff > 2) {
     throw new Caml_js_exceptions.MelangeError(Height_diff_borken, {
-              MEL_EXN_ID: Height_diff_borken
-            });
+          MEL_EXN_ID: Height_diff_borken
+        });
   }
   return h;
 }
@@ -230,12 +230,12 @@ function create(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r._3;
   return {
-          TAG: /* Node */0,
-          _0: l,
-          _1: v,
-          _2: r,
-          _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    _0: l,
+    _1: v,
+    _2: r,
+    _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function internal_bal(l, v, r) {
@@ -246,13 +246,13 @@ function internal_bal(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/set_gen.ml",
-                  225,
-                  15
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/set_gen.ml",
+              225,
+              15
+            ]
+          });
     }
     const lr = l._2;
     const lv = l._1;
@@ -264,32 +264,32 @@ function internal_bal(l, v, r) {
       return create(create(ll, lv, lr._0), lr._1, create(lr._2, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/set_gen.ml",
-                235,
-                19
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/set_gen.ml",
+            235,
+            19
+          ]
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            _0: l,
-            _1: v,
-            _2: r,
-            _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      _0: l,
+      _1: v,
+      _2: r,
+      _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/set_gen.ml",
-                245,
-                15
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/set_gen.ml",
+            245,
+            15
+          ]
+        });
   }
   const rr = r._2;
   const rv = r._1;
@@ -301,21 +301,21 @@ function internal_bal(l, v, r) {
     return create(create(l, v, rl._0), rl._1, create(rl._2, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/set_gen.ml",
-              251,
-              19
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/set_gen.ml",
+          251,
+          19
+        ]
+      });
 }
 
 function remove_min_elt(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.remove_min_elt"
+        });
   }
   const l = param._0;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -327,12 +327,12 @@ function remove_min_elt(param) {
 
 function singleton(x) {
   return {
-          TAG: /* Node */0,
-          _0: /* Empty */0,
-          _1: x,
-          _2: /* Empty */0,
-          _3: 1
-        };
+    TAG: /* Node */0,
+    _0: /* Empty */0,
+    _1: x,
+    _2: /* Empty */0,
+    _3: 1
+  };
 }
 
 function internal_merge(l, r) {
@@ -407,9 +407,9 @@ function filter(p, param) {
 function partition(p, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      /* Empty */0
+    ];
   }
   const v = param._1;
   const match = partition(p, param._0);
@@ -421,14 +421,14 @@ function partition(p, param) {
   const 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)
+    ];
   }
 }
 
@@ -437,21 +437,21 @@ function of_sorted_list(l) {
     switch (n) {
       case 0 :
           return [
-                  /* Empty */0,
-                  l
-                ];
+            /* Empty */0,
+            l
+          ];
       case 1 :
           if (l) {
             return [
-                    {
-                      TAG: /* Node */0,
-                      _0: /* Empty */0,
-                      _1: l.hd,
-                      _2: /* Empty */0,
-                      _3: 1
-                    },
-                    l.tl
-                  ];
+              {
+                TAG: /* Node */0,
+                _0: /* Empty */0,
+                _1: l.hd,
+                _2: /* Empty */0,
+                _3: 1
+              },
+              l.tl
+            ];
           }
           break;
       case 2 :
@@ -459,21 +459,21 @@ function of_sorted_list(l) {
             const match = l.tl;
             if (match) {
               return [
-                      {
-                        TAG: /* Node */0,
-                        _0: {
-                          TAG: /* Node */0,
-                          _0: /* Empty */0,
-                          _1: l.hd,
-                          _2: /* Empty */0,
-                          _3: 1
-                        },
-                        _1: match.hd,
-                        _2: /* Empty */0,
-                        _3: 2
-                      },
-                      match.tl
-                    ];
+                {
+                  TAG: /* Node */0,
+                  _0: {
+                    TAG: /* Node */0,
+                    _0: /* Empty */0,
+                    _1: l.hd,
+                    _2: /* Empty */0,
+                    _3: 1
+                  },
+                  _1: match.hd,
+                  _2: /* Empty */0,
+                  _3: 2
+                },
+                match.tl
+              ];
             }
             
           }
@@ -485,27 +485,27 @@ function of_sorted_list(l) {
               const match$2 = match$1.tl;
               if (match$2) {
                 return [
-                        {
-                          TAG: /* Node */0,
-                          _0: {
-                            TAG: /* Node */0,
-                            _0: /* Empty */0,
-                            _1: l.hd,
-                            _2: /* Empty */0,
-                            _3: 1
-                          },
-                          _1: match$1.hd,
-                          _2: {
-                            TAG: /* Node */0,
-                            _0: /* Empty */0,
-                            _1: match$2.hd,
-                            _2: /* Empty */0,
-                            _3: 1
-                          },
-                          _3: 2
-                        },
-                        match$2.tl
-                      ];
+                  {
+                    TAG: /* Node */0,
+                    _0: {
+                      TAG: /* Node */0,
+                      _0: /* Empty */0,
+                      _1: l.hd,
+                      _2: /* Empty */0,
+                      _3: 1
+                    },
+                    _1: match$1.hd,
+                    _2: {
+                      TAG: /* Node */0,
+                      _0: /* Empty */0,
+                      _1: match$2.hd,
+                      _2: /* Empty */0,
+                      _3: 1
+                    },
+                    _3: 2
+                  },
+                  match$2.tl
+                ];
               }
               
             }
@@ -521,18 +521,18 @@ function of_sorted_list(l) {
     if (l$1) {
       const 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 new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/set_gen.ml",
-                361,
-                14
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/set_gen.ml",
+            361,
+            14
+          ]
+        });
   };
   return sub(Stdlib__List.length(l), l)[0];
 }
@@ -545,53 +545,53 @@ function of_sorted_array(l) {
     if (n === 1) {
       const x0 = l[start];
       return {
-              TAG: /* Node */0,
-              _0: /* Empty */0,
-              _1: x0,
-              _2: /* Empty */0,
-              _3: 1
-            };
+        TAG: /* Node */0,
+        _0: /* Empty */0,
+        _1: x0,
+        _2: /* Empty */0,
+        _3: 1
+      };
     }
     if (n === 2) {
       const x0$1 = l[start];
       const x1 = l[start + 1 | 0];
       return {
-              TAG: /* Node */0,
-              _0: {
-                TAG: /* Node */0,
-                _0: /* Empty */0,
-                _1: x0$1,
-                _2: /* Empty */0,
-                _3: 1
-              },
-              _1: x1,
-              _2: /* Empty */0,
-              _3: 2
-            };
+        TAG: /* Node */0,
+        _0: {
+          TAG: /* Node */0,
+          _0: /* Empty */0,
+          _1: x0$1,
+          _2: /* Empty */0,
+          _3: 1
+        },
+        _1: x1,
+        _2: /* Empty */0,
+        _3: 2
+      };
     }
     if (n === 3) {
       const x0$2 = l[start];
       const x1$1 = l[start + 1 | 0];
       const x2 = l[start + 2 | 0];
       return {
-              TAG: /* Node */0,
-              _0: {
-                TAG: /* Node */0,
-                _0: /* Empty */0,
-                _1: x0$2,
-                _2: /* Empty */0,
-                _3: 1
-              },
-              _1: x1$1,
-              _2: {
-                TAG: /* Node */0,
-                _0: /* Empty */0,
-                _1: x2,
-                _2: /* Empty */0,
-                _3: 1
-              },
-              _3: 2
-            };
+        TAG: /* Node */0,
+        _0: {
+          TAG: /* Node */0,
+          _0: /* Empty */0,
+          _1: x0$2,
+          _2: /* Empty */0,
+          _3: 1
+        },
+        _1: x1$1,
+        _2: {
+          TAG: /* Node */0,
+          _0: /* Empty */0,
+          _1: x2,
+          _2: /* Empty */0,
+          _3: 1
+        },
+        _3: 2
+      };
     }
     const nl = n / 2 | 0;
     const left = sub(start, nl, l);
@@ -619,12 +619,12 @@ function is_ordered(cmp, tree) {
       if (typeof match$1 === "string") {
         if (match$1 === "Empty") {
           return {
-                  NAME: "V",
-                  VAL: [
-                    v,
-                    v
-                  ]
-                };
+            NAME: "V",
+            VAL: [
+              v,
+              v
+            ]
+          };
         } else {
           return "No";
         }
@@ -632,12 +632,12 @@ function is_ordered(cmp, tree) {
       const match$2 = match$1.VAL;
       if (Curry._2(cmp, v, match$2[0]) < 0) {
         return {
-                NAME: "V",
-                VAL: [
-                  v,
-                  match$2[1]
-                ]
-              };
+          NAME: "V",
+          VAL: [
+            v,
+            match$2[1]
+          ]
+        };
       } else {
         return "No";
       }
@@ -649,12 +649,12 @@ function is_ordered(cmp, tree) {
     if (typeof match$4 === "string") {
       if (match$4 === "Empty" && Curry._2(cmp, max_v, v) < 0) {
         return {
-                NAME: "V",
-                VAL: [
-                  min_v,
-                  v
-                ]
-              };
+          NAME: "V",
+          VAL: [
+            min_v,
+            v
+          ]
+        };
       } else {
         return "No";
       }
@@ -662,12 +662,12 @@ function is_ordered(cmp, tree) {
     const match$5 = match$4.VAL;
     if (Curry._2(cmp, max_v, match$5[0]) < 0) {
       return {
-              NAME: "V",
-              VAL: [
-                min_v,
-                match$5[1]
-              ]
-            };
+        NAME: "V",
+        VAL: [
+          min_v,
+          match$5[1]
+        ]
+      };
     } else {
       return "No";
     }
diff --git a/jscomp/test/dist/jscomp/test/sexp.js b/jscomp/test/dist/jscomp/test/sexp.js
index cf40e0081..c62aedd5f 100644
--- a/jscomp/test/dist/jscomp/test/sexp.js
+++ b/jscomp/test/dist/jscomp/test/sexp.js
@@ -18,130 +18,130 @@ const hash = Stdlib__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: Stdlib.string_of_float(x)
-        };
+    NAME: "Atom",
+    VAL: Stdlib.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: Stdlib__List.rev(l)
-        };
+    NAME: "List",
+    VAL: Stdlib__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: Stdlib__List.map((function (param) {
-                  return of_field(param[0], param[1]);
-                }), l)
-        };
+    NAME: "List",
+    VAL: Stdlib__List.map((function (param) {
+            return of_field(param[0], param[1]);
+          }), l)
+  };
 }
 
 function $$return(x) {
@@ -257,8 +257,8 @@ function to_float(e) {
 
 function to_string(e) {
   return _try_atom(e, (function (x) {
-                return x;
-              }));
+          return x;
+        }));
 }
 
 function to_pair(e) {
@@ -275,25 +275,25 @@ function to_pair(e) {
   const 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) {
-                const 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
-                                                  ];
-                                          }));
-                            }));
-              }));
+          const 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) {
@@ -314,30 +314,30 @@ function to_triple(e) {
   const 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) {
-                const z = param[2];
-                const 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
-                                                                ];
-                                                        }));
-                                          }));
-                            }));
-              }));
+          const z = param[2];
+          const 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) {
@@ -488,9 +488,9 @@ function get_exn(e) {
     return Caml_option.valFromOption(e);
   }
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: "CCSexp.Traverse.get_exn"
-          });
+        MEL_EXN_ID: "Failure",
+        _1: "CCSexp.Traverse.get_exn"
+      });
 }
 
 const of_unit = {
diff --git a/jscomp/test/dist/jscomp/test/sexpm.js b/jscomp/test/dist/jscomp/test/sexpm.js
index d0ef677ca..8f7676b77 100644
--- a/jscomp/test/dist/jscomp/test/sexpm.js
+++ b/jscomp/test/dist/jscomp/test/sexpm.js
@@ -29,9 +29,9 @@ function _with_in(filename, f) {
     const e = Caml_js_exceptions.internalToOCamlException(raw_e);
     Caml_external_polyfill.resolve("caml_ml_close_channel")(ic);
     return {
-            NAME: "Error",
-            VAL: Stdlib__Printexc.to_string(e)
-          };
+      NAME: "Error",
+      VAL: Stdlib__Printexc.to_string(e)
+    };
   }
 }
 
@@ -46,13 +46,13 @@ function _must_escape(s) {
             exit = 1;
           } else {
             throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                      MEL_EXN_ID: Stdlib.Exit
-                    });
+                  MEL_EXN_ID: Stdlib.Exit
+                });
           }
         } else {
           throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                    MEL_EXN_ID: Stdlib.Exit
-                  });
+                MEL_EXN_ID: Stdlib.Exit
+              });
         }
       } else if (c >= 11) {
         if (c >= 32) {
@@ -70,8 +70,8 @@ function _must_escape(s) {
             case 40 :
             case 41 :
                 throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                          MEL_EXN_ID: Stdlib.Exit
-                        });
+                      MEL_EXN_ID: Stdlib.Exit
+                    });
             
           }
         } else {
@@ -80,15 +80,15 @@ function _must_escape(s) {
       } else {
         if (c >= 9) {
           throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                    MEL_EXN_ID: Stdlib.Exit
-                  });
+                MEL_EXN_ID: Stdlib.Exit
+              });
         }
         exit = 1;
       }
       if (exit === 1 && c > 127) {
         throw new Caml_js_exceptions.MelangeError(Stdlib.Exit, {
-                  MEL_EXN_ID: Stdlib.Exit
-                });
+              MEL_EXN_ID: Stdlib.Exit
+            });
       }
       
     }
@@ -118,21 +118,21 @@ function to_buf(b, t) {
         return Stdlib__Buffer.add_char(b, /* ')' */41);
       } else {
         return Curry._2(Stdlib__Printf.bprintf(b, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '(' */40,
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: {
-                              TAG: /* Char_literal */12,
-                              _0: /* ')' */41,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "(%a)"
-                      }), to_buf, l.hd);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '(' */40,
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: {
+                        TAG: /* Char_literal */12,
+                        _0: /* ')' */41,
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "(%a)"
+                }), to_buf, l.hd);
       }
     } else {
       return Stdlib__Buffer.add_string(b, "()");
@@ -141,22 +141,22 @@ function to_buf(b, t) {
   const s = t.VAL;
   if (_must_escape(s)) {
     return Curry._1(Stdlib__Printf.bprintf(b, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Char_literal */12,
-                      _0: /* '"' */34,
-                      _1: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '"' */34,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "\"%s\""
-                  }), Stdlib__String.escaped(s));
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char_literal */12,
+                _0: /* '"' */34,
+                _1: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '"' */34,
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "\"%s\""
+            }), Stdlib__String.escaped(s));
   } else {
     return Stdlib__Buffer.add_string(b, s);
   }
@@ -217,54 +217,54 @@ function print(fmt, t) {
                 print(fmt, t$p);
               }), l);
         return Stdlib__Format.fprintf(fmt)({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Char_literal */12,
-                      _0: /* ')' */41,
-                      _1: {
-                        TAG: /* Formatting_lit */17,
-                        _0: /* Close_box */0,
-                        _1: /* End_of_format */0
-                      }
-                    },
-                    _1: ")@]"
-                  });
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char_literal */12,
+                _0: /* ')' */41,
+                _1: {
+                  TAG: /* Formatting_lit */17,
+                  _0: /* Close_box */0,
+                  _1: /* End_of_format */0
+                }
+              },
+              _1: ")@]"
+            });
       } else {
         return Curry._2(Stdlib__Format.fprintf(fmt)({
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Formatting_gen */18,
+                    _0: {
+                      TAG: /* Open_box */1,
+                      _0: {
                         TAG: /* Format */0,
                         _0: {
-                          TAG: /* Formatting_gen */18,
-                          _0: {
-                            TAG: /* Open_box */1,
-                            _0: {
-                              TAG: /* Format */0,
-                              _0: {
-                                TAG: /* String_literal */11,
-                                _0: "<hov2>",
-                                _1: /* End_of_format */0
-                              },
-                              _1: "<hov2>"
-                            }
-                          },
+                          TAG: /* String_literal */11,
+                          _0: "<hov2>",
+                          _1: /* End_of_format */0
+                        },
+                        _1: "<hov2>"
+                      }
+                    },
+                    _1: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '(' */40,
+                      _1: {
+                        TAG: /* Alpha */15,
+                        _0: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ')' */41,
                           _1: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '(' */40,
-                            _1: {
-                              TAG: /* Alpha */15,
-                              _0: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ')' */41,
-                                _1: {
-                                  TAG: /* Formatting_lit */17,
-                                  _0: /* Close_box */0,
-                                  _1: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Formatting_lit */17,
+                            _0: /* Close_box */0,
+                            _1: /* End_of_format */0
                           }
-                        },
-                        _1: "@[<hov2>(%a)@]"
-                      }), print, l.hd);
+                        }
+                      }
+                    }
+                  },
+                  _1: "@[<hov2>(%a)@]"
+                }), print, l.hd);
       }
     } else {
       return Stdlib__Format.pp_print_string(fmt, "()");
@@ -273,22 +273,22 @@ function print(fmt, t) {
   const s = t.VAL;
   if (_must_escape(s)) {
     return Curry._1(Stdlib__Format.fprintf(fmt)({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Char_literal */12,
-                      _0: /* '"' */34,
-                      _1: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '"' */34,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "\"%s\""
-                  }), Stdlib__String.escaped(s));
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char_literal */12,
+                _0: /* '"' */34,
+                _1: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '"' */34,
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "\"%s\""
+            }), Stdlib__String.escaped(s));
   } else {
     return Stdlib__Format.pp_print_string(fmt, s);
   }
@@ -309,21 +309,21 @@ function print_noindent(fmt, t) {
         return Stdlib__Format.pp_print_char(fmt, /* ')' */41);
       } else {
         return Curry._2(Stdlib__Format.fprintf(fmt)({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '(' */40,
-                          _1: {
-                            TAG: /* Alpha */15,
-                            _0: {
-                              TAG: /* Char_literal */12,
-                              _0: /* ')' */41,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "(%a)"
-                      }), print_noindent, l.hd);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '(' */40,
+                    _1: {
+                      TAG: /* Alpha */15,
+                      _0: {
+                        TAG: /* Char_literal */12,
+                        _0: /* ')' */41,
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "(%a)"
+                }), print_noindent, l.hd);
       }
     } else {
       return Stdlib__Format.pp_print_string(fmt, "()");
@@ -332,22 +332,22 @@ function print_noindent(fmt, t) {
   const s = t.VAL;
   if (_must_escape(s)) {
     return Curry._1(Stdlib__Format.fprintf(fmt)({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Char_literal */12,
-                      _0: /* '"' */34,
-                      _1: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '"' */34,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "\"%s\""
-                  }), Stdlib__String.escaped(s));
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char_literal */12,
+                _0: /* '"' */34,
+                _1: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '"' */34,
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "\"%s\""
+            }), Stdlib__String.escaped(s));
   } else {
     return Stdlib__Format.pp_print_string(fmt, s);
   }
@@ -362,9 +362,9 @@ function to_chan(oc, t) {
 function to_file_seq(filename, seq) {
   const f = function (oc) {
     return Curry._1(seq, (function (t) {
-                  to_chan(oc, t);
-                  Caml_io.caml_ml_output_char(oc, /* '\n' */10);
-                }));
+            to_chan(oc, t);
+            Caml_io.caml_ml_output_char(oc, /* '\n' */10);
+          }));
   };
   const oc = Stdlib.open_out(filename);
   try {
@@ -403,14 +403,14 @@ function make(bufsizeOpt, refill) {
   const bufsize = bufsizeOpt !== undefined ? bufsizeOpt : 1024;
   const bufsize$1 = Caml.caml_int_min(bufsize > 16 ? bufsize : 16, Stdlib__Sys.max_string_length);
   return {
-          buf: Caml_bytes.caml_create_bytes(bufsize$1),
-          refill: refill,
-          atom: Stdlib__Buffer.create(32),
-          i: 0,
-          len: 0,
-          line: 1,
-          col: 1
-        };
+    buf: Caml_bytes.caml_create_bytes(bufsize$1),
+    refill: refill,
+    atom: Stdlib__Buffer.create(32),
+    i: 0,
+    len: 0,
+    line: 1,
+    col: 1
+  };
 }
 
 function _is_digit(c) {
@@ -435,13 +435,13 @@ function _refill(t, k_succ, k_fail) {
 function _get(t) {
   if (t.i >= t.len) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/sexpm.ml",
-                152,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/sexpm.ml",
+            152,
+            4
+          ]
+        });
   }
   const c = Caml_bytes.get(t.buf, t.i);
   t.i = t.i + 1 | 0;
@@ -486,32 +486,32 @@ function _error(t, msg) {
             _1: "at %d, %d: "
           }), t.line, t.col);
   return Stdlib__Printf.kbprintf((function (b) {
-                const msg$p = Stdlib__Buffer.contents(b);
-                return {
-                        NAME: "Error",
-                        VAL: msg$p
-                      };
-              }), b, msg);
+          const msg$p = Stdlib__Buffer.contents(b);
+          return {
+            NAME: "Error",
+            VAL: msg$p
+          };
+        }), b, msg);
 }
 
 function _error_eof(t) {
   return _error(t, {
-              TAG: /* Format */0,
-              _0: {
-                TAG: /* String_literal */11,
-                _0: "unexpected end of input",
-                _1: /* End_of_format */0
-              },
-              _1: "unexpected end of input"
-            });
+        TAG: /* Format */0,
+        _0: {
+          TAG: /* String_literal */11,
+          _0: "unexpected end of input",
+          _1: /* End_of_format */0
+        },
+        _1: "unexpected end of input"
+      });
 }
 
 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);
     }
     const c = _get(t);
     if (c >= 11) {
@@ -531,19 +531,19 @@ 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, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* String_literal */11,
-                    _0: "unexpected '\\'",
-                    _1: /* End_of_format */0
-                  },
-                  _1: "unexpected '\\'"
-                });
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* String_literal */11,
+              _0: "unexpected '\\'",
+              _1: /* End_of_format */0
+            },
+            _1: "unexpected '\\'"
+          });
     }
     
   } else if (c >= 11) {
@@ -551,13 +551,13 @@ function expr_starting_with(c, k, t) {
       switch (c) {
         case 32 :
             throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                      MEL_EXN_ID: "Assert_failure",
-                      _1: [
-                        "jscomp/test/sexpm.ml",
-                        183,
-                        27
-                      ]
-                    });
+                  MEL_EXN_ID: "Assert_failure",
+                  _1: [
+                    "jscomp/test/sexpm.ml",
+                    183,
+                    27
+                  ]
+                });
         case 34 :
             return quoted(k, t);
         case 33 :
@@ -571,27 +571,27 @@ function expr_starting_with(c, k, t) {
             return expr_list(/* [] */0, k, t);
         case 41 :
             return _error(t, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "unexpected ')'",
-                          _1: /* End_of_format */0
-                        },
-                        _1: "unexpected ')'"
-                      });
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "unexpected ')'",
+                    _1: /* End_of_format */0
+                  },
+                  _1: "unexpected ')'"
+                });
         
       }
     }
     
   } else if (c >= 9) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/sexpm.ml",
-                183,
-                27
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/sexpm.ml",
+            183,
+            27
+          ]
+        });
   }
   Stdlib__Buffer.add_char(t.atom, c);
   return atom(k, t);
@@ -601,53 +601,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);
     }
     const c = _get(t);
     if (c > 32 || c < 9) {
       if (c === 41) {
         return Curry._2(k, undefined, {
-                    NAME: "List",
-                    VAL: Stdlib__List.rev(acc)
-                  });
+              NAME: "List",
+              VAL: Stdlib__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: Stdlib__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: Stdlib__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);
   };
 }
 
@@ -655,19 +655,19 @@ function _return_atom(last, k, t) {
   const s = Stdlib__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);
+            }));
     }
     const c = _get(t);
     let exit = 0;
@@ -675,14 +675,14 @@ function atom(k, t) {
       if (c >= 42) {
         if (c === 92) {
           return _error(t, {
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "unexpected '\\' in non-quoted string",
-                        _1: /* End_of_format */0
-                      },
-                      _1: "unexpected '\\' in non-quoted string"
-                    });
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "unexpected '\\' in non-quoted string",
+                  _1: /* End_of_format */0
+                },
+                _1: "unexpected '\\' in non-quoted string"
+              });
         }
         exit = 1;
       } else {
@@ -699,14 +699,14 @@ function atom(k, t) {
               break;
           case 34 :
               return _error(t, {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "unexpected '\"' in the middle of an atom",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "unexpected '\"' in the middle of an atom"
-                        });
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "unexpected '\"' in the middle of an atom",
+                      _1: /* End_of_format */0
+                    },
+                    _1: "unexpected '\"' in the middle of an atom"
+                  });
           
         }
       } else {
@@ -730,8 +730,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);
     }
     const c = _get(t);
     if (c === 34) {
@@ -739,9 +739,9 @@ function quoted(k, t) {
     }
     if (c === 92) {
       return escaped((function (c) {
-                    Stdlib__Buffer.add_char(t.atom, c);
-                    return quoted(k, t);
-                  }), t);
+              Stdlib__Buffer.add_char(t.atom, c);
+              return quoted(k, t);
+            }), t);
     }
     Stdlib__Buffer.add_char(t.atom, c);
     continue ;
@@ -751,8 +751,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);
   }
   const c = _get(t);
   if (c >= 92) {
@@ -798,83 +798,83 @@ function escaped(k, t) {
   }
   if (_is_digit(c)) {
     return read2int(c - /* '0' */48 | 0, (function (n) {
-                  return Curry._1(k, Stdlib__Char.chr(n));
-                }), t);
+            return Curry._1(k, Stdlib__Char.chr(n));
+          }), t);
   } else {
     return Curry._1(_error(t, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "unexpected escaped char '",
-                      _1: {
-                        TAG: /* Char */0,
-                        _0: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '\'' */39,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "unexpected escaped char '%c'"
-                  }), c);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "unexpected escaped char '",
+                _1: {
+                  TAG: /* Char */0,
+                  _0: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '\'' */39,
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "unexpected escaped char '%c'"
+            }), c);
   }
 }
 
 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);
   }
   const c = _get(t);
   if (_is_digit(c)) {
     return read1int(Math.imul(10, i) + (c - /* '0' */48 | 0) | 0, k, t);
   } else {
     return Curry._1(_error(t, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "unexpected char '",
-                      _1: {
-                        TAG: /* Char */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "' when reading byte",
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "unexpected char '%c' when reading byte"
-                  }), c);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "unexpected char '",
+                _1: {
+                  TAG: /* Char */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "' when reading byte",
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "unexpected char '%c' when reading byte"
+            }), c);
   }
 }
 
 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);
   }
   const c = _get(t);
   if (_is_digit(c)) {
     return Curry._1(k, Math.imul(10, i) + (c - /* '0' */48 | 0) | 0);
   } else {
     return Curry._1(_error(t, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "unexpected char '",
-                      _1: {
-                        TAG: /* Char */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "' when reading byte",
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "unexpected char '%c' when reading byte"
-                  }), c);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "unexpected char '",
+                _1: {
+                  TAG: /* Char */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "' when reading byte",
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "unexpected char '%c' when reading byte"
+            }), c);
   }
 }
 
@@ -882,8 +882,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);
     }
     const match = _get(t);
     if (match === 10) {
@@ -897,10 +897,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";
+            }));
     }
     const c = _get(t);
     if (c >= 11) {
@@ -918,11 +918,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) {
@@ -943,9 +943,9 @@ function parse_string(s) {
   const res = next(d);
   if (typeof res === "string") {
     return {
-            NAME: "Error",
-            VAL: "unexpected end of file"
-          };
+      NAME: "Error",
+      VAL: "unexpected end of file"
+    };
   } else {
     return res;
   }
@@ -958,9 +958,9 @@ function parse_chan(bufsize, ic) {
   const res = next(d);
   if (typeof res === "string") {
     return {
-            NAME: "Error",
-            VAL: "unexpected end of file"
-          };
+      NAME: "Error",
+      VAL: "unexpected end of file"
+    };
   } else {
     return res;
   }
@@ -990,9 +990,9 @@ function parse_chan_list(bufsize, ic) {
     const e = next(d);
     if (typeof e === "string") {
       return {
-              NAME: "Ok",
-              VAL: Stdlib__List.rev(acc)
-            };
+        NAME: "Ok",
+        VAL: Stdlib__List.rev(acc)
+      };
     }
     if (e.NAME === "Error") {
       return e;
@@ -1007,14 +1007,14 @@ function parse_chan_list(bufsize, ic) {
 
 function parse_file(filename) {
   return _with_in(filename, (function (ic) {
-                return parse_chan(undefined, ic);
-              }));
+          return parse_chan(undefined, ic);
+        }));
 }
 
 function parse_file_list(filename) {
   return _with_in(filename, (function (ic) {
-                return parse_chan_list(undefined, ic);
-              }));
+          return parse_chan_list(undefined, ic);
+        }));
 }
 
 function MakeDecode(funarg) {
@@ -1023,14 +1023,14 @@ function MakeDecode(funarg) {
     const bufsize = bufsizeOpt !== undefined ? bufsizeOpt : 1024;
     const bufsize$1 = Caml.caml_int_min(bufsize > 16 ? bufsize : 16, Stdlib__Sys.max_string_length);
     return {
-            buf: Caml_bytes.caml_create_bytes(bufsize$1),
-            refill: refill,
-            atom: Stdlib__Buffer.create(32),
-            i: 0,
-            len: 0,
-            line: 1,
-            col: 1
-          };
+      buf: Caml_bytes.caml_create_bytes(bufsize$1),
+      refill: refill,
+      atom: Stdlib__Buffer.create(32),
+      i: 0,
+      len: 0,
+      line: 1,
+      col: 1
+    };
   };
   const _is_digit = function (c) {
     if (/* '0' */48 <= c) {
@@ -1041,25 +1041,25 @@ function MakeDecode(funarg) {
   };
   const _refill = function (t, k_succ, k_fail) {
     return Curry._2($great$great$eq, Curry._3(t.refill, t.buf, 0, t.buf.length), (function (n) {
-                  t.i = 0;
-                  t.len = n;
-                  if (n === 0) {
-                    return Curry._1(k_fail, t);
-                  } else {
-                    return Curry._1(k_succ, t);
-                  }
-                }));
+            t.i = 0;
+            t.len = n;
+            if (n === 0) {
+              return Curry._1(k_fail, t);
+            } else {
+              return Curry._1(k_succ, t);
+            }
+          }));
   };
   const _get = function (t) {
     if (t.i >= t.len) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/sexpm.ml",
-                  152,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/sexpm.ml",
+              152,
+              4
+            ]
+          });
     }
     const c = Caml_bytes.get(t.buf, t.i);
     t.i = t.i + 1 | 0;
@@ -1103,30 +1103,30 @@ function MakeDecode(funarg) {
               _1: "at %d, %d: "
             }), t.line, t.col);
     return Stdlib__Printf.kbprintf((function (b) {
-                  const msg$p = Stdlib__Buffer.contents(b);
-                  return Curry._1(funarg.$$return, {
-                              NAME: "Error",
-                              VAL: msg$p
-                            });
-                }), b, msg);
+            const msg$p = Stdlib__Buffer.contents(b);
+            return Curry._1(funarg.$$return, {
+                  NAME: "Error",
+                  VAL: msg$p
+                });
+          }), b, msg);
   };
   const _error_eof = function (t) {
     return _error(t, {
-                TAG: /* Format */0,
-                _0: {
-                  TAG: /* String_literal */11,
-                  _0: "unexpected end of input",
-                  _1: /* End_of_format */0
-                },
-                _1: "unexpected end of input"
-              });
+          TAG: /* Format */0,
+          _0: {
+            TAG: /* String_literal */11,
+            _0: "unexpected end of input",
+            _1: /* End_of_format */0
+          },
+          _1: "unexpected end of input"
+        });
   };
   const expr = function (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);
       }
       const c = _get(t);
       if (c >= 11) {
@@ -1145,19 +1145,19 @@ function MakeDecode(funarg) {
     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, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "unexpected '\\'",
-                      _1: /* End_of_format */0
-                    },
-                    _1: "unexpected '\\'"
-                  });
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "unexpected '\\'",
+                _1: /* End_of_format */0
+              },
+              _1: "unexpected '\\'"
+            });
       }
       
     } else if (c >= 11) {
@@ -1165,13 +1165,13 @@ function MakeDecode(funarg) {
         switch (c) {
           case 32 :
               throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                        MEL_EXN_ID: "Assert_failure",
-                        _1: [
-                          "jscomp/test/sexpm.ml",
-                          183,
-                          27
-                        ]
-                      });
+                    MEL_EXN_ID: "Assert_failure",
+                    _1: [
+                      "jscomp/test/sexpm.ml",
+                      183,
+                      27
+                    ]
+                  });
           case 34 :
               return quoted(k, t);
           case 33 :
@@ -1185,27 +1185,27 @@ function MakeDecode(funarg) {
               return expr_list(/* [] */0, k, t);
           case 41 :
               return _error(t, {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "unexpected ')'",
-                            _1: /* End_of_format */0
-                          },
-                          _1: "unexpected ')'"
-                        });
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "unexpected ')'",
+                      _1: /* End_of_format */0
+                    },
+                    _1: "unexpected ')'"
+                  });
           
         }
       }
       
     } else if (c >= 9) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/sexpm.ml",
-                  183,
-                  27
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/sexpm.ml",
+              183,
+              27
+            ]
+          });
     }
     Stdlib__Buffer.add_char(t.atom, c);
     return atom(k, t);
@@ -1214,71 +1214,71 @@ function MakeDecode(funarg) {
     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);
       }
       const c = _get(t);
       if (c > 32 || c < 9) {
         if (c === 41) {
           return Curry._2(k, undefined, {
-                      NAME: "List",
-                      VAL: Stdlib__List.rev(acc)
-                    });
+                NAME: "List",
+                VAL: Stdlib__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: Stdlib__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: Stdlib__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);
     };
   };
   const _return_atom = function (last, k, t) {
     const s = Stdlib__Buffer.contents(t.atom);
     t.atom.position = 0;
     return Curry._2(k, last, {
-                NAME: "Atom",
-                VAL: s
-              });
+          NAME: "Atom",
+          VAL: s
+        });
   };
   const atom = function (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);
+              }));
       }
       const c = _get(t);
       let exit = 0;
@@ -1286,14 +1286,14 @@ function MakeDecode(funarg) {
         if (c >= 42) {
           if (c === 92) {
             return _error(t, {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "unexpected '\\' in non-quoted string",
-                          _1: /* End_of_format */0
-                        },
-                        _1: "unexpected '\\' in non-quoted string"
-                      });
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "unexpected '\\' in non-quoted string",
+                    _1: /* End_of_format */0
+                  },
+                  _1: "unexpected '\\' in non-quoted string"
+                });
           }
           exit = 1;
         } else {
@@ -1310,14 +1310,14 @@ function MakeDecode(funarg) {
                 break;
             case 34 :
                 return _error(t, {
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* String_literal */11,
-                              _0: "unexpected '\"' in the middle of an atom",
-                              _1: /* End_of_format */0
-                            },
-                            _1: "unexpected '\"' in the middle of an atom"
-                          });
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* String_literal */11,
+                        _0: "unexpected '\"' in the middle of an atom",
+                        _1: /* End_of_format */0
+                      },
+                      _1: "unexpected '\"' in the middle of an atom"
+                    });
             
           }
         } else {
@@ -1340,8 +1340,8 @@ function MakeDecode(funarg) {
     while(true) {
       if (t.i === t.len) {
         return _refill(t, (function (param) {
-                      return quoted(k, param);
-                    }), _error_eof);
+                return quoted(k, param);
+              }), _error_eof);
       }
       const c = _get(t);
       if (c === 34) {
@@ -1349,9 +1349,9 @@ function MakeDecode(funarg) {
       }
       if (c === 92) {
         return escaped((function (c) {
-                      Stdlib__Buffer.add_char(t.atom, c);
-                      return quoted(k, t);
-                    }), t);
+                Stdlib__Buffer.add_char(t.atom, c);
+                return quoted(k, t);
+              }), t);
       }
       Stdlib__Buffer.add_char(t.atom, c);
       continue ;
@@ -1360,8 +1360,8 @@ function MakeDecode(funarg) {
   const escaped = function (k, t) {
     if (t.i === t.len) {
       return _refill(t, (function (param) {
-                    return escaped(k, param);
-                  }), _error_eof);
+              return escaped(k, param);
+            }), _error_eof);
     }
     const c = _get(t);
     if (c >= 92) {
@@ -1407,89 +1407,89 @@ function MakeDecode(funarg) {
     }
     if (_is_digit(c)) {
       return read2int(c - /* '0' */48 | 0, (function (n) {
-                    return Curry._1(k, Stdlib__Char.chr(n));
-                  }), t);
+              return Curry._1(k, Stdlib__Char.chr(n));
+            }), t);
     } else {
       return Curry._1(_error(t, {
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "unexpected escaped char '",
-                        _1: {
-                          TAG: /* Char */0,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* '\'' */39,
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      },
-                      _1: "unexpected escaped char '%c'"
-                    }), c);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "unexpected escaped char '",
+                  _1: {
+                    TAG: /* Char */0,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* '\'' */39,
+                      _1: /* End_of_format */0
+                    }
+                  }
+                },
+                _1: "unexpected escaped char '%c'"
+              }), c);
     }
   };
   const read2int = function (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);
     }
     const c = _get(t);
     if (_is_digit(c)) {
       return read1int(Math.imul(10, i) + (c - /* '0' */48 | 0) | 0, k, t);
     } else {
       return Curry._1(_error(t, {
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "unexpected char '",
-                        _1: {
-                          TAG: /* Char */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "' when reading byte",
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      },
-                      _1: "unexpected char '%c' when reading byte"
-                    }), c);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "unexpected char '",
+                  _1: {
+                    TAG: /* Char */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "' when reading byte",
+                      _1: /* End_of_format */0
+                    }
+                  }
+                },
+                _1: "unexpected char '%c' when reading byte"
+              }), c);
     }
   };
   const read1int = function (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);
     }
     const c = _get(t);
     if (_is_digit(c)) {
       return Curry._1(k, Math.imul(10, i) + (c - /* '0' */48 | 0) | 0);
     } else {
       return Curry._1(_error(t, {
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: "unexpected char '",
-                        _1: {
-                          TAG: /* Char */0,
-                          _0: {
-                            TAG: /* String_literal */11,
-                            _0: "' when reading byte",
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      },
-                      _1: "unexpected char '%c' when reading byte"
-                    }), c);
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: "unexpected char '",
+                  _1: {
+                    TAG: /* Char */0,
+                    _0: {
+                      TAG: /* String_literal */11,
+                      _0: "' when reading byte",
+                      _1: /* End_of_format */0
+                    }
+                  }
+                },
+                _1: "unexpected char '%c' when reading byte"
+              }), c);
     }
   };
   const skip_comment = function (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);
       }
       const match = _get(t);
       if (match === 10) {
@@ -1502,10 +1502,10 @@ function MakeDecode(funarg) {
     while(true) {
       if (t.i === t.len) {
         return _refill(t, (function (param) {
-                      return expr_or_end(k, param);
-                    }), (function (param) {
-                      return Curry._1(funarg.$$return, "End");
-                    }));
+                return expr_or_end(k, param);
+              }), (function (param) {
+                return Curry._1(funarg.$$return, "End");
+              }));
       }
       const c = _get(t);
       if (c >= 11) {
@@ -1522,16 +1522,16 @@ function MakeDecode(funarg) {
   };
   const next = function (t) {
     return expr_or_end((function (param, x) {
-                  return Curry._1(funarg.$$return, {
-                              NAME: "Ok",
-                              VAL: x
-                            });
-                }), t);
+            return Curry._1(funarg.$$return, {
+                  NAME: "Ok",
+                  VAL: x
+                });
+          }), t);
   };
   return {
-          make: make,
-          next: next
-        };
+    make: make,
+    next: next
+  };
 }
 
 const D = {
diff --git a/jscomp/test/dist/jscomp/test/sexpm_test.js b/jscomp/test/dist/jscomp/test/sexpm_test.js
index bcc849d0e..307e167e8 100644
--- a/jscomp/test/dist/jscomp/test/sexpm_test.js
+++ b/jscomp/test/dist/jscomp/test/sexpm_test.js
@@ -23,10 +23,10 @@ function eq(loc, param) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -36,69 +36,69 @@ function eq(loc, param) {
 function print_or_error(fmt, x) {
   if (x.NAME === "Error") {
     return Curry._1(Stdlib__Format.fprintf(fmt)({
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_gen */18,
+                _0: {
+                  TAG: /* Open_box */1,
+                  _0: {
                     TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Formatting_gen */18,
-                      _0: {
-                        TAG: /* Open_box */1,
-                        _0: {
-                          TAG: /* Format */0,
-                          _0: /* End_of_format */0,
-                          _1: ""
-                        }
-                      },
+                    _0: /* End_of_format */0,
+                    _1: ""
+                  }
+                },
+                _1: {
+                  TAG: /* String_literal */11,
+                  _0: "Error:",
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* Formatting_lit */17,
+                      _0: /* Close_box */0,
                       _1: {
-                        TAG: /* String_literal */11,
-                        _0: "Error:",
-                        _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* Formatting_lit */17,
-                            _0: /* Close_box */0,
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: /* Flush_newline */4,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        }
+                        TAG: /* Formatting_lit */17,
+                        _0: /* Flush_newline */4,
+                        _1: /* End_of_format */0
                       }
-                    },
-                    _1: "@[Error:%s@]@."
-                  }), x.VAL);
+                    }
+                  }
+                }
+              },
+              _1: "@[Error:%s@]@."
+            }), x.VAL);
   } else {
     return Curry._2(Stdlib__Format.fprintf(fmt)({
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Formatting_gen */18,
+                _0: {
+                  TAG: /* Open_box */1,
+                  _0: {
                     TAG: /* Format */0,
+                    _0: /* End_of_format */0,
+                    _1: ""
+                  }
+                },
+                _1: {
+                  TAG: /* String_literal */11,
+                  _0: "Ok:",
+                  _1: {
+                    TAG: /* Alpha */15,
                     _0: {
-                      TAG: /* Formatting_gen */18,
-                      _0: {
-                        TAG: /* Open_box */1,
-                        _0: {
-                          TAG: /* Format */0,
-                          _0: /* End_of_format */0,
-                          _1: ""
-                        }
-                      },
+                      TAG: /* Formatting_lit */17,
+                      _0: /* Close_box */0,
                       _1: {
-                        TAG: /* String_literal */11,
-                        _0: "Ok:",
-                        _1: {
-                          TAG: /* Alpha */15,
-                          _0: {
-                            TAG: /* Formatting_lit */17,
-                            _0: /* Close_box */0,
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: /* Flush_newline */4,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        }
+                        TAG: /* Formatting_lit */17,
+                        _0: /* Flush_newline */4,
+                        _1: /* End_of_format */0
                       }
-                    },
-                    _1: "@[Ok:%a@]@."
-                  }), Sexpm.print, x.VAL);
+                    }
+                  }
+                }
+              },
+              _1: "@[Ok:%a@]@."
+            }), Sexpm.print, x.VAL);
   }
 }
 
diff --git a/jscomp/test/dist/jscomp/test/simple_lexer_test.js b/jscomp/test/dist/jscomp/test/simple_lexer_test.js
index 3c2c3c7b9..b7901f9e3 100644
--- a/jscomp/test/dist/jscomp/test/simple_lexer_test.js
+++ b/jscomp/test/dist/jscomp/test/simple_lexer_test.js
@@ -49,10 +49,10 @@ const suites_0 = [
   "translate",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: __ocaml_lex_translate_rec(Stdlib__Lexing.from_string(undefined, "-- current_directory --"), 0),
-              _1: "-- . --"
-            };
+        TAG: /* Eq */0,
+        _0: __ocaml_lex_translate_rec(Stdlib__Lexing.from_string(undefined, "-- current_directory --"), 0),
+        _1: "-- . --"
+      };
     })
 ];
 
diff --git a/jscomp/test/dist/jscomp/test/splice_test.js b/jscomp/test/dist/jscomp/test/splice_test.js
index 85b895293..aed92b89a 100644
--- a/jscomp/test/dist/jscomp/test/splice_test.js
+++ b/jscomp/test/dist/jscomp/test/splice_test.js
@@ -150,9 +150,9 @@ const Pipe = {
 
 function f1(c) {
   return Caml_splice_call.spliceApply(Math.max, [
-              1,
-              c
-            ]);
+        1,
+        c
+      ]);
 }
 
 eq("File \"jscomp/test/splice_test.ml\", line 85, characters 6-13", Math.max(1, 2, 3), 3);
diff --git a/jscomp/test/dist/jscomp/test/stack_test.js b/jscomp/test/dist/jscomp/test/stack_test.js
index 79ae94fa7..c3d8453ac 100644
--- a/jscomp/test/dist/jscomp/test/stack_test.js
+++ b/jscomp/test/dist/jscomp/test/stack_test.js
@@ -32,19 +32,19 @@ const suites_0 = [
   "push_test",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: {
-                hd: 1,
-                tl: {
-                  hd: 4,
-                  tl: {
-                    hd: 3,
-                    tl: /* [] */0
-                  }
-                }
-              },
-              _1: v(undefined)
-            };
+        TAG: /* Eq */0,
+        _0: {
+          hd: 1,
+          tl: {
+            hd: 4,
+            tl: {
+              hd: 3,
+              tl: /* [] */0
+            }
+          }
+        },
+        _1: v(undefined)
+      };
     })
 ];
 
diff --git a/jscomp/test/dist/jscomp/test/stdlib_bytes_utf8_test.js b/jscomp/test/dist/jscomp/test/stdlib_bytes_utf8_test.js
index 313e3ffbe..47166ec33 100644
--- a/jscomp/test/dist/jscomp/test/stdlib_bytes_utf8_test.js
+++ b/jscomp/test/dist/jscomp/test/stdlib_bytes_utf8_test.js
@@ -336,13 +336,13 @@ function uchar_map_of_spec(spec) {
       return ;
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/stdlib_bytes_utf8_test.ml",
-                69,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/stdlib_bytes_utf8_test.ml",
+            69,
+            4
+          ]
+        });
   };
   Stdlib__List.iter(add_range, spec);
   return map;
@@ -377,74 +377,74 @@ function test_utf(utf, utf_len, get_utf, set_utf, utf_is_valid) {
     const buf = Caml_bytes.caml_create_bytes(utf_len$1);
     if (Curry._3(set_utf, buf, 0, u) !== utf_len$1) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  97,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              97,
+              4
+            ]
+          });
     }
     if (!Caml_bytes.caml_bytes_equal(buf, Caml_array.get(utf, u))) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  98,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              98,
+              4
+            ]
+          });
     }
     if (!Caml_bytes.caml_bytes_equal(buf, Caml_array.get(utf, u))) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  99,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              99,
+              4
+            ]
+          });
     }
     const dec = Curry._2(get_utf, buf, 0);
     if ((dec >>> 27) !== 1) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  101,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              101,
+              4
+            ]
+          });
     }
     if (((dec >>> 24) & 7) !== utf_len$1) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  102,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              102,
+              4
+            ]
+          });
     }
     if ((dec & 16777215) !== u) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  103,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              103,
+              4
+            ]
+          });
     }
     if (!Curry._1(utf_is_valid, buf)) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  104,
-                  4
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              104,
+              4
+            ]
+          });
     }
     
   };
@@ -475,13 +475,13 @@ function raises(f) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              124,
-              4
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          124,
+          4
+        ]
+      });
 }
 
 raises(function (param) {
@@ -512,35 +512,35 @@ const b = Stdlib__Bytes.make(1, /* '\171' */171);
 
 if (!(Stdlib__Bytes.set_utf_8_uchar(b, 0, Stdlib__Uchar.max) === 0 && Caml_bytes.get(b, 0) === /* '\171' */171)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              141,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          141,
+          2
+        ]
+      });
 }
 
 if (!(Stdlib__Bytes.set_utf_16be_uchar(b, 0, Stdlib__Uchar.max) === 0 && Caml_bytes.get(b, 0) === /* '\171' */171)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              142,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          142,
+          2
+        ]
+      });
 }
 
 if (!(Stdlib__Bytes.set_utf_16le_uchar(b, 0, Stdlib__Uchar.max) === 0 && Caml_bytes.get(b, 0) === /* '\171' */171)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              143,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          143,
+          2
+        ]
+      });
 }
 
 const b$1 = [
@@ -554,13 +554,13 @@ Caml_bytes.set(b$1, 1, 0);
 
 if (Stdlib__Bytes.is_valid_utf_8(b$1)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              151,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          151,
+          2
+        ]
+      });
 }
 
 const b$2 = Stdlib__Bytes.of_string("\xc0\xaf\xe0\x80\xbf\xf0\x81\x82A");
@@ -574,65 +574,65 @@ for (let i = 0 ,i_finish = b$2.length; i < i_finish; ++i) {
   if (ok(i)) {
     if ((dec >>> 27) === 1 !== true) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  166,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              166,
+              6
+            ]
+          });
     }
     if (((dec >>> 24) & 7) !== 1) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  167,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              167,
+              6
+            ]
+          });
     }
     if ((dec & 16777215) !== Stdlib__Uchar.of_int(65)) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  168,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              168,
+              6
+            ]
+          });
     }
     
   } else {
     if ((dec >>> 27) === 1 !== false) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  162,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              162,
+              6
+            ]
+          });
     }
     if (((dec >>> 24) & 7) !== 1) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  163,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              163,
+              6
+            ]
+          });
     }
     if ((dec & 16777215) !== Stdlib__Uchar.rep) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  164,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              164,
+              6
+            ]
+          });
     }
     
   }
@@ -649,65 +649,65 @@ for (let i$1 = 0 ,i_finish$1 = b$3.length; i$1 < i_finish$1; ++i$1) {
   if (ok$1(i$1)) {
     if ((dec$1 >>> 27) === 1 !== true) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  179,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              179,
+              6
+            ]
+          });
     }
     if (((dec$1 >>> 24) & 7) !== 1) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  180,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              180,
+              6
+            ]
+          });
     }
     if ((dec$1 & 16777215) !== Stdlib__Uchar.of_int(65)) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  181,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              181,
+              6
+            ]
+          });
     }
     
   } else {
     if ((dec$1 >>> 27) === 1 !== false) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  175,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              175,
+              6
+            ]
+          });
     }
     if (((dec$1 >>> 24) & 7) !== 1) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  176,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              176,
+              6
+            ]
+          });
     }
     if ((dec$1 & 16777215) !== Stdlib__Uchar.rep) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  177,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              177,
+              6
+            ]
+          });
     }
     
   }
@@ -728,65 +728,65 @@ for (let i$2 = 0 ,i_finish$2 = b$4.length; i$2 < i_finish$2; ++i$2) {
   if (ok$2(i$2)) {
     if ((dec$2 >>> 27) === 1 !== true) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  192,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              192,
+              6
+            ]
+          });
     }
     if (((dec$2 >>> 24) & 7) !== 1) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  193,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              193,
+              6
+            ]
+          });
     }
     if ((dec$2 & 16777215) !== Caml_bytes.get(b$4, i$2)) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  194,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              194,
+              6
+            ]
+          });
     }
     
   } else {
     if ((dec$2 >>> 27) === 1 !== false) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  188,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              188,
+              6
+            ]
+          });
     }
     if (((dec$2 >>> 24) & 7) !== 1) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  189,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              189,
+              6
+            ]
+          });
     }
     if ((dec$2 & 16777215) !== Stdlib__Uchar.rep) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/stdlib_bytes_utf8_test.ml",
-                  190,
-                  6
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/stdlib_bytes_utf8_test.ml",
+              190,
+              6
+            ]
+          });
     }
     
   }
@@ -798,164 +798,164 @@ const d0 = Stdlib__Bytes.get_utf_8_uchar(b$5, 0);
 
 if ((d0 >>> 27) === 1 !== false) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              199,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          199,
+          2
+        ]
+      });
 }
 
 if (((d0 >>> 24) & 7) !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              200,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          200,
+          2
+        ]
+      });
 }
 
 if ((d0 & 16777215) !== Stdlib__Uchar.rep) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              201,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          201,
+          2
+        ]
+      });
 }
 
 const d2 = Stdlib__Bytes.get_utf_8_uchar(b$5, 2);
 
 if ((d2 >>> 27) === 1 !== false) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              203,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          203,
+          2
+        ]
+      });
 }
 
 if (((d2 >>> 24) & 7) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              204,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          204,
+          2
+        ]
+      });
 }
 
 if ((d2 & 16777215) !== Stdlib__Uchar.rep) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              205,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          205,
+          2
+        ]
+      });
 }
 
 const d3 = Stdlib__Bytes.get_utf_8_uchar(b$5, 3);
 
 if ((d3 >>> 27) === 1 !== false) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              207,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          207,
+          2
+        ]
+      });
 }
 
 if (((d3 >>> 24) & 7) !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              208,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          208,
+          2
+        ]
+      });
 }
 
 if ((d3 & 16777215) !== Stdlib__Uchar.rep) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              209,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          209,
+          2
+        ]
+      });
 }
 
 const d6 = Stdlib__Bytes.get_utf_8_uchar(b$5, 6);
 
 if ((d6 >>> 27) === 1 !== false) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              211,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          211,
+          2
+        ]
+      });
 }
 
 if (((d6 >>> 24) & 7) !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              212,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          212,
+          2
+        ]
+      });
 }
 
 if ((d6 & 16777215) !== Stdlib__Uchar.rep) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              213,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          213,
+          2
+        ]
+      });
 }
 
 const d8 = Stdlib__Bytes.get_utf_8_uchar(b$5, 8);
 
 if (((d8 >>> 24) & 7) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              215,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          215,
+          2
+        ]
+      });
 }
 
 if ((d8 & 16777215) !== Stdlib__Uchar.of_int(65)) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stdlib_bytes_utf8_test.ml",
-              216,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stdlib_bytes_utf8_test.ml",
+          216,
+          2
+        ]
+      });
 }
 
 Stdlib__Printf.printf({
diff --git a/jscomp/test/dist/jscomp/test/string_get_set_test.js b/jscomp/test/dist/jscomp/test/string_get_set_test.js
index 0166fad33..be1c17202 100644
--- a/jscomp/test/dist/jscomp/test/string_get_set_test.js
+++ b/jscomp/test/dist/jscomp/test/string_get_set_test.js
@@ -8,10 +8,10 @@ Mt.from_pair_suites("jscomp/test/string_get_set_test.ml", {
         "File \"jscomp/test/string_get_set_test.ml\", line 6, characters 4-11",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: /* 'h' */104,
-                    _1: /* 'h' */104
-                  };
+              TAG: /* Eq */0,
+              _0: /* 'h' */104,
+              _1: /* 'h' */104
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/string_literal_print_test.js b/jscomp/test/dist/jscomp/test/string_literal_print_test.js
index dce4d1c40..16a29d76a 100644
--- a/jscomp/test/dist/jscomp/test/string_literal_print_test.js
+++ b/jscomp/test/dist/jscomp/test/string_literal_print_test.js
@@ -12,10 +12,10 @@ Mt.from_pair_suites("String_literal_print_test", {
         "test_string_print",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: js_zero_to_255,
-                    _1: zero_to_255
-                  };
+              TAG: /* Eq */0,
+              _0: js_zero_to_255,
+              _1: zero_to_255
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/string_runtime_test.js b/jscomp/test/dist/jscomp/test/string_runtime_test.js
index 01fe8deef..00def8090 100644
--- a/jscomp/test/dist/jscomp/test/string_runtime_test.js
+++ b/jscomp/test/dist/jscomp/test/string_runtime_test.js
@@ -11,10 +11,10 @@ const suites_0 = [
   "caml_is_printable",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: Test_char.caml_is_printable(/* 'a' */97),
-              _1: true
-            };
+        TAG: /* Eq */0,
+        _0: Test_char.caml_is_printable(/* 'a' */97),
+        _1: true
+      };
     })
 ];
 
@@ -26,11 +26,11 @@ const suites_1 = {
                     const b = Caml_bytes.caml_create_bytes(x);
                     Stdlib__Bytes.fill(b, 0, x, /* 'c' */99);
                     return [
-                            Stdlib__Bytes.to_string(b),
-                            Caml_bytes.bytes_to_string(Stdlib__Bytes.init(x, (function (param) {
-                                        return /* 'c' */99;
-                                      })))
-                          ];
+                      Stdlib__Bytes.to_string(b),
+                      Caml_bytes.bytes_to_string(Stdlib__Bytes.init(x, (function (param) {
+                                  return /* 'c' */99;
+                                })))
+                    ];
                   }), {
                   hd: 1000,
                   tl: {
@@ -54,10 +54,10 @@ const suites_1 = {
                   }
                 }));
         return {
-                TAG: /* Eq */0,
-                _0: match[0],
-                _1: match[1]
-              };
+          TAG: /* Eq */0,
+          _0: match[0],
+          _1: match[1]
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/string_set.js b/jscomp/test/dist/jscomp/test/string_set.js
index 68be75a70..e62f54565 100644
--- a/jscomp/test/dist/jscomp/test/string_set.js
+++ b/jscomp/test/dist/jscomp/test/string_set.js
@@ -12,10 +12,10 @@ const Stdlib__String = require("melange/string.js");
 function split(x, tree) {
   if (/* tag */typeof tree === "number" || typeof tree === "string") {
     return [
-            /* Empty */0,
-            false,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      false,
+      /* Empty */0
+    ];
   }
   const r = tree._2;
   const v = tree._1;
@@ -23,36 +23,36 @@ function split(x, tree) {
   const c = Caml.caml_string_compare(x, v);
   if (c === 0) {
     return [
-            l,
-            true,
-            r
-          ];
+      l,
+      true,
+      r
+    ];
   }
   if (c < 0) {
     const 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)
+    ];
   }
   const 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 (/* tag */typeof tree === "number" || typeof tree === "string") {
     return {
-            TAG: /* Node */0,
-            _0: /* Empty */0,
-            _1: x,
-            _2: /* Empty */0,
-            _3: 1
-          };
+      TAG: /* Node */0,
+      _0: /* Empty */0,
+      _1: x,
+      _2: /* Empty */0,
+      _3: 1
+    };
   }
   const r = tree._2;
   const v = tree._1;
@@ -226,8 +226,8 @@ function find(x, _tree) {
     const tree = _tree;
     if (/* tag */typeof tree === "number" || typeof tree === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = tree._1;
     const c = Caml.caml_string_compare(x, v);
@@ -273,8 +273,8 @@ function of_list(l) {
 
 function of_array(l) {
   return Stdlib__Array.fold_left((function (acc, x) {
-                return add(x, acc);
-              }), /* Empty */0, l);
+          return add(x, acc);
+        }), /* Empty */0, l);
 }
 
 function invariant(t) {
diff --git a/jscomp/test/dist/jscomp/test/string_set_test.js b/jscomp/test/dist/jscomp/test/string_set_test.js
index 00d6c8900..18ad71e92 100644
--- a/jscomp/test/dist/jscomp/test/string_set_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/string_test.js b/jscomp/test/dist/jscomp/test/string_test.js
index 169861110..efc2ca64f 100644
--- a/jscomp/test/dist/jscomp/test/string_test.js
+++ b/jscomp/test/dist/jscomp/test/string_test.js
@@ -67,17 +67,17 @@ function rev_split_by_char(c, s) {
       const i$p = Stdlib__String.index_from(s, i, c);
       const s$p = Stdlib__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){
       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
       if (exn.MEL_EXN_ID === Stdlib.Not_found) {
         return {
-                hd: Stdlib__String.sub(s, i, s.length - i | 0),
-                tl: l
-              };
+          hd: Stdlib__String.sub(s, i, s.length - i | 0),
+          tl: l
+        };
       }
       throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
     }
@@ -104,9 +104,9 @@ function xsplit(delim, s) {
         const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
         if (exn.MEL_EXN_ID === Stdlib.Not_found) {
           return {
-                  hd: Stdlib__String.sub(s, 0, i),
-                  tl: l
-                };
+            hd: Stdlib__String.sub(s, 0, i),
+            tl: l
+          };
         }
         throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
       }
@@ -116,9 +116,9 @@ function xsplit(delim, s) {
         tl: l
       };
       const l$2 = i$p === 0 ? ({
-            hd: "",
-            tl: l$1
-          }) : l$1;
+          hd: "",
+          tl: l$1
+        }) : l$1;
       _i = i$p;
       _l = l$2;
       continue ;
@@ -130,8 +130,8 @@ function xsplit(delim, s) {
 
 function string_of_chars(x) {
   return Stdlib__String.concat("", Stdlib__List.map((function (prim) {
-                    return String.fromCharCode(prim);
-                  }), x));
+              return String.fromCharCode(prim);
+            }), x));
 }
 
 Mt.from_pair_suites("String_test", {
@@ -139,10 +139,10 @@ Mt.from_pair_suites("String_test", {
         "mutliple switch",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: 9,
-                    _1: ff("4")
-                  };
+              TAG: /* Eq */0,
+              _0: 9,
+              _1: ff("4")
+            };
           })
       ],
       tl: {
@@ -150,10 +150,10 @@ Mt.from_pair_suites("String_test", {
           "int switch",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: 9,
-                      _1: gg(4)
-                    };
+                TAG: /* Eq */0,
+                _0: 9,
+                _1: gg(4)
+              };
             })
         ],
         tl: {
@@ -161,10 +161,10 @@ Mt.from_pair_suites("String_test", {
             "escape_normal",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: "haha",
-                        _1: Stdlib__String.escaped("haha")
-                      };
+                  TAG: /* Eq */0,
+                  _0: "haha",
+                  _1: Stdlib__String.escaped("haha")
+                };
               })
           ],
           tl: {
@@ -172,10 +172,10 @@ Mt.from_pair_suites("String_test", {
               "escape_bytes",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: Stdlib__Bytes.of_string("haha"),
-                          _1: Stdlib__Bytes.escaped(Stdlib__Bytes.of_string("haha"))
-                        };
+                    TAG: /* Eq */0,
+                    _0: Stdlib__Bytes.of_string("haha"),
+                    _1: Stdlib__Bytes.escaped(Stdlib__Bytes.of_string("haha"))
+                  };
                 })
             ],
             tl: {
@@ -183,10 +183,10 @@ Mt.from_pair_suites("String_test", {
                 "escape_quote",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: "\\\"\\\"",
-                            _1: Stdlib__String.escaped("\"\"")
-                          };
+                      TAG: /* Eq */0,
+                      _0: "\\\"\\\"",
+                      _1: Stdlib__String.escaped("\"\"")
+                    };
                   })
               ],
               tl: {
@@ -194,19 +194,19 @@ Mt.from_pair_suites("String_test", {
                   "rev_split_by_char",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: {
-                                hd: "",
-                                tl: {
-                                  hd: "bbbb",
-                                  tl: {
-                                    hd: "bbbb",
-                                    tl: /* [] */0
-                                  }
-                                }
-                              },
-                              _1: rev_split_by_char(/* 'a' */97, "bbbbabbbba")
-                            };
+                        TAG: /* Eq */0,
+                        _0: {
+                          hd: "",
+                          tl: {
+                            hd: "bbbb",
+                            tl: {
+                              hd: "bbbb",
+                              tl: /* [] */0
+                            }
+                          }
+                        },
+                        _1: rev_split_by_char(/* 'a' */97, "bbbbabbbba")
+                      };
                     })
                 ],
                 tl: {
@@ -214,13 +214,13 @@ Mt.from_pair_suites("String_test", {
                     "File \"jscomp/test/string_test.ml\", line 74, characters 2-9",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: {
-                                  hd: "aaaa",
-                                  tl: /* [] */0
-                                },
-                                _1: rev_split_by_char(/* ',' */44, "aaaa")
-                              };
+                          TAG: /* Eq */0,
+                          _0: {
+                            hd: "aaaa",
+                            tl: /* [] */0
+                          },
+                          _1: rev_split_by_char(/* ',' */44, "aaaa")
+                        };
                       })
                   ],
                   tl: {
@@ -228,19 +228,19 @@ Mt.from_pair_suites("String_test", {
                       "xsplit",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: {
-                                    hd: "a",
-                                    tl: {
-                                      hd: "b",
-                                      tl: {
-                                        hd: "c",
-                                        tl: /* [] */0
-                                      }
-                                    }
-                                  },
-                                  _1: xsplit(/* '.' */46, "a.b.c")
-                                };
+                            TAG: /* Eq */0,
+                            _0: {
+                              hd: "a",
+                              tl: {
+                                hd: "b",
+                                tl: {
+                                  hd: "c",
+                                  tl: /* [] */0
+                                }
+                              }
+                            },
+                            _1: xsplit(/* '.' */46, "a.b.c")
+                          };
                         })
                     ],
                     tl: {
@@ -248,10 +248,10 @@ Mt.from_pair_suites("String_test", {
                         "split_empty",
                         (function (param) {
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: /* [] */0,
-                                    _1: Ext_string_test.split(undefined, "", /* '_' */95)
-                                  };
+                              TAG: /* Eq */0,
+                              _0: /* [] */0,
+                              _1: Ext_string_test.split(undefined, "", /* '_' */95)
+                            };
                           })
                       ],
                       tl: {
@@ -259,13 +259,13 @@ Mt.from_pair_suites("String_test", {
                           "split_empty2",
                           (function (param) {
                               return {
-                                      TAG: /* Eq */0,
-                                      _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,
+                                _0: {
+                                  hd: "test_unsafe_obj_ffi_ppx.cmi",
+                                  tl: /* [] */0
+                                },
+                                _1: Ext_string_test.split(false, " test_unsafe_obj_ffi_ppx.cmi", /* ' ' */32)
+                              };
                             })
                         ],
                         tl: {
@@ -273,10 +273,10 @@ Mt.from_pair_suites("String_test", {
                             "rfind",
                             (function (param) {
                                 return {
-                                        TAG: /* Eq */0,
-                                        _0: 7,
-                                        _1: Ext_string_test.rfind("__", "__index__js")
-                                      };
+                                  TAG: /* Eq */0,
+                                  _0: 7,
+                                  _1: Ext_string_test.rfind("__", "__index__js")
+                                };
                               })
                           ],
                           tl: {
@@ -284,10 +284,10 @@ Mt.from_pair_suites("String_test", {
                               "rfind_2",
                               (function (param) {
                                   return {
-                                          TAG: /* Eq */0,
-                                          _0: 0,
-                                          _1: Ext_string_test.rfind("__", "__index_js")
-                                        };
+                                    TAG: /* Eq */0,
+                                    _0: 0,
+                                    _1: Ext_string_test.rfind("__", "__index_js")
+                                  };
                                 })
                             ],
                             tl: {
@@ -295,10 +295,10 @@ Mt.from_pair_suites("String_test", {
                                 "rfind_3",
                                 (function (param) {
                                     return {
-                                            TAG: /* Eq */0,
-                                            _0: -1,
-                                            _1: Ext_string_test.rfind("__", "_index_js")
-                                          };
+                                      TAG: /* Eq */0,
+                                      _0: -1,
+                                      _1: Ext_string_test.rfind("__", "_index_js")
+                                    };
                                   })
                               ],
                               tl: {
@@ -306,10 +306,10 @@ Mt.from_pair_suites("String_test", {
                                   "find",
                                   (function (param) {
                                       return {
-                                              TAG: /* Eq */0,
-                                              _0: 0,
-                                              _1: Ext_string_test.find(undefined, "__", "__index__js")
-                                            };
+                                        TAG: /* Eq */0,
+                                        _0: 0,
+                                        _1: Ext_string_test.find(undefined, "__", "__index__js")
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -317,10 +317,10 @@ Mt.from_pair_suites("String_test", {
                                     "find_2",
                                     (function (param) {
                                         return {
-                                                TAG: /* Eq */0,
-                                                _0: 6,
-                                                _1: Ext_string_test.find(undefined, "__", "_index__js")
-                                              };
+                                          TAG: /* Eq */0,
+                                          _0: 6,
+                                          _1: Ext_string_test.find(undefined, "__", "_index__js")
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -328,10 +328,10 @@ Mt.from_pair_suites("String_test", {
                                       "find_3",
                                       (function (param) {
                                           return {
-                                                  TAG: /* Eq */0,
-                                                  _0: -1,
-                                                  _1: Ext_string_test.find(undefined, "__", "_index_js")
-                                                };
+                                            TAG: /* Eq */0,
+                                            _0: -1,
+                                            _1: Ext_string_test.find(undefined, "__", "_index_js")
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -339,10 +339,10 @@ Mt.from_pair_suites("String_test", {
                                         "of_char",
                                         (function (param) {
                                             return {
-                                                    TAG: /* Eq */0,
-                                                    _0: String.fromCharCode(/* '0' */48),
-                                                    _1: Caml_bytes.bytes_to_string(Stdlib__Bytes.make(1, /* '0' */48))
-                                                  };
+                                              TAG: /* Eq */0,
+                                              _0: String.fromCharCode(/* '0' */48),
+                                              _1: Caml_bytes.bytes_to_string(Stdlib__Bytes.make(1, /* '0' */48))
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -350,19 +350,19 @@ Mt.from_pair_suites("String_test", {
                                           "of_chars",
                                           (function (param) {
                                               return {
-                                                      TAG: /* Eq */0,
-                                                      _0: string_of_chars({
-                                                            hd: /* '0' */48,
-                                                            tl: {
-                                                              hd: /* '1' */49,
-                                                              tl: {
-                                                                hd: /* '2' */50,
-                                                                tl: /* [] */0
-                                                              }
-                                                            }
-                                                          }),
-                                                      _1: "012"
-                                                    };
+                                                TAG: /* Eq */0,
+                                                _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/dist/jscomp/test/stringmatch_test.js b/jscomp/test/dist/jscomp/test/stringmatch_test.js
index 99e407415..7830a980a 100644
--- a/jscomp/test/dist/jscomp/test/stringmatch_test.js
+++ b/jscomp/test/dist/jscomp/test/stringmatch_test.js
@@ -13,35 +13,35 @@ function tst01(s) {
 
 if (tst01("") !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              20,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          20,
+          2
+        ]
+      });
 }
 
 if (tst01("\0\0\0\x03") !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              21,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          21,
+          2
+        ]
+      });
 }
 
 if (tst01("\0\0\0\0\0\0\0\x07") !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              22,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          22,
+          2
+        ]
+      });
 }
 
 function tst02(s) {
@@ -51,23 +51,23 @@ function tst02(s) {
       return 1;
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/stringmatch_test.ml",
-                30,
-                23
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/stringmatch_test.ml",
+            30,
+            23
+          ]
+        });
   }
   if (len === 0) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/stringmatch_test.ml",
-                32,
-                22
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/stringmatch_test.ml",
+            32,
+            22
+          ]
+        });
   }
   if (s === "A") {
     return 2;
@@ -78,57 +78,57 @@ function tst02(s) {
 
 if (tst02("") !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              37,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          37,
+          2
+        ]
+      });
 }
 
 if (tst02("A") !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              38,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          38,
+          2
+        ]
+      });
 }
 
 if (tst02("B") !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              39,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          39,
+          2
+        ]
+      });
 }
 
 if (tst02("\0\0\0\0\0\0\0\x07") !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              40,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          40,
+          2
+        ]
+      });
 }
 
 if (tst02("\0\0\0\x03") !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              41,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          41,
+          2
+        ]
+      });
 }
 
 function tst03(s) {
@@ -188,530 +188,530 @@ function tst03(s) {
 
 if (tst03("get_const") !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              123,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          123,
+          2
+        ]
+      });
 }
 
 if (tst03("set_congt") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              124,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          124,
+          2
+        ]
+      });
 }
 
 if (tst03("get_var") !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              125,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          125,
+          2
+        ]
+      });
 }
 
 if (tst03("gat_ver") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              126,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          126,
+          2
+        ]
+      });
 }
 
 if (tst03("get_env") !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              127,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          127,
+          2
+        ]
+      });
 }
 
 if (tst03("get_env") !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              128,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          128,
+          2
+        ]
+      });
 }
 
 if (tst03("get_meth") !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              129,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          129,
+          2
+        ]
+      });
 }
 
 if (tst03("met_geth") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              130,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          130,
+          2
+        ]
+      });
 }
 
 if (tst03("set_var") !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              131,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          131,
+          2
+        ]
+      });
 }
 
 if (tst03("sev_tar") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              132,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          132,
+          2
+        ]
+      });
 }
 
 if (tst03("app_const") !== 5) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              133,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          133,
+          2
+        ]
+      });
 }
 
 if (tst03("ppa_const") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              134,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          134,
+          2
+        ]
+      });
 }
 
 if (tst03("app_var") !== 6) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              135,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          135,
+          2
+        ]
+      });
 }
 
 if (tst03("app_var") !== 6) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              136,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          136,
+          2
+        ]
+      });
 }
 
 if (tst03("app_env") !== 7) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              137,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          137,
+          2
+        ]
+      });
 }
 
 if (tst03("epp_anv") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              138,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          138,
+          2
+        ]
+      });
 }
 
 if (tst03("app_meth") !== 8) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              139,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          139,
+          2
+        ]
+      });
 }
 
 if (tst03("atp_meph") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              140,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          140,
+          2
+        ]
+      });
 }
 
 if (tst03("app_const_const") !== 9) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              141,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          141,
+          2
+        ]
+      });
 }
 
 if (tst03("app_const_const") !== 9) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              142,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          142,
+          2
+        ]
+      });
 }
 
 if (tst03("app_const_var") !== 10) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              143,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          143,
+          2
+        ]
+      });
 }
 
 if (tst03("atp_consp_var") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              144,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          144,
+          2
+        ]
+      });
 }
 
 if (tst03("app_const_env") !== 11) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              145,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          145,
+          2
+        ]
+      });
 }
 
 if (tst03("app_constne_v") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              146,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          146,
+          2
+        ]
+      });
 }
 
 if (tst03("app_const_meth") !== 12) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              147,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          147,
+          2
+        ]
+      });
 }
 
 if (tst03("spp_conat_meth") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              148,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          148,
+          2
+        ]
+      });
 }
 
 if (tst03("app_var_const") !== 13) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              149,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          149,
+          2
+        ]
+      });
 }
 
 if (tst03("app_va_rconst") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              150,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          150,
+          2
+        ]
+      });
 }
 
 if (tst03("app_env_const") !== 14) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              151,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          151,
+          2
+        ]
+      });
 }
 
 if (tst03("app_env_const") !== 14) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              152,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          152,
+          2
+        ]
+      });
 }
 
 if (tst03("app_meth_const") !== 15) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              153,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          153,
+          2
+        ]
+      });
 }
 
 if (tst03("app_teth_consm") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              154,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          154,
+          2
+        ]
+      });
 }
 
 if (tst03("meth_app_const") !== 16) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              155,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          155,
+          2
+        ]
+      });
 }
 
 if (tst03("math_epp_const") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              156,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          156,
+          2
+        ]
+      });
 }
 
 if (tst03("meth_app_var") !== 17) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              157,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          157,
+          2
+        ]
+      });
 }
 
 if (tst03("meth_app_var") !== 17) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              158,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          158,
+          2
+        ]
+      });
 }
 
 if (tst03("meth_app_env") !== 18) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              159,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          159,
+          2
+        ]
+      });
 }
 
 if (tst03("eeth_app_mnv") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              160,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          160,
+          2
+        ]
+      });
 }
 
 if (tst03("meth_app_meth") !== 19) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              161,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          161,
+          2
+        ]
+      });
 }
 
 if (tst03("meth_apt_meph") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              162,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          162,
+          2
+        ]
+      });
 }
 
 if (tst03("send_const") !== 20) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              163,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          163,
+          2
+        ]
+      });
 }
 
 if (tst03("tend_conss") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              164,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          164,
+          2
+        ]
+      });
 }
 
 if (tst03("send_var") !== 21) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              165,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          165,
+          2
+        ]
+      });
 }
 
 if (tst03("serd_van") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              166,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          166,
+          2
+        ]
+      });
 }
 
 if (tst03("send_env") !== 22) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              167,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          167,
+          2
+        ]
+      });
 }
 
 if (tst03("sen_denv") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              168,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          168,
+          2
+        ]
+      });
 }
 
 if (tst03("send_meth") !== 23) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              169,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          169,
+          2
+        ]
+      });
 }
 
 if (tst03("tend_mesh") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              170,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          170,
+          2
+        ]
+      });
 }
 
 function tst04(s) {
@@ -747,211 +747,211 @@ function tst04(s) {
 
 if (tst04("AAAAAAAA") !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              204,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          204,
+          2
+        ]
+      });
 }
 
 if (tst04("AAAAAAAAAAAAAAAA") !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              205,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          205,
+          2
+        ]
+      });
 }
 
 if (tst04("AAAAAAAAAAAAAAAAAAAAAAAA") !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              206,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          206,
+          2
+        ]
+      });
 }
 
 if (tst04("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA") !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              207,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          207,
+          2
+        ]
+      });
 }
 
 if (tst04("BBBBBBBB") !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              208,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          208,
+          2
+        ]
+      });
 }
 
 if (tst04("BBBBBBBBBBBBBBBB") !== 5) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              209,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          209,
+          2
+        ]
+      });
 }
 
 if (tst04("BBBBBBBBBBBBBBBBBBBBBBBB") !== 6) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              210,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          210,
+          2
+        ]
+      });
 }
 
 if (tst04("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB") !== 7) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              211,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          211,
+          2
+        ]
+      });
 }
 
 if (tst04("CCCCCCCC") !== 8) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              212,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          212,
+          2
+        ]
+      });
 }
 
 if (tst04("CCCCCCCCCCCCCCCC") !== 9) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              213,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          213,
+          2
+        ]
+      });
 }
 
 if (tst04("CCCCCCCCCCCCCCCCCCCCCCCC") !== 10) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              214,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          214,
+          2
+        ]
+      });
 }
 
 if (tst04("CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC") !== 11) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              215,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          215,
+          2
+        ]
+      });
 }
 
 if (tst04("") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              216,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          216,
+          2
+        ]
+      });
 }
 
 if (tst04("DDD") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              217,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          217,
+          2
+        ]
+      });
 }
 
 if (tst04("DDDDDDD") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              218,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          218,
+          2
+        ]
+      });
 }
 
 if (tst04("AAADDDD") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              219,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          219,
+          2
+        ]
+      });
 }
 
 if (tst04("AAAAAAADDDDDDDD") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              220,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          220,
+          2
+        ]
+      });
 }
 
 if (tst04("AAAAAAADDDD") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              221,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          221,
+          2
+        ]
+      });
 }
 
 if (tst04("AAAAAAAAAAAAAAADDDD") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              222,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          222,
+          2
+        ]
+      });
 }
 
 function tst05(s) {
@@ -989,244 +989,244 @@ function tst05(s) {
 
 if (tst05("AAA") !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              258,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          258,
+          2
+        ]
+      });
 }
 
 if (tst05("AAAA") !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              259,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          259,
+          2
+        ]
+      });
 }
 
 if (tst05("AAAAA") !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              260,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          260,
+          2
+        ]
+      });
 }
 
 if (tst05("AAAAAA") !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              261,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          261,
+          2
+        ]
+      });
 }
 
 if (tst05("AAAAAAA") !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              262,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          262,
+          2
+        ]
+      });
 }
 
 if (tst05("AAAAAAAAAAAA") !== 5) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              263,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          263,
+          2
+        ]
+      });
 }
 
 if (tst05("AAAAAAAAAAAAAAAA") !== 6) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              264,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          264,
+          2
+        ]
+      });
 }
 
 if (tst05("AAAAAAAAAAAAAAAAAAAA") !== 7) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              265,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          265,
+          2
+        ]
+      });
 }
 
 if (tst05("BBB") !== 8) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              266,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          266,
+          2
+        ]
+      });
 }
 
 if (tst05("BBBB") !== 9) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              267,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          267,
+          2
+        ]
+      });
 }
 
 if (tst05("BBBBB") !== 10) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              268,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          268,
+          2
+        ]
+      });
 }
 
 if (tst05("BBBBBB") !== 11) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              269,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          269,
+          2
+        ]
+      });
 }
 
 if (tst05("BBBBBBB") !== 12) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              270,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          270,
+          2
+        ]
+      });
 }
 
 if (tst05("") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              271,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          271,
+          2
+        ]
+      });
 }
 
 if (tst05("AAD") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              272,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          272,
+          2
+        ]
+      });
 }
 
 if (tst05("AAAD") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              273,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          273,
+          2
+        ]
+      });
 }
 
 if (tst05("AAAAAAD") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              274,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          274,
+          2
+        ]
+      });
 }
 
 if (tst05("AAAAAAAD") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              275,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          275,
+          2
+        ]
+      });
 }
 
 if (tst05("BBD") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              276,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          276,
+          2
+        ]
+      });
 }
 
 if (tst05("BBBD") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              277,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          277,
+          2
+        ]
+      });
 }
 
 if (tst05("BBBBBBD") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              278,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          278,
+          2
+        ]
+      });
 }
 
 if (tst05("BBBBBBBD") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              279,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          279,
+          2
+        ]
+      });
 }
 
 const s00 = "and";
@@ -1790,2037 +1790,2037 @@ function tst06(s) {
 
 if (tst06(s00) !== 0) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              565,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          565,
+          2
+        ]
+      });
 }
 
 if (tst06(t00) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              566,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          566,
+          2
+        ]
+      });
 }
 
 if (tst06(s01) !== 1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              567,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          567,
+          2
+        ]
+      });
 }
 
 if (tst06(t01) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              568,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          568,
+          2
+        ]
+      });
 }
 
 if (tst06(s02) !== 2) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              569,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          569,
+          2
+        ]
+      });
 }
 
 if (tst06(t02) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              570,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          570,
+          2
+        ]
+      });
 }
 
 if (tst06(s03) !== 3) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              571,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          571,
+          2
+        ]
+      });
 }
 
 if (tst06(t03) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              572,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          572,
+          2
+        ]
+      });
 }
 
 if (tst06(s04) !== 4) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              573,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          573,
+          2
+        ]
+      });
 }
 
 if (tst06(t04) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              574,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          574,
+          2
+        ]
+      });
 }
 
 if (tst06(s05) !== 5) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              575,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          575,
+          2
+        ]
+      });
 }
 
 if (tst06(t05) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              576,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          576,
+          2
+        ]
+      });
 }
 
 if (tst06(s06) !== 6) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              577,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          577,
+          2
+        ]
+      });
 }
 
 if (tst06(t06) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              578,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          578,
+          2
+        ]
+      });
 }
 
 if (tst06(s07) !== 7) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              579,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          579,
+          2
+        ]
+      });
 }
 
 if (tst06(t07) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              580,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          580,
+          2
+        ]
+      });
 }
 
 if (tst06(s08) !== 8) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              581,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          581,
+          2
+        ]
+      });
 }
 
 if (tst06(t08) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              582,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          582,
+          2
+        ]
+      });
 }
 
 if (tst06(s09) !== 9) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              583,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          583,
+          2
+        ]
+      });
 }
 
 if (tst06(t09) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              584,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          584,
+          2
+        ]
+      });
 }
 
 if (tst06(s10) !== 10) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              585,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          585,
+          2
+        ]
+      });
 }
 
 if (tst06(t10) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              586,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          586,
+          2
+        ]
+      });
 }
 
 if (tst06(s11) !== 11) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              587,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          587,
+          2
+        ]
+      });
 }
 
 if (tst06(t11) !== 11) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              588,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          588,
+          2
+        ]
+      });
 }
 
 if (tst06(s12) !== 12) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              589,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          589,
+          2
+        ]
+      });
 }
 
 if (tst06(t12) !== 12) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              590,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          590,
+          2
+        ]
+      });
 }
 
 if (tst06(s13) !== 13) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              591,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          591,
+          2
+        ]
+      });
 }
 
 if (tst06(t13) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              592,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          592,
+          2
+        ]
+      });
 }
 
 if (tst06(s14) !== 14) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              593,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          593,
+          2
+        ]
+      });
 }
 
 if (tst06(t14) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              594,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          594,
+          2
+        ]
+      });
 }
 
 if (tst06(s15) !== 15) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              595,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          595,
+          2
+        ]
+      });
 }
 
 if (tst06(t15) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              596,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          596,
+          2
+        ]
+      });
 }
 
 if (tst06(s16) !== 16) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              597,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          597,
+          2
+        ]
+      });
 }
 
 if (tst06(t16) !== 16) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              598,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          598,
+          2
+        ]
+      });
 }
 
 if (tst06(s17) !== 17) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              599,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          599,
+          2
+        ]
+      });
 }
 
 if (tst06(t17) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              600,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          600,
+          2
+        ]
+      });
 }
 
 if (tst06(s18) !== 18) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              601,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          601,
+          2
+        ]
+      });
 }
 
 if (tst06(t18) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              602,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          602,
+          2
+        ]
+      });
 }
 
 if (tst06(s19) !== 19) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              603,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          603,
+          2
+        ]
+      });
 }
 
 if (tst06(t19) !== 19) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              604,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          604,
+          2
+        ]
+      });
 }
 
 if (tst06(s20) !== 20) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              605,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          605,
+          2
+        ]
+      });
 }
 
 if (tst06(t20) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              606,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          606,
+          2
+        ]
+      });
 }
 
 if (tst06(s21) !== 21) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              607,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          607,
+          2
+        ]
+      });
 }
 
 if (tst06(t21) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              608,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          608,
+          2
+        ]
+      });
 }
 
 if (tst06(s22) !== 22) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              609,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          609,
+          2
+        ]
+      });
 }
 
 if (tst06(t22) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              610,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          610,
+          2
+        ]
+      });
 }
 
 if (tst06(s23) !== 23) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              611,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          611,
+          2
+        ]
+      });
 }
 
 if (tst06(t23) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              612,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          612,
+          2
+        ]
+      });
 }
 
 if (tst06(s24) !== 24) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              613,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          613,
+          2
+        ]
+      });
 }
 
 if (tst06(t24) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              614,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          614,
+          2
+        ]
+      });
 }
 
 if (tst06(s25) !== 25) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              615,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          615,
+          2
+        ]
+      });
 }
 
 if (tst06(t25) !== 25) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              616,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          616,
+          2
+        ]
+      });
 }
 
 if (tst06(s26) !== 26) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              617,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          617,
+          2
+        ]
+      });
 }
 
 if (tst06(t26) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              618,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          618,
+          2
+        ]
+      });
 }
 
 if (tst06(s27) !== 27) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              619,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          619,
+          2
+        ]
+      });
 }
 
 if (tst06(t27) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              620,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          620,
+          2
+        ]
+      });
 }
 
 if (tst06(s28) !== 28) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              621,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          621,
+          2
+        ]
+      });
 }
 
 if (tst06(t28) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              622,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          622,
+          2
+        ]
+      });
 }
 
 if (tst06(s29) !== 29) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              623,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          623,
+          2
+        ]
+      });
 }
 
 if (tst06(t29) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              624,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          624,
+          2
+        ]
+      });
 }
 
 if (tst06(s30) !== 30) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              625,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          625,
+          2
+        ]
+      });
 }
 
 if (tst06(t30) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              626,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          626,
+          2
+        ]
+      });
 }
 
 if (tst06(s31) !== 31) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              627,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          627,
+          2
+        ]
+      });
 }
 
 if (tst06(t31) !== 31) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              628,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          628,
+          2
+        ]
+      });
 }
 
 if (tst06(s32) !== 32) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              629,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          629,
+          2
+        ]
+      });
 }
 
 if (tst06(t32) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              630,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          630,
+          2
+        ]
+      });
 }
 
 if (tst06(s33) !== 33) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              631,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          631,
+          2
+        ]
+      });
 }
 
 if (tst06(t33) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              632,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          632,
+          2
+        ]
+      });
 }
 
 if (tst06(s34) !== 34) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              633,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          633,
+          2
+        ]
+      });
 }
 
 if (tst06(t34) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              634,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          634,
+          2
+        ]
+      });
 }
 
 if (tst06(s35) !== 35) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              635,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          635,
+          2
+        ]
+      });
 }
 
 if (tst06(t35) !== 35) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              636,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          636,
+          2
+        ]
+      });
 }
 
 if (tst06(s36) !== 36) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              637,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          637,
+          2
+        ]
+      });
 }
 
 if (tst06(t36) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              638,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          638,
+          2
+        ]
+      });
 }
 
 if (tst06(s37) !== 37) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              639,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          639,
+          2
+        ]
+      });
 }
 
 if (tst06(t37) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              640,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          640,
+          2
+        ]
+      });
 }
 
 if (tst06(s38) !== 38) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              641,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          641,
+          2
+        ]
+      });
 }
 
 if (tst06(t38) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              642,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          642,
+          2
+        ]
+      });
 }
 
 if (tst06(s39) !== 39) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              643,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          643,
+          2
+        ]
+      });
 }
 
 if (tst06(t39) !== 39) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              644,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          644,
+          2
+        ]
+      });
 }
 
 if (tst06(s40) !== 40) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              645,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          645,
+          2
+        ]
+      });
 }
 
 if (tst06(t40) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              646,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          646,
+          2
+        ]
+      });
 }
 
 if (tst06(s41) !== 41) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              647,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          647,
+          2
+        ]
+      });
 }
 
 if (tst06(t41) !== 41) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              648,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          648,
+          2
+        ]
+      });
 }
 
 if (tst06(s42) !== 42) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              649,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          649,
+          2
+        ]
+      });
 }
 
 if (tst06(t42) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              650,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          650,
+          2
+        ]
+      });
 }
 
 if (tst06(s43) !== 43) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              651,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          651,
+          2
+        ]
+      });
 }
 
 if (tst06(t43) !== 43) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              652,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          652,
+          2
+        ]
+      });
 }
 
 if (tst06(s44) !== 44) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              653,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          653,
+          2
+        ]
+      });
 }
 
 if (tst06(t44) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              654,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          654,
+          2
+        ]
+      });
 }
 
 if (tst06(s45) !== 45) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              655,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          655,
+          2
+        ]
+      });
 }
 
 if (tst06(t45) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              656,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          656,
+          2
+        ]
+      });
 }
 
 if (tst06(s46) !== 46) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              657,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          657,
+          2
+        ]
+      });
 }
 
 if (tst06(t46) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              658,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          658,
+          2
+        ]
+      });
 }
 
 if (tst06(s47) !== 47) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              659,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          659,
+          2
+        ]
+      });
 }
 
 if (tst06(t47) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              660,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          660,
+          2
+        ]
+      });
 }
 
 if (tst06(s48) !== 48) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              661,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          661,
+          2
+        ]
+      });
 }
 
 if (tst06(t48) !== 48) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              662,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          662,
+          2
+        ]
+      });
 }
 
 if (tst06(s49) !== 49) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              663,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          663,
+          2
+        ]
+      });
 }
 
 if (tst06(t49) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              664,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          664,
+          2
+        ]
+      });
 }
 
 if (tst06(s50) !== 50) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              665,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          665,
+          2
+        ]
+      });
 }
 
 if (tst06(t50) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              666,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          666,
+          2
+        ]
+      });
 }
 
 if (tst06(s51) !== 51) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              667,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          667,
+          2
+        ]
+      });
 }
 
 if (tst06(t51) !== 51) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              668,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          668,
+          2
+        ]
+      });
 }
 
 if (tst06(s52) !== 52) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              669,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          669,
+          2
+        ]
+      });
 }
 
 if (tst06(t52) !== 52) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              670,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          670,
+          2
+        ]
+      });
 }
 
 if (tst06(s53) !== 53) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              671,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          671,
+          2
+        ]
+      });
 }
 
 if (tst06(t53) !== 53) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              672,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          672,
+          2
+        ]
+      });
 }
 
 if (tst06(s54) !== 54) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              673,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          673,
+          2
+        ]
+      });
 }
 
 if (tst06(t54) !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              674,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          674,
+          2
+        ]
+      });
 }
 
 if (tst06(s55) !== 55) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              675,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          675,
+          2
+        ]
+      });
 }
 
 if (tst06(t55) !== 55) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              676,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          676,
+          2
+        ]
+      });
 }
 
 if (tst06(s56) !== 56) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              677,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          677,
+          2
+        ]
+      });
 }
 
 if (tst06(t56) !== 56) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              678,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          678,
+          2
+        ]
+      });
 }
 
 if (tst06(s57) !== 57) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              679,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          679,
+          2
+        ]
+      });
 }
 
 if (tst06(t57) !== 57) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              680,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          680,
+          2
+        ]
+      });
 }
 
 if (tst06(s58) !== 58) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              681,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          681,
+          2
+        ]
+      });
 }
 
 if (tst06(t58) !== 58) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              682,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          682,
+          2
+        ]
+      });
 }
 
 if (tst06(s59) !== 59) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              683,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          683,
+          2
+        ]
+      });
 }
 
 if (tst06(t59) !== 59) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              684,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          684,
+          2
+        ]
+      });
 }
 
 if (tst06(s60) !== 60) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              685,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          685,
+          2
+        ]
+      });
 }
 
 if (tst06(t60) !== 60) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              686,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          686,
+          2
+        ]
+      });
 }
 
 if (tst06(s61) !== 61) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              687,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          687,
+          2
+        ]
+      });
 }
 
 if (tst06(t61) !== 61) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              688,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          688,
+          2
+        ]
+      });
 }
 
 if (tst06(s62) !== 62) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              689,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          689,
+          2
+        ]
+      });
 }
 
 if (tst06(t62) !== 62) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              690,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          690,
+          2
+        ]
+      });
 }
 
 if (tst06(s63) !== 63) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              691,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          691,
+          2
+        ]
+      });
 }
 
 if (tst06(t63) !== 63) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              692,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          692,
+          2
+        ]
+      });
 }
 
 if (tst06(s64) !== 64) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              693,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          693,
+          2
+        ]
+      });
 }
 
 if (tst06(t64) !== 64) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              694,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          694,
+          2
+        ]
+      });
 }
 
 if (tst06(s65) !== 65) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              695,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          695,
+          2
+        ]
+      });
 }
 
 if (tst06(t65) !== 65) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              696,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          696,
+          2
+        ]
+      });
 }
 
 if (tst06(s66) !== 66) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              697,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          697,
+          2
+        ]
+      });
 }
 
 if (tst06(t66) !== 66) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              698,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          698,
+          2
+        ]
+      });
 }
 
 if (tst06(s67) !== 67) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              699,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          699,
+          2
+        ]
+      });
 }
 
 if (tst06(t67) !== 67) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              700,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          700,
+          2
+        ]
+      });
 }
 
 if (tst06(s68) !== 68) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              701,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          701,
+          2
+        ]
+      });
 }
 
 if (tst06(t68) !== 68) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              702,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          702,
+          2
+        ]
+      });
 }
 
 if (tst06(s69) !== 69) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              703,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          703,
+          2
+        ]
+      });
 }
 
 if (tst06(t69) !== 69) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              704,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          704,
+          2
+        ]
+      });
 }
 
 if (tst06(s70) !== 70) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              705,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          705,
+          2
+        ]
+      });
 }
 
 if (tst06(t70) !== 70) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              706,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          706,
+          2
+        ]
+      });
 }
 
 if (tst06(s71) !== 71) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              707,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          707,
+          2
+        ]
+      });
 }
 
 if (tst06(t71) !== 71) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              708,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          708,
+          2
+        ]
+      });
 }
 
 if (tst06(s72) !== 72) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              709,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          709,
+          2
+        ]
+      });
 }
 
 if (tst06(t72) !== 72) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              710,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          710,
+          2
+        ]
+      });
 }
 
 if (tst06(s73) !== 73) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              711,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          711,
+          2
+        ]
+      });
 }
 
 if (tst06(t73) !== 73) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              712,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          712,
+          2
+        ]
+      });
 }
 
 if (tst06(s74) !== 74) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              713,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          713,
+          2
+        ]
+      });
 }
 
 if (tst06(t74) !== 74) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              714,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          714,
+          2
+        ]
+      });
 }
 
 if (tst06(s75) !== 75) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              715,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          715,
+          2
+        ]
+      });
 }
 
 if (tst06(t75) !== 75) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              716,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          716,
+          2
+        ]
+      });
 }
 
 if (tst06(s76) !== 76) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              717,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          717,
+          2
+        ]
+      });
 }
 
 if (tst06(t76) !== 76) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              718,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          718,
+          2
+        ]
+      });
 }
 
 if (tst06(s77) !== 77) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              719,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          719,
+          2
+        ]
+      });
 }
 
 if (tst06(t77) !== 77) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              720,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          720,
+          2
+        ]
+      });
 }
 
 if (tst06(s78) !== 78) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              721,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          721,
+          2
+        ]
+      });
 }
 
 if (tst06(t78) !== 78) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              722,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          722,
+          2
+        ]
+      });
 }
 
 if (tst06(s79) !== 79) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              723,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          723,
+          2
+        ]
+      });
 }
 
 if (tst06(t79) !== 79) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              724,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          724,
+          2
+        ]
+      });
 }
 
 if (tst06(s80) !== 80) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              725,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          725,
+          2
+        ]
+      });
 }
 
 if (tst06(t80) !== 80) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              726,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          726,
+          2
+        ]
+      });
 }
 
 if (tst06(s81) !== 81) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              727,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          727,
+          2
+        ]
+      });
 }
 
 if (tst06(t81) !== 81) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              728,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          728,
+          2
+        ]
+      });
 }
 
 if (tst06(s82) !== 82) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              729,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          729,
+          2
+        ]
+      });
 }
 
 if (tst06(t82) !== 82) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              730,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          730,
+          2
+        ]
+      });
 }
 
 if (tst06(s83) !== 83) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              731,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          731,
+          2
+        ]
+      });
 }
 
 if (tst06(t83) !== 83) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              732,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          732,
+          2
+        ]
+      });
 }
 
 if (tst06(s84) !== 84) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              733,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          733,
+          2
+        ]
+      });
 }
 
 if (tst06(t84) !== 84) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              734,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          734,
+          2
+        ]
+      });
 }
 
 if (tst06(s85) !== 85) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              735,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          735,
+          2
+        ]
+      });
 }
 
 if (tst06(t85) !== 85) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              736,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          736,
+          2
+        ]
+      });
 }
 
 if (tst06(s86) !== 86) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              737,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          737,
+          2
+        ]
+      });
 }
 
 if (tst06(t86) !== 86) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              738,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          738,
+          2
+        ]
+      });
 }
 
 if (tst06(s87) !== 87) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              739,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          739,
+          2
+        ]
+      });
 }
 
 if (tst06(t87) !== 87) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              740,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          740,
+          2
+        ]
+      });
 }
 
 if (tst06(s88) !== 88) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              741,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          741,
+          2
+        ]
+      });
 }
 
 if (tst06(t88) !== 88) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              742,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          742,
+          2
+        ]
+      });
 }
 
 if (tst06(s89) !== 89) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              743,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          743,
+          2
+        ]
+      });
 }
 
 if (tst06(t89) !== 89) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              744,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          744,
+          2
+        ]
+      });
 }
 
 if (tst06(s90) !== 90) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              745,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          745,
+          2
+        ]
+      });
 }
 
 if (tst06(t90) !== 90) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              746,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          746,
+          2
+        ]
+      });
 }
 
 if (tst06(s91) !== 91) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              747,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          747,
+          2
+        ]
+      });
 }
 
 if (tst06(t91) !== 91) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              748,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          748,
+          2
+        ]
+      });
 }
 
 if (tst06("") !== -1) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/stringmatch_test.ml",
-              749,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/stringmatch_test.ml",
+          749,
+          2
+        ]
+      });
 }
 
 exports.tst01 = tst01;
diff --git a/jscomp/test/dist/jscomp/test/switch_case_test.js b/jscomp/test/dist/jscomp/test/switch_case_test.js
index b78acf473..5956c5350 100644
--- a/jscomp/test/dist/jscomp/test/switch_case_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/tailcall_inline_test.js b/jscomp/test/dist/jscomp/test/tailcall_inline_test.js
index 8d0667960..848bc3ad4 100644
--- a/jscomp/test/dist/jscomp/test/tailcall_inline_test.js
+++ b/jscomp/test/dist/jscomp/test/tailcall_inline_test.js
@@ -29,21 +29,21 @@ const suites_0 = [
   "acc",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: f(undefined),
-              _1: [
-                0,
-                1,
-                3,
-                6,
-                10,
-                15,
-                21,
-                28,
-                36,
-                45
-              ]
-            };
+        TAG: /* Eq */0,
+        _0: f(undefined),
+        _1: [
+          0,
+          1,
+          3,
+          6,
+          10,
+          15,
+          21,
+          28,
+          36,
+          45
+        ]
+      };
     })
 ];
 
@@ -52,23 +52,23 @@ const suites_1 = {
     "array_to_list",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: {
-                  hd: 1,
-                  tl: {
-                    hd: 2,
-                    tl: {
-                      hd: 3,
-                      tl: /* [] */0
-                    }
-                  }
-                },
-                _1: Stdlib__Array.to_list([
-                      1,
-                      2,
-                      3
-                    ])
-              };
+          TAG: /* Eq */0,
+          _0: {
+            hd: 1,
+            tl: {
+              hd: 2,
+              tl: {
+                hd: 3,
+                tl: /* [] */0
+              }
+            }
+          },
+          _1: Stdlib__Array.to_list([
+                1,
+                2,
+                3
+              ])
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/test_array_primitive.js b/jscomp/test/dist/jscomp/test/test_array_primitive.js
index 5e0be1292..d4cb4cbc0 100644
--- a/jscomp/test/dist/jscomp/test/test_array_primitive.js
+++ b/jscomp/test/dist/jscomp/test/test_array_primitive.js
@@ -15,9 +15,9 @@ function caml_array_sub(x, offset, len) {
 function caml_array_set(xs, index, newval) {
   if (index < 0 || index >= xs.length) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "index out of bounds"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "index out of bounds"
+        });
   }
   Caml_array.set(xs, index, newval);
 }
@@ -25,9 +25,9 @@ function caml_array_set(xs, index, newval) {
 function caml_array_get(xs, index) {
   if (index < 0 || index >= xs.length) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "index out of bounds"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "index out of bounds"
+        });
   }
   return Caml_array.get(xs, index);
 }
diff --git a/jscomp/test/dist/jscomp/test/test_bool_equal.js b/jscomp/test/dist/jscomp/test/test_bool_equal.js
index 010d71526..e62d417e7 100644
--- a/jscomp/test/dist/jscomp/test/test_bool_equal.js
+++ b/jscomp/test/dist/jscomp/test/test_bool_equal.js
@@ -21,45 +21,45 @@ function bool_equal(x, y) {
 function assertions(param) {
   if (true !== true) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/test_bool_equal.ml",
-                25,
-                2
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/test_bool_equal.ml",
+            25,
+            2
+          ]
+        });
   }
   if (false !== false) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/test_bool_equal.ml",
-                26,
-                2
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/test_bool_equal.ml",
+            26,
+            2
+          ]
+        });
   }
   if (true === false) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/test_bool_equal.ml",
-                27,
-                2
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/test_bool_equal.ml",
+            27,
+            2
+          ]
+        });
   }
   if (false !== true) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/test_bool_equal.ml",
-              28,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/test_bool_equal.ml",
+          28,
+          2
+        ]
+      });
 }
 
 function f0(x) {
diff --git a/jscomp/test/dist/jscomp/test/test_closure.js b/jscomp/test/dist/jscomp/test/test_closure.js
index b7d180b43..93f308c9d 100644
--- a/jscomp/test/dist/jscomp/test/test_closure.js
+++ b/jscomp/test/dist/jscomp/test/test_closure.js
@@ -30,13 +30,13 @@ Stdlib__Array.iter((function (x) {
 
 if (v.contents !== 45) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/test_closure.ml",
-              53,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/test_closure.ml",
+          53,
+          2
+        ]
+      });
 }
 
 exports.v = v;
diff --git a/jscomp/test/dist/jscomp/test/test_demo.js b/jscomp/test/dist/jscomp/test/test_demo.js
index ecdf59c6a..51e1ed8e4 100644
--- a/jscomp/test/dist/jscomp/test/test_demo.js
+++ b/jscomp/test/dist/jscomp/test/test_demo.js
@@ -14,10 +14,10 @@ function fib(n) {
 
 function cons(x, y) {
   return {
-          TAG: /* Cons */0,
-          _0: x,
-          _1: y
-        };
+    TAG: /* Cons */0,
+    _0: x,
+    _1: y
+  };
 }
 
 function map(f, param) {
@@ -25,10 +25,10 @@ function map(f, param) {
     return /* Nil */0;
   } else {
     return {
-            TAG: /* Cons */0,
-            _0: Curry._1(f, param._0),
-            _1: map(f, param._1)
-          };
+      TAG: /* Cons */0,
+      _0: Curry._1(f, param._0),
+      _1: map(f, param._1)
+    };
   }
 }
 
diff --git a/jscomp/test/dist/jscomp/test/test_exception.js b/jscomp/test/dist/jscomp/test/test_exception.js
index 1b6eb5716..26886c3d7 100644
--- a/jscomp/test/dist/jscomp/test/test_exception.js
+++ b/jscomp/test/dist/jscomp/test/test_exception.js
@@ -10,35 +10,35 @@ const Local = /* @__PURE__ */Caml_exceptions.create("Test_exception.Local");
 
 function f(param) {
   throw new Caml_js_exceptions.MelangeError(Local, {
-            MEL_EXN_ID: Local,
-            _1: 3
-          });
+        MEL_EXN_ID: Local,
+        _1: 3
+      });
 }
 
 function g(param) {
   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-            MEL_EXN_ID: Stdlib.Not_found
-          });
+        MEL_EXN_ID: Stdlib.Not_found
+      });
 }
 
 function h(param) {
   throw new Caml_js_exceptions.MelangeError(Test_common.U, {
-            MEL_EXN_ID: Test_common.U,
-            _1: 3
-          });
+        MEL_EXN_ID: Test_common.U,
+        _1: 3
+      });
 }
 
 function x(param) {
   throw new Caml_js_exceptions.MelangeError(Test_common.H, {
-            MEL_EXN_ID: Test_common.H
-          });
+        MEL_EXN_ID: Test_common.H
+      });
 }
 
 function xx(param) {
   throw new Caml_js_exceptions.MelangeError(Stdlib.Invalid_argument, {
-            MEL_EXN_ID: Stdlib.Invalid_argument,
-            _1: "x"
-          });
+        MEL_EXN_ID: Stdlib.Invalid_argument,
+        _1: "x"
+      });
 }
 
 const Nullary = /* @__PURE__ */Caml_exceptions.create("Test_exception.Nullary");
diff --git a/jscomp/test/dist/jscomp/test/test_exception_escape.js b/jscomp/test/dist/jscomp/test/test_exception_escape.js
index 167486ca1..4dff8890a 100644
--- a/jscomp/test/dist/jscomp/test/test_exception_escape.js
+++ b/jscomp/test/dist/jscomp/test/test_exception_escape.js
@@ -10,9 +10,9 @@ let f;
 
 try {
   throw new Caml_js_exceptions.MelangeError(A, {
-            MEL_EXN_ID: A,
-            _1: 3
-          });
+        MEL_EXN_ID: A,
+        _1: 3
+      });
 }
 catch (exn){
   f = 3;
diff --git a/jscomp/test/dist/jscomp/test/test_fib.js b/jscomp/test/dist/jscomp/test/test_fib.js
index 3a4fa5b1b..a16c32881 100644
--- a/jscomp/test/dist/jscomp/test/test_fib.js
+++ b/jscomp/test/dist/jscomp/test/test_fib.js
@@ -37,10 +37,10 @@ const sumdown = v$1;
 
 function cons(x, y) {
   return {
-          TAG: /* Cons */0,
-          _0: x,
-          _1: y
-        };
+    TAG: /* Cons */0,
+    _0: x,
+    _1: y
+  };
 }
 
 function length(x) {
@@ -56,10 +56,10 @@ function map(f, x) {
     return /* Nil */0;
   } else {
     return {
-            TAG: /* Cons */0,
-            _0: Curry._1(f, x._0),
-            _1: map(f, x._1)
-          };
+      TAG: /* Cons */0,
+      _0: Curry._1(f, x._0),
+      _1: map(f, x._1)
+    };
   }
 }
 
diff --git a/jscomp/test/dist/jscomp/test/test_for_map.js b/jscomp/test/dist/jscomp/test/test_for_map.js
index 0770b28b3..e01f7c5a7 100644
--- a/jscomp/test/dist/jscomp/test/test_for_map.js
+++ b/jscomp/test/dist/jscomp/test/test_for_map.js
@@ -27,24 +27,24 @@ function create(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function singleton(x, d) {
   return {
-          TAG: /* Node */0,
-          l: /* Empty */0,
-          v: x,
-          d: d,
-          r: /* Empty */0,
-          h: 1
-        };
+    TAG: /* Node */0,
+    l: /* Empty */0,
+    v: x,
+    d: d,
+    r: /* Empty */0,
+    h: 1
+  };
 }
 
 function bal(l, x, d, r) {
@@ -55,9 +55,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -70,25 +70,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -101,9 +101,9 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function is_empty(param) {
@@ -117,13 +117,13 @@ function is_empty(param) {
 function add(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -135,13 +135,13 @@ function add(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -165,8 +165,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg.compare, x, param.v);
     if (c === 0) {
@@ -182,8 +182,8 @@ function find_first(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -196,9 +196,9 @@ function find_first(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -233,9 +233,9 @@ function find_first_opt(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -258,8 +258,8 @@ function find_last(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -272,9 +272,9 @@ function find_last(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -309,9 +309,9 @@ function find_last_opt(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -364,15 +364,15 @@ function min_binding(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -388,9 +388,9 @@ function min_binding_opt(_param) {
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -402,15 +402,15 @@ function max_binding(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = param.r;
     continue ;
@@ -426,9 +426,9 @@ function max_binding_opt(_param) {
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = param.r;
     continue ;
@@ -438,9 +438,9 @@ function max_binding_opt(_param) {
 function remove_min_binding(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.remove_min_elt"
+        });
   }
   const l = param.l;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -494,13 +494,13 @@ function update(x, f, m) {
     const data = Curry._1(f, undefined);
     if (data !== undefined) {
       return {
-              TAG: /* Node */0,
-              l: /* Empty */0,
-              v: x,
-              d: Caml_option.valFromOption(data),
-              r: /* Empty */0,
-              h: 1
-            };
+        TAG: /* Node */0,
+        l: /* Empty */0,
+        v: x,
+        d: Caml_option.valFromOption(data),
+        r: /* Empty */0,
+        h: 1
+      };
     } else {
       return /* Empty */0;
     }
@@ -520,13 +520,13 @@ function update(x, f, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data$2,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data$2,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -549,14 +549,14 @@ function add_to_list(x, data, m) {
   const add = function (l) {
     if (l !== undefined) {
       return {
-              hd: data,
-              tl: l
-            };
+        hd: data,
+        tl: l
+      };
     } else {
       return {
-              hd: data,
-              tl: /* [] */0
-            };
+        hd: data,
+        tl: /* [] */0
+      };
     }
   };
   return update(x, add, m);
@@ -583,13 +583,13 @@ function map(f, param) {
   const d$p = Curry._1(f, param.d);
   const r$p = map(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: param.v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: param.v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function mapi(f, param) {
@@ -601,13 +601,13 @@ function mapi(f, param) {
   const d$p = Curry._2(f, v, param.d);
   const r$p = mapi(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function fold(f, _m, _accu) {
@@ -713,10 +713,10 @@ function concat_or_join(t1, v, d, t2) {
 function split(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            undefined,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      undefined,
+      /* Empty */0
+    ];
   }
   const r = param.r;
   const d = param.d;
@@ -725,25 +725,25 @@ function split(x, param) {
   const 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) {
     const 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)
+    ];
   }
   const 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) {
@@ -762,13 +762,13 @@ function merge$1(f, s1, s2) {
   }
   if (/* tag */typeof s2 === "number" || typeof s2 === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/stdlib/map.ml",
-                408,
-                10
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/stdlib/map.ml",
+            408,
+            10
+          ]
+        });
   }
   const v2 = s2.v;
   const match$1 = split(v2, s1);
@@ -848,9 +848,9 @@ function filter_map(f, param) {
 function partition(p, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      /* Empty */0
+    ];
   }
   const d = param.d;
   const v = param.v;
@@ -863,14 +863,14 @@ function partition(p, param) {
   const 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)
+    ];
   }
 }
 
@@ -984,14 +984,14 @@ function bindings(s) {
 
 function of_list(bs) {
   return Stdlib__List.fold_left((function (m, param) {
-                return add(param[0], param[1], m);
-              }), /* Empty */0, bs);
+          return add(param[0], param[1], m);
+        }), /* Empty */0, bs);
 }
 
 function add_seq(i, m) {
   return Stdlib__Seq.fold_left((function (m, param) {
-                return add(param[0], param[1], m);
-              }), m, i);
+          return add(param[0], param[1], m);
+        }), m, i);
 }
 
 function of_seq(i) {
@@ -1004,15 +1004,15 @@ function seq_of_enum_(c, param) {
   }
   const partial_arg = cons_enum(c._2, c._3);
   return {
-          TAG: /* Cons */0,
-          _0: [
-            c._0,
-            c._1
-          ],
-          _1: (function (param) {
-              return seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: [
+      c._0,
+      c._1
+    ],
+    _1: (function (param) {
+        return seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_seq(m) {
@@ -1047,15 +1047,15 @@ function rev_seq_of_enum_(c, param) {
   }
   const partial_arg = snoc_enum(c._2, c._3);
   return {
-          TAG: /* Cons */0,
-          _0: [
-            c._0,
-            c._1
-          ],
-          _1: (function (param) {
-              return rev_seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: [
+      c._0,
+      c._1
+    ],
+    _1: (function (param) {
+        return rev_seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_rev_seq(c) {
@@ -1079,12 +1079,12 @@ function to_seq_from(low, m) {
       const n = Curry._2(funarg.compare, v, low);
       if (n === 0) {
         return {
-                TAG: /* More */0,
-                _0: v,
-                _1: d,
-                _2: r,
-                _3: c
-              };
+          TAG: /* More */0,
+          _0: v,
+          _1: d,
+          _2: r,
+          _3: c
+        };
       }
       if (n < 0) {
         _m = r;
diff --git a/jscomp/test/dist/jscomp/test/test_formatter.js b/jscomp/test/dist/jscomp/test/test_formatter.js
index afc23a07a..4eae1f0c2 100644
--- a/jscomp/test/dist/jscomp/test/test_formatter.js
+++ b/jscomp/test/dist/jscomp/test/test_formatter.js
@@ -4,20 +4,20 @@
 
 function f(param) {
   return {
-          TAG: /* Format */0,
-          _0: {
-            TAG: /* Int */4,
-            _0: /* Int_d */0,
-            _1: /* No_padding */0,
-            _2: /* No_precision */0,
-            _3: {
-              TAG: /* String */2,
-              _0: /* No_padding */0,
-              _1: /* End_of_format */0
-            }
-          },
-          _1: "%d%s"
-        };
+    TAG: /* Format */0,
+    _0: {
+      TAG: /* Int */4,
+      _0: /* Int_d */0,
+      _1: /* No_padding */0,
+      _2: /* No_precision */0,
+      _3: {
+        TAG: /* String */2,
+        _0: /* No_padding */0,
+        _1: /* End_of_format */0
+      }
+    },
+    _1: "%d%s"
+  };
 }
 
 exports.f = f;
diff --git a/jscomp/test/dist/jscomp/test/test_generative_module.js b/jscomp/test/dist/jscomp/test/test_generative_module.js
index 65eb165a4..87aeda185 100644
--- a/jscomp/test/dist/jscomp/test/test_generative_module.js
+++ b/jscomp/test/dist/jscomp/test/test_generative_module.js
@@ -4,8 +4,8 @@
 
 function M($star) {
   return {
-          v: 3
-        };
+    v: 3
+  };
 }
 
 const V = {
diff --git a/jscomp/test/dist/jscomp/test/test_http_server.js b/jscomp/test/dist/jscomp/test/test_http_server.js
index d502e218c..718131ab3 100644
--- a/jscomp/test/dist/jscomp/test/test_http_server.js
+++ b/jscomp/test/dist/jscomp/test/test_http_server.js
@@ -12,8 +12,8 @@ function create_server(http) {
         return resp.end("Hello world\n");
       });
   return server.listen(3000, hostname, (function () {
-                console.log("Server running at http://" + (hostname + (":" + (String(3000) + "/"))));
-              }));
+          console.log("Server running at http://" + (hostname + (":" + (String(3000) + "/"))));
+        }));
 }
 
 create_server(Http);
diff --git a/jscomp/test/dist/jscomp/test/test_include.js b/jscomp/test/dist/jscomp/test/test_include.js
index c78e83ee3..f3401337f 100644
--- a/jscomp/test/dist/jscomp/test/test_include.js
+++ b/jscomp/test/dist/jscomp/test/test_include.js
@@ -8,9 +8,9 @@ const Test_order = require("./test_order.js");
 function Make(U) {
   const compare = U.compare;
   return {
-          compare: compare,
-          v: compare
-        };
+    compare: compare,
+    v: compare
+  };
 }
 
 const X = {
diff --git a/jscomp/test/dist/jscomp/test/test_incomplete.js b/jscomp/test/dist/jscomp/test/test_incomplete.js
index 113c77537..2c3a828a4 100644
--- a/jscomp/test/dist/jscomp/test/test_incomplete.js
+++ b/jscomp/test/dist/jscomp/test/test_incomplete.js
@@ -8,13 +8,13 @@ function f(x) {
     return /* 'a' */97;
   }
   throw new Caml_js_exceptions.MelangeError("Match_failure", {
-            MEL_EXN_ID: "Match_failure",
-            _1: [
-              "jscomp/test/test_incomplete.ml",
-              3,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Match_failure",
+        _1: [
+          "jscomp/test/test_incomplete.ml",
+          3,
+          2
+        ]
+      });
 }
 
 function f2(x) {
diff --git a/jscomp/test/dist/jscomp/test/test_int_map_find.js b/jscomp/test/dist/jscomp/test/test_int_map_find.js
index 60e0ceb61..7af2c1733 100644
--- a/jscomp/test/dist/jscomp/test/test_int_map_find.js
+++ b/jscomp/test/dist/jscomp/test/test_int_map_find.js
@@ -24,13 +24,13 @@ function create(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -41,9 +41,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -56,25 +56,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -87,21 +87,21 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -113,13 +113,13 @@ function add(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
diff --git a/jscomp/test/dist/jscomp/test/test_internalOO.js b/jscomp/test/dist/jscomp/test/test_internalOO.js
index b2c276db4..d81ffd4ed 100644
--- a/jscomp/test/dist/jscomp/test/test_internalOO.js
+++ b/jscomp/test/dist/jscomp/test/test_internalOO.js
@@ -61,24 +61,24 @@ function create(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function singleton(x, d) {
   return {
-          TAG: /* Node */0,
-          l: /* Empty */0,
-          v: x,
-          d: d,
-          r: /* Empty */0,
-          h: 1
-        };
+    TAG: /* Node */0,
+    l: /* Empty */0,
+    v: x,
+    d: d,
+    r: /* Empty */0,
+    h: 1
+  };
 }
 
 function bal(l, x, d, r) {
@@ -89,9 +89,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -104,25 +104,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -135,9 +135,9 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function is_empty(param) {
@@ -151,13 +151,13 @@ function is_empty(param) {
 function add(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -169,13 +169,13 @@ function add(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -199,8 +199,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg.compare, x, param.v);
     if (c === 0) {
@@ -216,8 +216,8 @@ function find_first(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -230,9 +230,9 @@ function find_first(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -267,9 +267,9 @@ function find_first_opt(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -292,8 +292,8 @@ function find_last(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -306,9 +306,9 @@ function find_last(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -343,9 +343,9 @@ function find_last_opt(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -398,15 +398,15 @@ function min_binding(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -422,9 +422,9 @@ function min_binding_opt(_param) {
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -436,15 +436,15 @@ function max_binding(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = param.r;
     continue ;
@@ -460,9 +460,9 @@ function max_binding_opt(_param) {
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = param.r;
     continue ;
@@ -472,9 +472,9 @@ function max_binding_opt(_param) {
 function remove_min_binding(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.remove_min_elt"
+        });
   }
   const l = param.l;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -528,13 +528,13 @@ function update(x, f, m) {
     const data = Curry._1(f, undefined);
     if (data !== undefined) {
       return {
-              TAG: /* Node */0,
-              l: /* Empty */0,
-              v: x,
-              d: Caml_option.valFromOption(data),
-              r: /* Empty */0,
-              h: 1
-            };
+        TAG: /* Node */0,
+        l: /* Empty */0,
+        v: x,
+        d: Caml_option.valFromOption(data),
+        r: /* Empty */0,
+        h: 1
+      };
     } else {
       return /* Empty */0;
     }
@@ -554,13 +554,13 @@ function update(x, f, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data$2,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data$2,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -583,14 +583,14 @@ function add_to_list(x, data, m) {
   const add = function (l) {
     if (l !== undefined) {
       return {
-              hd: data,
-              tl: l
-            };
+        hd: data,
+        tl: l
+      };
     } else {
       return {
-              hd: data,
-              tl: /* [] */0
-            };
+        hd: data,
+        tl: /* [] */0
+      };
     }
   };
   return update(x, add, m);
@@ -617,13 +617,13 @@ function map(f, param) {
   const d$p = Curry._1(f, param.d);
   const r$p = map(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: param.v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: param.v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function mapi(f, param) {
@@ -635,13 +635,13 @@ function mapi(f, param) {
   const d$p = Curry._2(f, v, param.d);
   const r$p = mapi(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function fold(f, _m, _accu) {
@@ -747,10 +747,10 @@ function concat_or_join(t1, v, d, t2) {
 function split(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            undefined,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      undefined,
+      /* Empty */0
+    ];
   }
   const r = param.r;
   const d = param.d;
@@ -759,25 +759,25 @@ function split(x, param) {
   const 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) {
     const 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)
+    ];
   }
   const 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) {
@@ -796,13 +796,13 @@ function merge$1(f, s1, s2) {
   }
   if (/* tag */typeof s2 === "number" || typeof s2 === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/stdlib/map.ml",
-                408,
-                10
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/stdlib/map.ml",
+            408,
+            10
+          ]
+        });
   }
   const v2 = s2.v;
   const match$1 = split(v2, s1);
@@ -882,9 +882,9 @@ function filter_map(f, param) {
 function partition(p, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      /* Empty */0
+    ];
   }
   const d = param.d;
   const v = param.v;
@@ -897,14 +897,14 @@ function partition(p, param) {
   const 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)
+    ];
   }
 }
 
@@ -1018,14 +1018,14 @@ function bindings(s) {
 
 function of_list(bs) {
   return Stdlib__List.fold_left((function (m, param) {
-                return add(param[0], param[1], m);
-              }), /* Empty */0, bs);
+          return add(param[0], param[1], m);
+        }), /* Empty */0, bs);
 }
 
 function add_seq(i, m) {
   return Stdlib__Seq.fold_left((function (m, param) {
-                return add(param[0], param[1], m);
-              }), m, i);
+          return add(param[0], param[1], m);
+        }), m, i);
 }
 
 function of_seq(i) {
@@ -1038,15 +1038,15 @@ function seq_of_enum_(c, param) {
   }
   const partial_arg = cons_enum(c._2, c._3);
   return {
-          TAG: /* Cons */0,
-          _0: [
-            c._0,
-            c._1
-          ],
-          _1: (function (param) {
-              return seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: [
+      c._0,
+      c._1
+    ],
+    _1: (function (param) {
+        return seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_seq(m) {
@@ -1081,15 +1081,15 @@ function rev_seq_of_enum_(c, param) {
   }
   const partial_arg = snoc_enum(c._2, c._3);
   return {
-          TAG: /* Cons */0,
-          _0: [
-            c._0,
-            c._1
-          ],
-          _1: (function (param) {
-              return rev_seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: [
+      c._0,
+      c._1
+    ],
+    _1: (function (param) {
+        return rev_seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_rev_seq(c) {
@@ -1113,12 +1113,12 @@ function to_seq_from(low, m) {
       const n = Curry._2(funarg.compare, v, low);
       if (n === 0) {
         return {
-                TAG: /* More */0,
-                _0: v,
-                _1: d,
-                _2: r,
-                _3: c
-              };
+          TAG: /* More */0,
+          _0: v,
+          _1: d,
+          _2: r,
+          _3: c
+        };
       }
       if (n < 0) {
         _m = r;
@@ -1205,24 +1205,24 @@ function create$1(l, x, d, r) {
   const hl = height$1(l);
   const hr = height$1(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function singleton$1(x, d) {
   return {
-          TAG: /* Node */0,
-          l: /* Empty */0,
-          v: x,
-          d: d,
-          r: /* Empty */0,
-          h: 1
-        };
+    TAG: /* Node */0,
+    l: /* Empty */0,
+    v: x,
+    d: d,
+    r: /* Empty */0,
+    h: 1
+  };
 }
 
 function bal$1(l, x, d, r) {
@@ -1233,9 +1233,9 @@ function bal$1(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -1248,25 +1248,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -1279,9 +1279,9 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function is_empty$1(param) {
@@ -1295,13 +1295,13 @@ function is_empty$1(param) {
 function add$1(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -1313,13 +1313,13 @@ function add$1(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -1343,8 +1343,8 @@ function find$1(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg$1.compare, x, param.v);
     if (c === 0) {
@@ -1360,8 +1360,8 @@ function find_first$1(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -1374,9 +1374,9 @@ function find_first$1(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -1411,9 +1411,9 @@ function find_first_opt$1(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -1436,8 +1436,8 @@ function find_last$1(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -1450,9 +1450,9 @@ function find_last$1(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -1487,9 +1487,9 @@ function find_last_opt$1(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -1542,15 +1542,15 @@ function min_binding$1(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -1566,9 +1566,9 @@ function min_binding_opt$1(_param) {
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -1580,15 +1580,15 @@ function max_binding$1(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = param.r;
     continue ;
@@ -1604,9 +1604,9 @@ function max_binding_opt$1(_param) {
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = param.r;
     continue ;
@@ -1616,9 +1616,9 @@ function max_binding_opt$1(_param) {
 function remove_min_binding$1(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.remove_min_elt"
+        });
   }
   const l = param.l;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -1672,13 +1672,13 @@ function update$1(x, f, m) {
     const data = Curry._1(f, undefined);
     if (data !== undefined) {
       return {
-              TAG: /* Node */0,
-              l: /* Empty */0,
-              v: x,
-              d: Caml_option.valFromOption(data),
-              r: /* Empty */0,
-              h: 1
-            };
+        TAG: /* Node */0,
+        l: /* Empty */0,
+        v: x,
+        d: Caml_option.valFromOption(data),
+        r: /* Empty */0,
+        h: 1
+      };
     } else {
       return /* Empty */0;
     }
@@ -1698,13 +1698,13 @@ function update$1(x, f, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data$2,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data$2,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -1727,14 +1727,14 @@ function add_to_list$1(x, data, m) {
   const add = function (l) {
     if (l !== undefined) {
       return {
-              hd: data,
-              tl: l
-            };
+        hd: data,
+        tl: l
+      };
     } else {
       return {
-              hd: data,
-              tl: /* [] */0
-            };
+        hd: data,
+        tl: /* [] */0
+      };
     }
   };
   return update$1(x, add, m);
@@ -1761,13 +1761,13 @@ function map$1(f, param) {
   const d$p = Curry._1(f, param.d);
   const r$p = map$1(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: param.v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: param.v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function mapi$1(f, param) {
@@ -1779,13 +1779,13 @@ function mapi$1(f, param) {
   const d$p = Curry._2(f, v, param.d);
   const r$p = mapi$1(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function fold$1(f, _m, _accu) {
@@ -1891,10 +1891,10 @@ function concat_or_join$1(t1, v, d, t2) {
 function split$1(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            undefined,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      undefined,
+      /* Empty */0
+    ];
   }
   const r = param.r;
   const d = param.d;
@@ -1903,25 +1903,25 @@ function split$1(x, param) {
   const c = Curry._2(funarg$1.compare, x, v);
   if (c === 0) {
     return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
+      l,
+      Caml_option.some(d),
+      r
+    ];
   }
   if (c < 0) {
     const 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)
+    ];
   }
   const 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$3(f, s1, s2) {
@@ -1940,13 +1940,13 @@ function merge$3(f, s1, s2) {
   }
   if (/* tag */typeof s2 === "number" || typeof s2 === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/stdlib/map.ml",
-                408,
-                10
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/stdlib/map.ml",
+            408,
+            10
+          ]
+        });
   }
   const v2 = s2.v;
   const match$1 = split$1(v2, s1);
@@ -2026,9 +2026,9 @@ function filter_map$1(f, param) {
 function partition$1(p, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      /* Empty */0
+    ];
   }
   const d = param.d;
   const v = param.v;
@@ -2041,14 +2041,14 @@ function partition$1(p, param) {
   const 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)
+    ];
   }
 }
 
@@ -2162,14 +2162,14 @@ function bindings$1(s) {
 
 function of_list$1(bs) {
   return Stdlib__List.fold_left((function (m, param) {
-                return add$1(param[0], param[1], m);
-              }), /* Empty */0, bs);
+          return add$1(param[0], param[1], m);
+        }), /* Empty */0, bs);
 }
 
 function add_seq$1(i, m) {
   return Stdlib__Seq.fold_left((function (m, param) {
-                return add$1(param[0], param[1], m);
-              }), m, i);
+          return add$1(param[0], param[1], m);
+        }), m, i);
 }
 
 function of_seq$1(i) {
@@ -2182,15 +2182,15 @@ function seq_of_enum_$1(c, param) {
   }
   const partial_arg = cons_enum$1(c._2, c._3);
   return {
-          TAG: /* Cons */0,
-          _0: [
-            c._0,
-            c._1
-          ],
-          _1: (function (param) {
-              return seq_of_enum_$1(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: [
+      c._0,
+      c._1
+    ],
+    _1: (function (param) {
+        return seq_of_enum_$1(partial_arg, param);
+      })
+  };
 }
 
 function to_seq$1(m) {
@@ -2225,15 +2225,15 @@ function rev_seq_of_enum_$1(c, param) {
   }
   const partial_arg = snoc_enum$1(c._2, c._3);
   return {
-          TAG: /* Cons */0,
-          _0: [
-            c._0,
-            c._1
-          ],
-          _1: (function (param) {
-              return rev_seq_of_enum_$1(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: [
+      c._0,
+      c._1
+    ],
+    _1: (function (param) {
+        return rev_seq_of_enum_$1(partial_arg, param);
+      })
+  };
 }
 
 function to_rev_seq$1(c) {
@@ -2257,12 +2257,12 @@ function to_seq_from$1(low, m) {
       const n = Curry._2(funarg$1.compare, v, low);
       if (n === 0) {
         return {
-                TAG: /* More */0,
-                _0: v,
-                _1: d,
-                _2: r,
-                _3: c
-              };
+          TAG: /* More */0,
+          _0: v,
+          _1: d,
+          _2: r,
+          _3: c
+        };
       }
       if (n < 0) {
         _m = r;
@@ -2349,24 +2349,24 @@ function create$2(l, x, d, r) {
   const hl = height$2(l);
   const hr = height$2(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function singleton$2(x, d) {
   return {
-          TAG: /* Node */0,
-          l: /* Empty */0,
-          v: x,
-          d: d,
-          r: /* Empty */0,
-          h: 1
-        };
+    TAG: /* Node */0,
+    l: /* Empty */0,
+    v: x,
+    d: d,
+    r: /* Empty */0,
+    h: 1
+  };
 }
 
 function bal$2(l, x, d, r) {
@@ -2377,9 +2377,9 @@ function bal$2(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -2392,25 +2392,25 @@ function bal$2(l, x, d, r) {
       return create$2(create$2(ll, lv, ld, lr.l), lr.v, lr.d, create$2(lr.r, x, d, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -2423,9 +2423,9 @@ function bal$2(l, x, d, r) {
     return create$2(create$2(l, x, d, rl.l), rl.v, rl.d, create$2(rl.r, rv, rd, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function is_empty$2(param) {
@@ -2439,13 +2439,13 @@ function is_empty$2(param) {
 function add$2(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -2457,13 +2457,13 @@ function add$2(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -2487,8 +2487,8 @@ function find$2(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg$2.compare, x, param.v);
     if (c === 0) {
@@ -2504,8 +2504,8 @@ function find_first$2(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -2518,9 +2518,9 @@ function find_first$2(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -2555,9 +2555,9 @@ function find_first_opt$2(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -2580,8 +2580,8 @@ function find_last$2(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -2594,9 +2594,9 @@ function find_last$2(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -2631,9 +2631,9 @@ function find_last_opt$2(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -2686,15 +2686,15 @@ function min_binding$2(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -2710,9 +2710,9 @@ function min_binding_opt$2(_param) {
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -2724,15 +2724,15 @@ function max_binding$2(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = param.r;
     continue ;
@@ -2748,9 +2748,9 @@ function max_binding_opt$2(_param) {
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = param.r;
     continue ;
@@ -2760,9 +2760,9 @@ function max_binding_opt$2(_param) {
 function remove_min_binding$2(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.remove_min_elt"
+        });
   }
   const l = param.l;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -2816,13 +2816,13 @@ function update$2(x, f, m) {
     const data = Curry._1(f, undefined);
     if (data !== undefined) {
       return {
-              TAG: /* Node */0,
-              l: /* Empty */0,
-              v: x,
-              d: Caml_option.valFromOption(data),
-              r: /* Empty */0,
-              h: 1
-            };
+        TAG: /* Node */0,
+        l: /* Empty */0,
+        v: x,
+        d: Caml_option.valFromOption(data),
+        r: /* Empty */0,
+        h: 1
+      };
     } else {
       return /* Empty */0;
     }
@@ -2842,13 +2842,13 @@ function update$2(x, f, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data$2,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data$2,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -2871,14 +2871,14 @@ function add_to_list$2(x, data, m) {
   const add = function (l) {
     if (l !== undefined) {
       return {
-              hd: data,
-              tl: l
-            };
+        hd: data,
+        tl: l
+      };
     } else {
       return {
-              hd: data,
-              tl: /* [] */0
-            };
+        hd: data,
+        tl: /* [] */0
+      };
     }
   };
   return update$2(x, add, m);
@@ -2905,13 +2905,13 @@ function map$2(f, param) {
   const d$p = Curry._1(f, param.d);
   const r$p = map$2(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: param.v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: param.v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function mapi$2(f, param) {
@@ -2923,13 +2923,13 @@ function mapi$2(f, param) {
   const d$p = Curry._2(f, v, param.d);
   const r$p = mapi$2(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function fold$2(f, _m, _accu) {
@@ -3035,10 +3035,10 @@ function concat_or_join$2(t1, v, d, t2) {
 function split$2(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            undefined,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      undefined,
+      /* Empty */0
+    ];
   }
   const r = param.r;
   const d = param.d;
@@ -3047,25 +3047,25 @@ function split$2(x, param) {
   const c = Curry._2(funarg$2.compare, x, v);
   if (c === 0) {
     return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
+      l,
+      Caml_option.some(d),
+      r
+    ];
   }
   if (c < 0) {
     const match = split$2(x, l);
     return [
-            match[0],
-            match[1],
-            join$2(match[2], v, d, r)
-          ];
+      match[0],
+      match[1],
+      join$2(match[2], v, d, r)
+    ];
   }
   const match$1 = split$2(x, r);
   return [
-          join$2(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    join$2(l, v, d, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function merge$5(f, s1, s2) {
@@ -3084,13 +3084,13 @@ function merge$5(f, s1, s2) {
   }
   if (/* tag */typeof s2 === "number" || typeof s2 === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/stdlib/map.ml",
-                408,
-                10
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/stdlib/map.ml",
+            408,
+            10
+          ]
+        });
   }
   const v2 = s2.v;
   const match$1 = split$2(v2, s1);
@@ -3170,9 +3170,9 @@ function filter_map$2(f, param) {
 function partition$2(p, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      /* Empty */0
+    ];
   }
   const d = param.d;
   const v = param.v;
@@ -3185,14 +3185,14 @@ function partition$2(p, param) {
   const rt = match$1[0];
   if (pvd) {
     return [
-            join$2(lt, v, d, rt),
-            concat$2(lf, rf)
-          ];
+      join$2(lt, v, d, rt),
+      concat$2(lf, rf)
+    ];
   } else {
     return [
-            concat$2(lt, rt),
-            join$2(lf, v, d, rf)
-          ];
+      concat$2(lt, rt),
+      join$2(lf, v, d, rf)
+    ];
   }
 }
 
@@ -3306,14 +3306,14 @@ function bindings$2(s) {
 
 function of_list$2(bs) {
   return Stdlib__List.fold_left((function (m, param) {
-                return add$2(param[0], param[1], m);
-              }), /* Empty */0, bs);
+          return add$2(param[0], param[1], m);
+        }), /* Empty */0, bs);
 }
 
 function add_seq$2(i, m) {
   return Stdlib__Seq.fold_left((function (m, param) {
-                return add$2(param[0], param[1], m);
-              }), m, i);
+          return add$2(param[0], param[1], m);
+        }), m, i);
 }
 
 function of_seq$2(i) {
@@ -3326,15 +3326,15 @@ function seq_of_enum_$2(c, param) {
   }
   const partial_arg = cons_enum$2(c._2, c._3);
   return {
-          TAG: /* Cons */0,
-          _0: [
-            c._0,
-            c._1
-          ],
-          _1: (function (param) {
-              return seq_of_enum_$2(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: [
+      c._0,
+      c._1
+    ],
+    _1: (function (param) {
+        return seq_of_enum_$2(partial_arg, param);
+      })
+  };
 }
 
 function to_seq$2(m) {
@@ -3369,15 +3369,15 @@ function rev_seq_of_enum_$2(c, param) {
   }
   const partial_arg = snoc_enum$2(c._2, c._3);
   return {
-          TAG: /* Cons */0,
-          _0: [
-            c._0,
-            c._1
-          ],
-          _1: (function (param) {
-              return rev_seq_of_enum_$2(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: [
+      c._0,
+      c._1
+    ],
+    _1: (function (param) {
+        return rev_seq_of_enum_$2(partial_arg, param);
+      })
+  };
 }
 
 function to_rev_seq$2(c) {
@@ -3401,12 +3401,12 @@ function to_seq_from$2(low, m) {
       const n = Curry._2(funarg$2.compare, v, low);
       if (n === 0) {
         return {
-                TAG: /* More */0,
-                _0: v,
-                _1: d,
-                _2: r,
-                _3: c
-              };
+          TAG: /* More */0,
+          _0: v,
+          _1: d,
+          _2: r,
+          _3: c
+        };
       }
       if (n < 0) {
         _m = r;
@@ -3508,15 +3508,15 @@ function new_table(pub_labels) {
     Caml_array.set(methods, (i << 1) + 3 | 0, Caml_array.get(pub_labels, i));
   }
   return {
-          size: 2,
-          methods: methods,
-          methods_by_name: /* Empty */0,
-          methods_by_label: /* Empty */0,
-          previous_states: /* [] */0,
-          hidden_meths: /* [] */0,
-          vars: /* Empty */0,
-          initializers: /* [] */0
-        };
+    size: 2,
+    methods: methods,
+    methods_by_name: /* Empty */0,
+    methods_by_label: /* Empty */0,
+    previous_states: /* [] */0,
+    hidden_meths: /* [] */0,
+    vars: /* Empty */0,
+    initializers: /* [] */0
+  };
 }
 
 function resize(array, new_size) {
@@ -3566,8 +3566,8 @@ function get_method_label(table, name) {
 
 function get_method_labels(table, names) {
   return Stdlib__Array.map((function (param) {
-                return get_method_label(table, param);
-              }), names);
+          return get_method_label(table, param);
+        }), names);
 }
 
 function set_method(table, label, element) {
@@ -3668,9 +3668,9 @@ function narrow(table, vars, virt_meths, concr_meths) {
             return hm;
           } else {
             return {
-                    hd: met,
-                    tl: hm
-                  };
+              hd: met,
+              tl: hm
+            };
           }
         }), table.hidden_meths, /* [] */0);
 }
@@ -3689,9 +3689,9 @@ function widen(table) {
             return hm;
           } else {
             return {
-                    hd: met,
-                    tl: hm
-                  };
+              hd: met,
+              tl: hm
+            };
           }
         }), table.hidden_meths, match[2]);
 }
@@ -3749,13 +3749,13 @@ function get_variable(table, name) {
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Stdlib.Not_found) {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/test_internalOO.ml",
-                  280,
-                  50
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/test_internalOO.ml",
+              280,
+              50
+            ]
+          });
     }
     throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
   }
@@ -3763,8 +3763,8 @@ function get_variable(table, name) {
 
 function get_variables(table, names) {
   return Stdlib__Array.map((function (param) {
-                return get_variable(table, param);
-              }), names);
+          return get_variable(table, param);
+        }), names);
 }
 
 function add_initializer(table, f) {
@@ -3800,19 +3800,19 @@ function inherits(cla, vals, virt_meths, concr_meths, param, top) {
   const init = top ? Curry._2($$super, cla, param[3]) : Curry._1($$super, cla);
   widen(cla);
   return Caml_array.concat({
-              hd: [init],
-              tl: {
-                hd: Stdlib__Array.map((function (param) {
-                        return get_variable(cla, param);
-                      }), to_array(vals)),
-                tl: {
-                  hd: Stdlib__Array.map((function (nm) {
-                          return get_method(cla, get_method_label(cla, nm));
-                        }), to_array(concr_meths)),
-                  tl: /* [] */0
-                }
-              }
-            });
+        hd: [init],
+        tl: {
+          hd: Stdlib__Array.map((function (param) {
+                  return get_variable(cla, param);
+                }), to_array(vals)),
+          tl: {
+            hd: Stdlib__Array.map((function (nm) {
+                    return get_method(cla, get_method_label(cla, nm));
+                  }), to_array(concr_meths)),
+            tl: /* [] */0
+          }
+        }
+      });
 }
 
 function make_class(pub_meths, class_init) {
@@ -3820,11 +3820,11 @@ function make_class(pub_meths, class_init) {
   const env_init = Curry._1(class_init, table);
   init_class(table);
   return [
-          Curry._1(env_init, 0),
-          class_init,
-          env_init,
-          0
-        ];
+    Curry._1(env_init, 0),
+    class_init,
+    env_init,
+    0
+  ];
 }
 
 function make_class_store(pub_meths, class_init, init_table) {
@@ -3838,16 +3838,16 @@ function make_class_store(pub_meths, class_init, init_table) {
 function dummy_class(loc) {
   const undef = function (param) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Undefined_recursive_module, {
-              MEL_EXN_ID: Stdlib.Undefined_recursive_module,
-              _1: loc
-            });
+          MEL_EXN_ID: Stdlib.Undefined_recursive_module,
+          _1: loc
+        });
   };
   return [
-          undef,
-          undef,
-          undef,
-          0
-        ];
+    undef,
+    undef,
+    undef,
+    0
+  ];
 }
 
 function iter_f(obj, _param) {
@@ -4232,10 +4232,10 @@ function set_methods(table, methods) {
 
 function stats(param) {
   return {
-          classes: table_count.contents,
-          methods: method_count.contents,
-          inst_vars: inst_var_count.contents
-        };
+    classes: table_count.contents,
+    methods: method_count.contents,
+    inst_vars: inst_var_count.contents
+  };
 }
 
 const initial_object_size = 2;
diff --git a/jscomp/test/dist/jscomp/test/test_list.js b/jscomp/test/dist/jscomp/test/test_list.js
index 756c58de9..481e86f5a 100644
--- a/jscomp/test/dist/jscomp/test/test_list.js
+++ b/jscomp/test/dist/jscomp/test/test_list.js
@@ -29,9 +29,9 @@ function hd(param) {
     return param.hd;
   }
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: "hd"
-          });
+        MEL_EXN_ID: "Failure",
+        _1: "hd"
+      });
 }
 
 function tl(param) {
@@ -39,17 +39,17 @@ function tl(param) {
     return param.tl;
   }
   throw new Caml_js_exceptions.MelangeError("Failure", {
-            MEL_EXN_ID: "Failure",
-            _1: "tl"
-          });
+        MEL_EXN_ID: "Failure",
+        _1: "tl"
+      });
 }
 
 function nth(l, n) {
   if (n < 0) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "List.nth"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "List.nth"
+        });
   }
   let _l = l;
   let _n = n;
@@ -65,9 +65,9 @@ function nth(l, n) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError("Failure", {
-              MEL_EXN_ID: "Failure",
-              _1: "nth"
-            });
+          MEL_EXN_ID: "Failure",
+          _1: "nth"
+        });
   };
 }
 
@@ -105,9 +105,9 @@ function map(f, param) {
   }
   const 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) {
@@ -116,9 +116,9 @@ function mapi(i, f, param) {
   }
   const 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) {
@@ -197,22 +197,22 @@ function map2(f, l1, l2) {
     if (l2) {
       const 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "List.map2"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "List.map2"
+        });
   }
   if (!l2) {
     return /* [] */0;
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "List.map2"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "List.map2"
+      });
 }
 
 function rev_map2(f, l1, l2) {
@@ -234,15 +234,15 @@ function rev_map2(f, l1, l2) {
         continue ;
       }
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "List.rev_map2"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "List.rev_map2"
+          });
     }
     if (l2$1) {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "List.rev_map2"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "List.rev_map2"
+          });
     }
     return accu;
   };
@@ -260,17 +260,17 @@ function iter2(f, _l1, _l2) {
         continue ;
       }
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "List.iter2"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "List.iter2"
+          });
     }
     if (!l2) {
       return ;
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "List.iter2"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "List.iter2"
+        });
   };
 }
 
@@ -287,15 +287,15 @@ function fold_left2(f, _accu, _l1, _l2) {
         continue ;
       }
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "List.fold_left2"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "List.fold_left2"
+          });
     }
     if (l2) {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "List.fold_left2"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "List.fold_left2"
+          });
     }
     return accu;
   };
@@ -307,15 +307,15 @@ function fold_right2(f, l1, l2, accu) {
       return Curry._3(f, l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "List.fold_right2"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "List.fold_right2"
+        });
   }
   if (l2) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "List.fold_right2"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "List.fold_right2"
+        });
   }
   return accu;
 }
@@ -362,17 +362,17 @@ function for_all2(p, _l1, _l2) {
         continue ;
       }
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "List.for_all2"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "List.for_all2"
+          });
     }
     if (!l2) {
       return true;
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "List.for_all2"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "List.for_all2"
+        });
   };
 }
 
@@ -390,17 +390,17 @@ function exists2(p, _l1, _l2) {
         continue ;
       }
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "List.exists2"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "List.exists2"
+          });
     }
     if (!l2) {
       return false;
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "List.exists2"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "List.exists2"
+        });
   };
 }
 
@@ -444,8 +444,8 @@ function assoc(x, _param) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   };
 }
 
@@ -461,8 +461,8 @@ function assq(x, _param) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   };
 }
 
@@ -504,9 +504,9 @@ function remove_assoc(x, param) {
     return l;
   } else {
     return {
-            hd: pair,
-            tl: remove_assoc(x, l)
-          };
+      hd: pair,
+      tl: remove_assoc(x, l)
+    };
   }
 }
 
@@ -520,9 +520,9 @@ function remove_assq(x, param) {
     return l;
   } else {
     return {
-            hd: pair,
-            tl: remove_assq(x, l)
-          };
+      hd: pair,
+      tl: remove_assq(x, l)
+    };
   }
 }
 
@@ -538,8 +538,8 @@ function find(p, _param) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   };
 }
 
@@ -579,9 +579,9 @@ function partition(p, l) {
     const yes = _yes;
     if (!param) {
       return [
-              rev_append(yes, /* [] */0),
-              rev_append(no, /* [] */0)
-            ];
+        rev_append(yes, /* [] */0),
+        rev_append(no, /* [] */0)
+      ];
     }
     const l$1 = param.tl;
     const x = param.hd;
@@ -605,47 +605,47 @@ function partition(p, l) {
 function split(param) {
   if (!param) {
     return [
-            /* [] */0,
-            /* [] */0
-          ];
+      /* [] */0,
+      /* [] */0
+    ];
   }
   const match = param.hd;
   const 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "List.combine"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "List.combine"
+        });
   }
   if (!l2) {
     return /* [] */0;
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "List.combine"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "List.combine"
+      });
 }
 
 function merge(cmp, l1, l2) {
@@ -659,14 +659,14 @@ function merge(cmp, l1, l2) {
   const 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)
+    };
   }
 }
 
@@ -683,13 +683,13 @@ function chop(_k, _l) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/test_list.ml",
-                224,
-                11
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/test_list.ml",
+            224,
+            11
+          ]
+        });
   };
 }
 
@@ -707,71 +707,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
+                  }
+                }
+              };
             }
           }
           
@@ -786,20 +786,20 @@ function stable_sort(cmp, l) {
         const 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
+            }
+          };
         }
       }
       
@@ -853,71 +853,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
+                  }
+                }
+              };
             }
           }
           
@@ -932,20 +932,20 @@ function stable_sort(cmp, l) {
         const 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
+            }
+          };
         }
       }
       
@@ -1010,136 +1010,136 @@ function sort_uniq(cmp, l) {
               const 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) {
               const 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
+                    }
+                  }
+                };
               }
               const 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
+                    }
+                  }
+                };
               }
             }
             const 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
+                  }
+                }
+              };
             }
             const 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
+                  }
+                }
+              };
             }
           }
           
@@ -1155,25 +1155,25 @@ function sort_uniq(cmp, l) {
         const 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
+            }
+          };
         }
       }
       
@@ -1241,136 +1241,136 @@ function sort_uniq(cmp, l) {
               const 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) {
               const 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
+                    }
+                  }
+                };
               }
               const 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
+                    }
+                  }
+                };
               }
             }
             const 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
+                  }
+                }
+              };
             }
             const 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
+                  }
+                }
+              };
             }
           }
           
@@ -1386,25 +1386,25 @@ function sort_uniq(cmp, l) {
         const 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/dist/jscomp/test/test_per.js b/jscomp/test/dist/jscomp/test/test_per.js
index 44bfe63f7..a70a6a656 100644
--- a/jscomp/test/dist/jscomp/test/test_per.js
+++ b/jscomp/test/dist/jscomp/test/test_per.js
@@ -17,16 +17,16 @@ const Stdlib = require("melange/stdlib.js");
 
 function failwith(s) {
   throw new Caml_js_exceptions.MelangeError(Stdlib.Failure, {
-            MEL_EXN_ID: Stdlib.Failure,
-            _1: s
-          });
+        MEL_EXN_ID: Stdlib.Failure,
+        _1: s
+      });
 }
 
 function invalid_arg(s) {
   throw new Caml_js_exceptions.MelangeError(Stdlib.Invalid_argument, {
-            MEL_EXN_ID: Stdlib.Invalid_argument,
-            _1: s
-          });
+        MEL_EXN_ID: Stdlib.Invalid_argument,
+        _1: s
+      });
 }
 
 const Exit = /* @__PURE__ */Caml_exceptions.create("Test_per.Exit");
@@ -103,9 +103,9 @@ function $caret(s1, s2) {
 function char_of_int(n) {
   if (n < 0 || n > 255) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Invalid_argument, {
-              MEL_EXN_ID: Stdlib.Invalid_argument,
-              _1: "char_of_int"
-            });
+          MEL_EXN_ID: Stdlib.Invalid_argument,
+          _1: "char_of_int"
+        });
   }
   return n;
 }
@@ -126,9 +126,9 @@ function bool_of_string(param) {
         return true;
     default:
       throw new Caml_js_exceptions.MelangeError(Stdlib.Invalid_argument, {
-                MEL_EXN_ID: Stdlib.Invalid_argument,
-                _1: "bool_of_string"
-              });
+            MEL_EXN_ID: Stdlib.Invalid_argument,
+            _1: "bool_of_string"
+          });
   }
 }
 
@@ -167,9 +167,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;
   }
@@ -187,34 +187,34 @@ function open_out_gen(mode, perm, name) {
 
 function open_out(name) {
   return open_out_gen({
-              hd: /* Open_wronly */1,
-              tl: {
-                hd: /* Open_creat */3,
-                tl: {
-                  hd: /* Open_trunc */4,
-                  tl: {
-                    hd: /* Open_text */7,
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }, 438, name);
+        hd: /* Open_wronly */1,
+        tl: {
+          hd: /* Open_creat */3,
+          tl: {
+            hd: /* Open_trunc */4,
+            tl: {
+              hd: /* Open_text */7,
+              tl: /* [] */0
+            }
+          }
+        }
+      }, 438, name);
 }
 
 function open_out_bin(name) {
   return open_out_gen({
-              hd: /* Open_wronly */1,
-              tl: {
-                hd: /* Open_creat */3,
-                tl: {
-                  hd: /* Open_trunc */4,
-                  tl: {
-                    hd: /* Open_binary */6,
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }, 438, name);
+        hd: /* Open_wronly */1,
+        tl: {
+          hd: /* Open_creat */3,
+          tl: {
+            hd: /* Open_trunc */4,
+            tl: {
+              hd: /* Open_binary */6,
+              tl: /* [] */0
+            }
+          }
+        }
+      }, 438, name);
 }
 
 function flush_all(param) {
@@ -246,9 +246,9 @@ function output_string(oc, s) {
 function output(oc, s, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Invalid_argument, {
-              MEL_EXN_ID: Stdlib.Invalid_argument,
-              _1: "output"
-            });
+          MEL_EXN_ID: Stdlib.Invalid_argument,
+          _1: "output"
+        });
   }
   Caml_io.caml_ml_output(oc, s, ofs, len);
 }
@@ -256,9 +256,9 @@ function output(oc, s, ofs, len) {
 function output_substring(oc, s, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Invalid_argument, {
-              MEL_EXN_ID: Stdlib.Invalid_argument,
-              _1: "output_substring"
-            });
+          MEL_EXN_ID: Stdlib.Invalid_argument,
+          _1: "output_substring"
+        });
   }
   Caml_io.caml_ml_output(oc, s, ofs, len);
 }
@@ -293,30 +293,30 @@ function open_in_gen(mode, perm, name) {
 
 function open_in(name) {
   return open_in_gen({
-              hd: /* Open_rdonly */0,
-              tl: {
-                hd: /* Open_text */7,
-                tl: /* [] */0
-              }
-            }, 0, name);
+        hd: /* Open_rdonly */0,
+        tl: {
+          hd: /* Open_text */7,
+          tl: /* [] */0
+        }
+      }, 0, name);
 }
 
 function open_in_bin(name) {
   return open_in_gen({
-              hd: /* Open_rdonly */0,
-              tl: {
-                hd: /* Open_binary */6,
-                tl: /* [] */0
-              }
-            }, 0, name);
+        hd: /* Open_rdonly */0,
+        tl: {
+          hd: /* Open_binary */6,
+          tl: /* [] */0
+        }
+      }, 0, name);
 }
 
 function input(ic, s, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.Invalid_argument, {
-              MEL_EXN_ID: Stdlib.Invalid_argument,
-              _1: "input"
-            });
+          MEL_EXN_ID: Stdlib.Invalid_argument,
+          _1: "input"
+        });
   }
   return Caml_external_polyfill.resolve("caml_ml_input")(ic, s, ofs, len);
 }
@@ -331,8 +331,8 @@ function unsafe_really_input(ic, s, _ofs, _len) {
     const r = Caml_external_polyfill.resolve("caml_ml_input")(ic, s, ofs, len);
     if (r === 0) {
       throw new Caml_js_exceptions.MelangeError(Stdlib.End_of_file, {
-                MEL_EXN_ID: Stdlib.End_of_file
-              });
+            MEL_EXN_ID: Stdlib.End_of_file
+          });
     }
     _len = len - r | 0;
     _ofs = ofs + r | 0;
@@ -343,9 +343,9 @@ 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 new Caml_js_exceptions.MelangeError(Stdlib.Invalid_argument, {
-              MEL_EXN_ID: Stdlib.Invalid_argument,
-              _1: "really_input"
-            });
+          MEL_EXN_ID: Stdlib.Invalid_argument,
+          _1: "really_input"
+        });
   }
   unsafe_really_input(ic, s, ofs, len);
 }
@@ -383,8 +383,8 @@ function input_line(chan) {
         return build_result(Caml_bytes.caml_create_bytes(len), len, accu);
       }
       throw new Caml_js_exceptions.MelangeError(Stdlib.End_of_file, {
-                MEL_EXN_ID: Stdlib.End_of_file
-              });
+            MEL_EXN_ID: Stdlib.End_of_file
+          });
     }
     if (n > 0) {
       const res = Caml_bytes.caml_create_bytes(n - 1 | 0);
@@ -395,9 +395,9 @@ function input_line(chan) {
       }
       const len$1 = (len + n | 0) - 1 | 0;
       return build_result(Caml_bytes.caml_create_bytes(len$1), len$1, {
-                  hd: res,
-                  tl: accu
-                });
+            hd: res,
+            tl: accu
+          });
     }
     const beg = Caml_bytes.caml_create_bytes(-n | 0);
     Caml_external_polyfill.resolve("caml_ml_input")(chan, beg, 0, -n | 0);
@@ -502,10 +502,10 @@ function string_of_format(param) {
 
 function $caret$caret(param, param$1) {
   return {
-          TAG: /* Format */0,
-          _0: CamlinternalFormatBasics.concat_fmt(param._0, param$1._0),
-          _1: $caret(param._1, $caret("%,", param$1._1))
-        };
+    TAG: /* Format */0,
+    _0: CamlinternalFormatBasics.concat_fmt(param._0, param$1._0),
+    _1: $caret(param._1, $caret("%,", param$1._1))
+  };
 }
 
 const exit_function = {
diff --git a/jscomp/test/dist/jscomp/test/test_primitive.js b/jscomp/test/dist/jscomp/test/test_primitive.js
index ec3e56649..b2bc51c1e 100644
--- a/jscomp/test/dist/jscomp/test/test_primitive.js
+++ b/jscomp/test/dist/jscomp/test/test_primitive.js
@@ -8,28 +8,28 @@ const Stdlib = require("melange/stdlib.js");
 
 function a4(prim) {
   return [
-          "File \"jscomp/test/test_primitive.ml\", line 29, characters 9-19",
-          prim
-        ];
+    "File \"jscomp/test/test_primitive.ml\", line 29, characters 9-19",
+    prim
+  ];
 }
 
 function a5(prim) {
   return [
-          30,
-          prim
-        ];
+    30,
+    prim
+  ];
 }
 
 function a6(prim) {
   return [
-          [
-            "jscomp/test/test_primitive.ml",
-            31,
-            9,
-            19
-          ],
-          prim
-        ];
+    [
+      "jscomp/test/test_primitive.ml",
+      31,
+      9,
+      19
+    ],
+    prim
+  ];
 }
 
 const test_float = 3;
diff --git a/jscomp/test/dist/jscomp/test/test_react.js b/jscomp/test/dist/jscomp/test/test_react.js
index 4bc6159f1..812208ccb 100644
--- a/jscomp/test/dist/jscomp/test/test_react.js
+++ b/jscomp/test/dist/jscomp/test/test_react.js
@@ -17,8 +17,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/dist/jscomp/test/test_runtime_encoding.js b/jscomp/test/dist/jscomp/test/test_runtime_encoding.js
index 0ffebff04..b70ed4c78 100644
--- a/jscomp/test/dist/jscomp/test/test_runtime_encoding.js
+++ b/jscomp/test/dist/jscomp/test/test_runtime_encoding.js
@@ -5,23 +5,23 @@ const Caml_array = require("melange.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/dist/jscomp/test/test_seq.js b/jscomp/test/dist/jscomp/test/test_seq.js
index 33234d7b6..5c2d39aa8 100644
--- a/jscomp/test/dist/jscomp/test/test_seq.js
+++ b/jscomp/test/dist/jscomp/test/test_seq.js
@@ -25,19 +25,19 @@ function assoc3(x, _l) {
       continue ;
     }
     throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-              MEL_EXN_ID: Stdlib.Not_found
-            });
+          MEL_EXN_ID: Stdlib.Not_found
+        });
   };
 }
 
 function help_action(param) {
   throw new Caml_js_exceptions.MelangeError(Stop, {
-            MEL_EXN_ID: Stop,
-            _1: {
-              TAG: /* Unknown */0,
-              _0: "-help"
-            }
-          });
+        MEL_EXN_ID: Stop,
+        _1: {
+          TAG: /* Unknown */0,
+          _0: "-help"
+        }
+      });
 }
 
 function v(speclist) {
diff --git a/jscomp/test/dist/jscomp/test/test_set.js b/jscomp/test/dist/jscomp/test/test_set.js
index 25600db19..4699c6c74 100644
--- a/jscomp/test/dist/jscomp/test/test_set.js
+++ b/jscomp/test/dist/jscomp/test/test_set.js
@@ -20,12 +20,12 @@ function Make(Ord) {
     let hr;
     hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r._3;
     return {
-            TAG: /* Node */0,
-            _0: l,
-            _1: v,
-            _2: r,
-            _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      _0: l,
+      _1: v,
+      _2: r,
+      _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   };
   const bal = function (l, v, r) {
     let hl;
@@ -35,9 +35,9 @@ function Make(Ord) {
     if (hl > (hr + 2 | 0)) {
       if (/* tag */typeof l === "number" || typeof l === "string") {
         throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                  MEL_EXN_ID: "Invalid_argument",
-                  _1: "Set.bal"
-                });
+              MEL_EXN_ID: "Invalid_argument",
+              _1: "Set.bal"
+            });
       }
       const lr = l._2;
       const lv = l._1;
@@ -49,24 +49,24 @@ function Make(Ord) {
         return create(create(ll, lv, lr._0), lr._1, create(lr._2, v, r));
       }
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     if (hr <= (hl + 2 | 0)) {
       return {
-              TAG: /* Node */0,
-              _0: l,
-              _1: v,
-              _2: r,
-              _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-            };
+        TAG: /* Node */0,
+        _0: l,
+        _1: v,
+        _2: r,
+        _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+      };
     }
     if (/* tag */typeof r === "number" || typeof r === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const rr = r._2;
     const rv = r._1;
@@ -78,19 +78,19 @@ function Make(Ord) {
       return create(create(l, v, rl._0), rl._1, create(rl._2, rv, rr));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   };
   const add = function (x, t) {
     if (/* tag */typeof t === "number" || typeof t === "string") {
       return {
-              TAG: /* Node */0,
-              _0: /* Empty */0,
-              _1: x,
-              _2: /* Empty */0,
-              _3: 1
-            };
+        TAG: /* Node */0,
+        _0: /* Empty */0,
+        _1: x,
+        _2: /* Empty */0,
+        _3: 1
+      };
     }
     const r = t._2;
     const v = t._1;
@@ -106,12 +106,12 @@ function Make(Ord) {
   };
   const singleton = function (x) {
     return {
-            TAG: /* Node */0,
-            _0: /* Empty */0,
-            _1: x,
-            _2: /* Empty */0,
-            _3: 1
-          };
+      TAG: /* Node */0,
+      _0: /* Empty */0,
+      _1: x,
+      _2: /* Empty */0,
+      _3: 1
+    };
   };
   const add_min_element = function (v, param) {
     if (/* tag */typeof param === "number" || typeof param === "string") {
@@ -149,8 +149,8 @@ function Make(Ord) {
       const param = _param;
       if (/* tag */typeof param === "number" || typeof param === "string") {
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
       }
       const l = param._0;
       if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -165,8 +165,8 @@ function Make(Ord) {
       const param = _param;
       if (/* tag */typeof param === "number" || typeof param === "string") {
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
       }
       let tmp = param._2;
       if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
@@ -179,9 +179,9 @@ function Make(Ord) {
   const remove_min_elt = function (param) {
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.remove_min_elt"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.remove_min_elt"
+          });
     }
     const l = param._0;
     if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -211,10 +211,10 @@ function Make(Ord) {
   const split = function (x, param) {
     if (/* tag */typeof param === "number" || typeof param === "string") {
       return [
-              /* Empty */0,
-              false,
-              /* Empty */0
-            ];
+        /* Empty */0,
+        false,
+        /* Empty */0
+      ];
     }
     const r = param._2;
     const v = param._1;
@@ -222,25 +222,25 @@ function Make(Ord) {
     const c = Curry._2(Ord.compare, x, v);
     if (c === 0) {
       return [
-              l,
-              true,
-              r
-            ];
+        l,
+        true,
+        r
+      ];
     }
     if (c < 0) {
       const match = split(x, l);
       return [
-              match[0],
-              match[1],
-              join(match[2], v, r)
-            ];
+        match[0],
+        match[1],
+        join(match[2], v, r)
+      ];
     }
     const 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]
+    ];
   };
   const is_empty = function (param) {
     if (/* tag */typeof param === "number" || typeof param === "string") {
@@ -508,9 +508,9 @@ function Make(Ord) {
   const partition = function (p, param) {
     if (/* tag */typeof param === "number" || typeof param === "string") {
       return [
-              /* Empty */0,
-              /* Empty */0
-            ];
+        /* Empty */0,
+        /* Empty */0
+      ];
     }
     const v = param._1;
     const match = partition(p, param._0);
@@ -522,14 +522,14 @@ function Make(Ord) {
     const 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)
+      ];
     }
   };
   const cardinal = function (param) {
@@ -562,8 +562,8 @@ function Make(Ord) {
       const param = _param;
       if (/* tag */typeof param === "number" || typeof param === "string") {
         throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                  MEL_EXN_ID: Stdlib.Not_found
-                });
+              MEL_EXN_ID: Stdlib.Not_found
+            });
       }
       const v = param._1;
       const c = Curry._2(Ord.compare, x, v);
@@ -579,21 +579,21 @@ function Make(Ord) {
       switch (n) {
         case 0 :
             return [
-                    /* Empty */0,
-                    l
-                  ];
+              /* Empty */0,
+              l
+            ];
         case 1 :
             if (l) {
               return [
-                      {
-                        TAG: /* Node */0,
-                        _0: /* Empty */0,
-                        _1: l.hd,
-                        _2: /* Empty */0,
-                        _3: 1
-                      },
-                      l.tl
-                    ];
+                {
+                  TAG: /* Node */0,
+                  _0: /* Empty */0,
+                  _1: l.hd,
+                  _2: /* Empty */0,
+                  _3: 1
+                },
+                l.tl
+              ];
             }
             break;
         case 2 :
@@ -601,21 +601,21 @@ function Make(Ord) {
               const match = l.tl;
               if (match) {
                 return [
-                        {
-                          TAG: /* Node */0,
-                          _0: {
-                            TAG: /* Node */0,
-                            _0: /* Empty */0,
-                            _1: l.hd,
-                            _2: /* Empty */0,
-                            _3: 1
-                          },
-                          _1: match.hd,
-                          _2: /* Empty */0,
-                          _3: 2
-                        },
-                        match.tl
-                      ];
+                  {
+                    TAG: /* Node */0,
+                    _0: {
+                      TAG: /* Node */0,
+                      _0: /* Empty */0,
+                      _1: l.hd,
+                      _2: /* Empty */0,
+                      _3: 1
+                    },
+                    _1: match.hd,
+                    _2: /* Empty */0,
+                    _3: 2
+                  },
+                  match.tl
+                ];
               }
               
             }
@@ -627,27 +627,27 @@ function Make(Ord) {
                 const match$2 = match$1.tl;
                 if (match$2) {
                   return [
-                          {
-                            TAG: /* Node */0,
-                            _0: {
-                              TAG: /* Node */0,
-                              _0: /* Empty */0,
-                              _1: l.hd,
-                              _2: /* Empty */0,
-                              _3: 1
-                            },
-                            _1: match$1.hd,
-                            _2: {
-                              TAG: /* Node */0,
-                              _0: /* Empty */0,
-                              _1: match$2.hd,
-                              _2: /* Empty */0,
-                              _3: 1
-                            },
-                            _3: 2
-                          },
-                          match$2.tl
-                        ];
+                    {
+                      TAG: /* Node */0,
+                      _0: {
+                        TAG: /* Node */0,
+                        _0: /* Empty */0,
+                        _1: l.hd,
+                        _2: /* Empty */0,
+                        _3: 1
+                      },
+                      _1: match$1.hd,
+                      _2: {
+                        TAG: /* Node */0,
+                        _0: /* Empty */0,
+                        _1: match$2.hd,
+                        _2: /* Empty */0,
+                        _3: 1
+                      },
+                      _3: 2
+                    },
+                    match$2.tl
+                  ];
                 }
                 
               }
@@ -663,18 +663,18 @@ function Make(Ord) {
       if (l$1) {
         const 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 new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/test_set.ml",
-                  372,
-                  18
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/test_set.ml",
+              372,
+              18
+            ]
+          });
     };
     return sub(Stdlib__List.length(l), l)[0];
   };
@@ -710,46 +710,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 */0,
-          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 */0,
+    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
+  };
 }
 
 const N = {
diff --git a/jscomp/test/dist/jscomp/test/test_simple_obj.js b/jscomp/test/dist/jscomp/test/test_simple_obj.js
index dd1291f75..f20349e3f 100644
--- a/jscomp/test/dist/jscomp/test/test_simple_obj.js
+++ b/jscomp/test/dist/jscomp/test/test_simple_obj.js
@@ -91,75 +91,75 @@ const v = CamlinternalOO.create_object_opt(undefined, $$class$3);
 function test(param) {
   if (Caml_oo_curry.js1(23515, 1, uu) !== "uu") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/test_simple_obj.ml",
-                21,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/test_simple_obj.ml",
+            21,
+            4
+          ]
+        });
   }
   if (Caml_oo_curry.js3(4846113, 2, uuu, 1, 20) !== 21) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/test_simple_obj.ml",
-                22,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/test_simple_obj.ml",
+            22,
+            4
+          ]
+        });
   }
   if (Caml_oo_curry.js3(4846113, 3, v, 3, 7) !== 10) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/test_simple_obj.ml",
-                23,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/test_simple_obj.ml",
+            23,
+            4
+          ]
+        });
   }
   if (Caml_oo_curry.js1(5243894, 4, u) !== 3) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/test_simple_obj.ml",
-                25,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/test_simple_obj.ml",
+            25,
+            4
+          ]
+        });
   }
   if (Caml_oo_curry.js1(5243895, 5, u) !== 4) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/test_simple_obj.ml",
-                26,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/test_simple_obj.ml",
+            26,
+            4
+          ]
+        });
   }
   if (Caml_oo_curry.js3(23297, 6, u, 1, 2) !== 3) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/test_simple_obj.ml",
-                27,
-                4
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/test_simple_obj.ml",
+            27,
+            4
+          ]
+        });
   }
   if (Caml_oo_curry.js2(616641298, 7, u, 32) === 32) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/test_simple_obj.ml",
-              28,
-              4
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/test_simple_obj.ml",
+          28,
+          4
+        ]
+      });
 }
 
 exports.u = u;
diff --git a/jscomp/test/dist/jscomp/test/test_string.js b/jscomp/test/dist/jscomp/test/test_string.js
index b6de2c994..83caeb752 100644
--- a/jscomp/test/dist/jscomp/test/test_string.js
+++ b/jscomp/test/dist/jscomp/test/test_string.js
@@ -13,13 +13,13 @@ function f(param) {
         return 1;
     default:
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/test_string.ml",
-                  4,
-                  18
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/test_string.ml",
+              4,
+              18
+            ]
+          });
   }
 }
 
diff --git a/jscomp/test/dist/jscomp/test/test_string_case.js b/jscomp/test/dist/jscomp/test/test_string_case.js
index 3600f98b1..8bc5e8a00 100644
--- a/jscomp/test/dist/jscomp/test/test_string_case.js
+++ b/jscomp/test/dist/jscomp/test/test_string_case.js
@@ -11,13 +11,13 @@ function f(param) {
         return 1;
     default:
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "jscomp/test/test_string_case.ml",
-                  4,
-                  9
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "jscomp/test/test_string_case.ml",
+              4,
+              9
+            ]
+          });
   }
 }
 
diff --git a/jscomp/test/dist/jscomp/test/test_string_map.js b/jscomp/test/dist/jscomp/test/test_string_map.js
index ecc3aeec3..069453068 100644
--- a/jscomp/test/dist/jscomp/test/test_string_map.js
+++ b/jscomp/test/dist/jscomp/test/test_string_map.js
@@ -24,13 +24,13 @@ function create(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -41,9 +41,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -56,25 +56,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -87,21 +87,21 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function add(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -113,13 +113,13 @@ function add(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -143,8 +143,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg.compare, x, param.v);
     if (c === 0) {
diff --git a/jscomp/test/dist/jscomp/test/test_switch.js b/jscomp/test/dist/jscomp/test/test_switch.js
index 3b5afd98e..41caaa5d3 100644
--- a/jscomp/test/dist/jscomp/test/test_switch.js
+++ b/jscomp/test/dist/jscomp/test/test_switch.js
@@ -27,9 +27,9 @@ function f(param) {
 function bind(x, f) {
   if (x.TAG === /* Left */0) {
     return {
-            TAG: /* Left */0,
-            _0: Curry._1(f, x._0)
-          };
+      TAG: /* Left */0,
+      _0: Curry._1(f, x._0)
+    };
   } else {
     return x;
   }
diff --git a/jscomp/test/dist/jscomp/test/test_trywith.js b/jscomp/test/dist/jscomp/test/test_trywith.js
index c29cc2a0e..12f6c2a1d 100644
--- a/jscomp/test/dist/jscomp/test/test_trywith.js
+++ b/jscomp/test/dist/jscomp/test/test_trywith.js
@@ -110,8 +110,8 @@ function ff(g, x) {
 
 function u(param) {
   throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-            MEL_EXN_ID: Stdlib.Not_found
-          });
+        MEL_EXN_ID: Stdlib.Not_found
+      });
 }
 
 function f(x) {
@@ -122,13 +122,13 @@ function f(x) {
     return 1;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/test_trywith.ml",
-              51,
-              9
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/test_trywith.ml",
+          51,
+          9
+        ]
+      });
 }
 
 const u1 = "bad character decimal encoding \\";
diff --git a/jscomp/test/dist/jscomp/test/test_unsafe_cmp.js b/jscomp/test/dist/jscomp/test/test_unsafe_cmp.js
index eb6b38e73..7b06c3494 100644
--- a/jscomp/test/dist/jscomp/test/test_unsafe_cmp.js
+++ b/jscomp/test/dist/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/dist/jscomp/test/test_unsupported_primitive.js b/jscomp/test/dist/jscomp/test/test_unsupported_primitive.js
index bc73a5b7e..04e105971 100644
--- a/jscomp/test/dist/jscomp/test/test_unsupported_primitive.js
+++ b/jscomp/test/dist/jscomp/test/test_unsupported_primitive.js
@@ -7,9 +7,9 @@ const Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 function to_buffer(buff, ofs, len, v, flags) {
   if (ofs < 0 || len < 0 || ofs > (buff.length - len | 0)) {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Marshal.to_buffer: substring out of bounds"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Marshal.to_buffer: substring out of bounds"
+        });
   }
   return Caml_external_polyfill.resolve("caml_output_value_to_buffer")(buff, ofs, len, v, flags);
 }
diff --git a/jscomp/test/dist/jscomp/test/test_while_closure.js b/jscomp/test/dist/jscomp/test/test_while_closure.js
index 0a0192c0c..65c4d6932 100644
--- a/jscomp/test/dist/jscomp/test/test_while_closure.js
+++ b/jscomp/test/dist/jscomp/test/test_while_closure.js
@@ -35,13 +35,13 @@ console.log(String(v.contents));
 
 if (v.contents !== 45) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/test_while_closure.ml",
-              63,
-              4
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/test_while_closure.ml",
+          63,
+          4
+        ]
+      });
 }
 
 const count = 10;
diff --git a/jscomp/test/dist/jscomp/test/test_zero_nullable.js b/jscomp/test/dist/jscomp/test/test_zero_nullable.js
index 9420740c0..9fa9f2da5 100644
--- a/jscomp/test/dist/jscomp/test/test_zero_nullable.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/testing.js b/jscomp/test/dist/jscomp/test/testing.js
index 96d735825..78d6e499a 100644
--- a/jscomp/test/dist/jscomp/test/testing.js
+++ b/jscomp/test/dist/jscomp/test/testing.js
@@ -86,24 +86,24 @@ function test(b) {
   if (!b) {
     all_tests_ok.contents = false;
     return Stdlib.print_string(Curry._1(Stdlib__Printf.sprintf({
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* String_literal */11,
-                          _0: "\n********* Test number ",
-                          _1: {
-                            TAG: /* Int */4,
-                            _0: /* Int_i */3,
-                            _1: /* No_padding */0,
-                            _2: /* No_precision */0,
-                            _3: {
-                              TAG: /* String_literal */11,
-                              _0: " failed ***********\n",
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "\n********* Test number %i failed ***********\n"
-                      }), test_num.contents));
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* String_literal */11,
+                    _0: "\n********* Test number ",
+                    _1: {
+                      TAG: /* Int */4,
+                      _0: /* Int_i */3,
+                      _1: /* No_padding */0,
+                      _2: /* No_precision */0,
+                      _3: {
+                        TAG: /* String_literal */11,
+                        _0: " failed ***********\n",
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "\n********* Test number %i failed ***********\n"
+                }), test_num.contents));
   }
   
 }
@@ -130,32 +130,32 @@ function test_raises_exc_p(pred, f, x) {
 function test_raises_some_exc(f) {
   return function (param) {
     return test_raises_exc_p((function (param) {
-                  return true;
-                }), f, param);
+            return true;
+          }), f, param);
   };
 }
 
 function test_raises_this_exc(exc) {
   return function (param, param$1) {
     return test_raises_exc_p((function (x) {
-                  return Caml_obj.caml_equal(x, exc);
-                }), param, param$1);
+            return Caml_obj.caml_equal(x, exc);
+          }), param, param$1);
   };
 }
 
 function failure_test(f, x, s) {
   return test_raises_exc_p((function (x) {
-                return Caml_obj.caml_equal(x, {
-                            MEL_EXN_ID: Stdlib.Failure,
-                            _1: s
-                          });
-              }), f, x);
+          return Caml_obj.caml_equal(x, {
+                MEL_EXN_ID: Stdlib.Failure,
+                _1: s
+              });
+        }), f, x);
 }
 
 function scan_failure_test(f, x) {
   return test_raises_exc_p((function (param) {
-                return param.MEL_EXN_ID === Stdlib__Scanf.Scan_failure;
-              }), f, x);
+          return param.MEL_EXN_ID === Stdlib__Scanf.Scan_failure;
+        }), f, x);
 }
 
 exports.test = test;
diff --git a/jscomp/test/dist/jscomp/test/ticker.js b/jscomp/test/dist/jscomp/test/ticker.js
index 556873f06..c91c6f7a7 100644
--- a/jscomp/test/dist/jscomp/test/ticker.js
+++ b/jscomp/test/dist/jscomp/test/ticker.js
@@ -32,9 +32,9 @@ function split(delim, s) {
         const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
         if (exn.MEL_EXN_ID === Stdlib.Not_found) {
           return {
-                  hd: Stdlib__String.sub(s, 0, i),
-                  tl: l
-                };
+            hd: Stdlib__String.sub(s, 0, i),
+            tl: l
+          };
         }
         throw new Caml_js_exceptions.MelangeError(exn.MEL_EXN_ID, exn);
       }
@@ -44,9 +44,9 @@ function split(delim, s) {
         tl: l
       };
       const l$2 = i$p === 0 ? ({
-            hd: "",
-            tl: l$1
-          }) : l$1;
+          hd: "",
+          tl: l$1
+        }) : l$1;
       _i = i$p;
       _l = l$2;
       continue ;
@@ -78,31 +78,31 @@ function string_of_rank(i) {
     }
   } else {
     return Curry._1(Stdlib__Printf.sprintf({
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "Ranked(",
-                      _1: {
-                        TAG: /* Int */4,
-                        _0: /* Int_i */3,
-                        _1: /* No_padding */0,
-                        _2: /* No_precision */0,
-                        _3: {
-                          TAG: /* Char_literal */12,
-                          _0: /* ')' */41,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "Ranked(%i)"
-                  }), i._0);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "Ranked(",
+                _1: {
+                  TAG: /* Int */4,
+                  _0: /* Int_i */3,
+                  _1: /* No_padding */0,
+                  _2: /* No_precision */0,
+                  _3: {
+                    TAG: /* Char_literal */12,
+                    _0: /* ')' */41,
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "Ranked(%i)"
+            }), i._0);
   }
 }
 
 function find_ticker_by_name(all_tickers, ticker) {
   return Stdlib__List.find((function (param) {
-                return param.ticker_name === ticker;
-              }), all_tickers);
+          return param.ticker_name === ticker;
+        }), all_tickers);
 }
 
 function print_all_composite(all_tickers) {
@@ -133,24 +133,24 @@ function create(l, x, d, r) {
   const hl = height(l);
   const hr = height(r);
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function singleton(x, d) {
   return {
-          TAG: /* Node */0,
-          l: /* Empty */0,
-          v: x,
-          d: d,
-          r: /* Empty */0,
-          h: 1
-        };
+    TAG: /* Node */0,
+    l: /* Empty */0,
+    v: x,
+    d: d,
+    r: /* Empty */0,
+    h: 1
+  };
 }
 
 function bal(l, x, d, r) {
@@ -161,9 +161,9 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Map.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Map.bal"
+          });
     }
     const lr = l.r;
     const ld = l.d;
@@ -176,25 +176,25 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.bal"
+        });
   }
   const rr = r.r;
   const rd = r.d;
@@ -207,9 +207,9 @@ 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 new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Map.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Map.bal"
+      });
 }
 
 function is_empty(param) {
@@ -223,13 +223,13 @@ function is_empty(param) {
 function add(x, data, m) {
   if (/* tag */typeof m === "number" || typeof m === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            d: data,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      d: data,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = m.r;
   const d = m.d;
@@ -241,13 +241,13 @@ function add(x, data, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -271,8 +271,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const c = Curry._2(funarg.compare, x, param.v);
     if (c === 0) {
@@ -288,8 +288,8 @@ function find_first(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -302,9 +302,9 @@ function find_first(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -339,9 +339,9 @@ function find_first_opt(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -364,8 +364,8 @@ function find_last(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -378,9 +378,9 @@ function find_last(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -415,9 +415,9 @@ function find_last_opt(f, _param) {
         const v0 = _v0;
         if (/* tag */typeof param$1 === "number" || typeof param$1 === "string") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         const v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -470,15 +470,15 @@ function min_binding(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -494,9 +494,9 @@ function min_binding_opt(_param) {
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -508,15 +508,15 @@ function max_binding(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = param.r;
     continue ;
@@ -532,9 +532,9 @@ function max_binding_opt(_param) {
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = param.r;
     continue ;
@@ -544,9 +544,9 @@ function max_binding_opt(_param) {
 function remove_min_binding(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Map.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Map.remove_min_elt"
+        });
   }
   const l = param.l;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -600,13 +600,13 @@ function update(x, f, m) {
     const data = Curry._1(f, undefined);
     if (data !== undefined) {
       return {
-              TAG: /* Node */0,
-              l: /* Empty */0,
-              v: x,
-              d: Caml_option.valFromOption(data),
-              r: /* Empty */0,
-              h: 1
-            };
+        TAG: /* Node */0,
+        l: /* Empty */0,
+        v: x,
+        d: Caml_option.valFromOption(data),
+        r: /* Empty */0,
+        h: 1
+      };
     } else {
       return /* Empty */0;
     }
@@ -626,13 +626,13 @@ function update(x, f, m) {
       return m;
     } else {
       return {
-              TAG: /* Node */0,
-              l: l,
-              v: x,
-              d: data$2,
-              r: r,
-              h: m.h
-            };
+        TAG: /* Node */0,
+        l: l,
+        v: x,
+        d: data$2,
+        r: r,
+        h: m.h
+      };
     }
   }
   if (c < 0) {
@@ -655,14 +655,14 @@ function add_to_list(x, data, m) {
   const add = function (l) {
     if (l !== undefined) {
       return {
-              hd: data,
-              tl: l
-            };
+        hd: data,
+        tl: l
+      };
     } else {
       return {
-              hd: data,
-              tl: /* [] */0
-            };
+        hd: data,
+        tl: /* [] */0
+      };
     }
   };
   return update(x, add, m);
@@ -689,13 +689,13 @@ function map(f, param) {
   const d$p = Curry._1(f, param.d);
   const r$p = map(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: param.v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: param.v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function mapi(f, param) {
@@ -707,13 +707,13 @@ function mapi(f, param) {
   const d$p = Curry._2(f, v, param.d);
   const r$p = mapi(f, param.r);
   return {
-          TAG: /* Node */0,
-          l: l$p,
-          v: v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: /* Node */0,
+    l: l$p,
+    v: v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function fold(f, _m, _accu) {
@@ -819,10 +819,10 @@ function concat_or_join(t1, v, d, t2) {
 function split$1(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            undefined,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      undefined,
+      /* Empty */0
+    ];
   }
   const r = param.r;
   const d = param.d;
@@ -831,25 +831,25 @@ function split$1(x, param) {
   const 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) {
     const 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)
+    ];
   }
   const 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) {
@@ -868,13 +868,13 @@ function merge$1(f, s1, s2) {
   }
   if (/* tag */typeof s2 === "number" || typeof s2 === "string") {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/stdlib/map.ml",
-                408,
-                10
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/stdlib/map.ml",
+            408,
+            10
+          ]
+        });
   }
   const v2 = s2.v;
   const match$1 = split$1(v2, s1);
@@ -954,9 +954,9 @@ function filter_map(f, param) {
 function partition(p, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      /* Empty */0
+    ];
   }
   const d = param.d;
   const v = param.v;
@@ -969,14 +969,14 @@ function partition(p, param) {
   const 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)
+    ];
   }
 }
 
@@ -1090,14 +1090,14 @@ function bindings(s) {
 
 function of_list(bs) {
   return Stdlib__List.fold_left((function (m, param) {
-                return add(param[0], param[1], m);
-              }), /* Empty */0, bs);
+          return add(param[0], param[1], m);
+        }), /* Empty */0, bs);
 }
 
 function add_seq(i, m) {
   return Stdlib__Seq.fold_left((function (m, param) {
-                return add(param[0], param[1], m);
-              }), m, i);
+          return add(param[0], param[1], m);
+        }), m, i);
 }
 
 function of_seq(i) {
@@ -1110,15 +1110,15 @@ function seq_of_enum_(c, param) {
   }
   const partial_arg = cons_enum(c._2, c._3);
   return {
-          TAG: /* Cons */0,
-          _0: [
-            c._0,
-            c._1
-          ],
-          _1: (function (param) {
-              return seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: [
+      c._0,
+      c._1
+    ],
+    _1: (function (param) {
+        return seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_seq(m) {
@@ -1153,15 +1153,15 @@ function rev_seq_of_enum_(c, param) {
   }
   const partial_arg = snoc_enum(c._2, c._3);
   return {
-          TAG: /* Cons */0,
-          _0: [
-            c._0,
-            c._1
-          ],
-          _1: (function (param) {
-              return rev_seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: [
+      c._0,
+      c._1
+    ],
+    _1: (function (param) {
+        return rev_seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_rev_seq(c) {
@@ -1185,12 +1185,12 @@ function to_seq_from(low, m) {
       const n = Curry._2(funarg.compare, v, low);
       if (n === 0) {
         return {
-                TAG: /* More */0,
-                _0: v,
-                _1: d,
-                _2: r,
-                _3: c
-              };
+          TAG: /* More */0,
+          _0: v,
+          _1: d,
+          _2: r,
+          _3: c
+        };
       }
       if (n < 0) {
         _m = r;
@@ -1295,9 +1295,9 @@ function compute_update_sequences(all_tickers) {
           let tmp = ticker.type_;
           if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
             return Curry._3(add, ticker.ticker_name, {
-                        hd: ticker,
-                        tl: /* [] */0
-                      }, map);
+                  hd: ticker,
+                  tl: /* [] */0
+                }, map);
           }
           const loop = function (_up, _map, _ticker) {
             while(true) {
@@ -1327,38 +1327,38 @@ function compute_update_sequences(all_tickers) {
           return loop(/* [] */0, map, ticker);
         }), /* Empty */0, Stdlib__List.rev(all_tickers));
   return Curry._3(fold, (function (k, l, map) {
-                const l$1 = Stdlib__List.sort_uniq((function (lhs, rhs) {
-                        const x = lhs.rank;
-                        if (/* tag */typeof x === "number" || typeof x === "string") {
-                          if (x === /* Uninitialized */0) {
-                            throw new Caml_js_exceptions.MelangeError("Failure", {
-                                      MEL_EXN_ID: "Failure",
-                                      _1: "All nodes should be ranked"
-                                    });
-                          }
-                          throw new Caml_js_exceptions.MelangeError("Failure", {
-                                    MEL_EXN_ID: "Failure",
-                                    _1: "All nodes should be ranked"
-                                  });
-                        } else {
-                          const y = rhs.rank;
-                          if (!/* tag */(typeof y === "number" || typeof y === "string")) {
-                            return Caml.caml_int_compare(x._0, y._0);
-                          }
-                          if (y === /* Uninitialized */0) {
-                            throw new Caml_js_exceptions.MelangeError("Failure", {
-                                      MEL_EXN_ID: "Failure",
-                                      _1: "All nodes should be ranked"
-                                    });
-                          }
-                          throw new Caml_js_exceptions.MelangeError("Failure", {
-                                    MEL_EXN_ID: "Failure",
-                                    _1: "All nodes should be ranked"
-                                  });
-                        }
-                      }), l);
-                return Curry._3(add, k, l$1, map);
-              }), map, map);
+          const l$1 = Stdlib__List.sort_uniq((function (lhs, rhs) {
+                  const x = lhs.rank;
+                  if (/* tag */typeof x === "number" || typeof x === "string") {
+                    if (x === /* Uninitialized */0) {
+                      throw new Caml_js_exceptions.MelangeError("Failure", {
+                            MEL_EXN_ID: "Failure",
+                            _1: "All nodes should be ranked"
+                          });
+                    }
+                    throw new Caml_js_exceptions.MelangeError("Failure", {
+                          MEL_EXN_ID: "Failure",
+                          _1: "All nodes should be ranked"
+                        });
+                  } else {
+                    const y = rhs.rank;
+                    if (!/* tag */(typeof y === "number" || typeof y === "string")) {
+                      return Caml.caml_int_compare(x._0, y._0);
+                    }
+                    if (y === /* Uninitialized */0) {
+                      throw new Caml_js_exceptions.MelangeError("Failure", {
+                            MEL_EXN_ID: "Failure",
+                            _1: "All nodes should be ranked"
+                          });
+                    }
+                    throw new Caml_js_exceptions.MelangeError("Failure", {
+                          MEL_EXN_ID: "Failure",
+                          _1: "All nodes should be ranked"
+                        });
+                  }
+                }), l);
+          return Curry._3(add, k, l$1, map);
+        }), map, map);
 }
 
 function process_quote(ticker_map, new_ticker, new_value) {
@@ -1371,9 +1371,9 @@ function process_quote(ticker_map, new_ticker, new_value) {
               return ;
             }
             throw new Caml_js_exceptions.MelangeError("Failure", {
-                      MEL_EXN_ID: "Failure",
-                      _1: "Only single Market ticker should be udpated upon a new quote"
-                    });
+                  MEL_EXN_ID: "Failure",
+                  _1: "Only single Market ticker should be udpated upon a new quote"
+                });
           }
           const match$1 = match._0;
           const match$2 = match$1.lhs.value;
@@ -1390,18 +1390,18 @@ function process_input_line(ticker_map, all_tickers, line) {
     const lhs$1 = find_ticker_by_name(all_tickers, lhs);
     const rhs$1 = find_ticker_by_name(all_tickers, rhs);
     return {
-            value: undefined,
-            rank: /* Uninitialized */0,
-            ticker_name: ticker_name,
-            type_: {
-              TAG: /* Binary_op */0,
-              _0: {
-                op: op,
-                rhs: rhs$1,
-                lhs: lhs$1
-              }
-            }
-          };
+      value: undefined,
+      rank: /* Uninitialized */0,
+      ticker_name: ticker_name,
+      type_: {
+        TAG: /* Binary_op */0,
+        _0: {
+          op: op,
+          rhs: rhs$1,
+          lhs: lhs$1
+        }
+      }
+    };
   };
   const tokens = split(/* '|' */124, line);
   if (tokens) {
@@ -1413,27 +1413,27 @@ function process_input_line(ticker_map, all_tickers, line) {
             if (match$1) {
               if (match$1.tl) {
                 throw new Caml_js_exceptions.MelangeError("Failure", {
-                          MEL_EXN_ID: "Failure",
-                          _1: "Invalid input line"
-                        });
+                      MEL_EXN_ID: "Failure",
+                      _1: "Invalid input line"
+                    });
               }
               const ticker_map$1 = ticker_map !== undefined ? Caml_option.valFromOption(ticker_map) : compute_update_sequences(all_tickers);
               const value = Caml_format.caml_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 new Caml_js_exceptions.MelangeError("Failure", {
-                      MEL_EXN_ID: "Failure",
-                      _1: "Invalid input line"
-                    });
+                  MEL_EXN_ID: "Failure",
+                  _1: "Invalid input line"
+                });
           }
           throw new Caml_js_exceptions.MelangeError("Failure", {
-                    MEL_EXN_ID: "Failure",
-                    _1: "Invalid input line"
-                  });
+                MEL_EXN_ID: "Failure",
+                _1: "Invalid input line"
+              });
       case "R" :
           const match$2 = tokens.tl;
           if (match$2) {
@@ -1448,27 +1448,27 @@ function process_input_line(ticker_map, all_tickers, line) {
                       if (match$5) {
                         if (match$5.tl) {
                           throw new Caml_js_exceptions.MelangeError("Failure", {
-                                    MEL_EXN_ID: "Failure",
-                                    _1: "Invalid input line"
-                                  });
+                                MEL_EXN_ID: "Failure",
+                                _1: "Invalid input line"
+                              });
                         }
                         return [
-                                {
-                                  hd: make_binary_op(ticker_name, match$4.hd, match$5.hd, /* PLUS */0),
-                                  tl: all_tickers
-                                },
-                                ticker_map
-                              ];
+                          {
+                            hd: make_binary_op(ticker_name, match$4.hd, match$5.hd, /* PLUS */0),
+                            tl: all_tickers
+                          },
+                          ticker_map
+                        ];
                       }
                       throw new Caml_js_exceptions.MelangeError("Failure", {
-                                MEL_EXN_ID: "Failure",
-                                _1: "Invalid input line"
-                              });
+                            MEL_EXN_ID: "Failure",
+                            _1: "Invalid input line"
+                          });
                     }
                     throw new Caml_js_exceptions.MelangeError("Failure", {
-                              MEL_EXN_ID: "Failure",
-                              _1: "Invalid input line"
-                            });
+                          MEL_EXN_ID: "Failure",
+                          _1: "Invalid input line"
+                        });
                 case "-" :
                     const match$6 = match$3.tl;
                     if (match$6) {
@@ -1476,75 +1476,75 @@ function process_input_line(ticker_map, all_tickers, line) {
                       if (match$7) {
                         if (match$7.tl) {
                           throw new Caml_js_exceptions.MelangeError("Failure", {
-                                    MEL_EXN_ID: "Failure",
-                                    _1: "Invalid input line"
-                                  });
+                                MEL_EXN_ID: "Failure",
+                                _1: "Invalid input line"
+                              });
                         }
                         return [
-                                {
-                                  hd: make_binary_op(ticker_name, match$6.hd, match$7.hd, /* MINUS */1),
-                                  tl: all_tickers
-                                },
-                                ticker_map
-                              ];
+                          {
+                            hd: make_binary_op(ticker_name, match$6.hd, match$7.hd, /* MINUS */1),
+                            tl: all_tickers
+                          },
+                          ticker_map
+                        ];
                       }
                       throw new Caml_js_exceptions.MelangeError("Failure", {
-                                MEL_EXN_ID: "Failure",
-                                _1: "Invalid input line"
-                              });
+                            MEL_EXN_ID: "Failure",
+                            _1: "Invalid input line"
+                          });
                     }
                     throw new Caml_js_exceptions.MelangeError("Failure", {
-                              MEL_EXN_ID: "Failure",
-                              _1: "Invalid input line"
-                            });
+                          MEL_EXN_ID: "Failure",
+                          _1: "Invalid input line"
+                        });
                 case "S" :
                     if (match$3.tl) {
                       throw new Caml_js_exceptions.MelangeError("Failure", {
-                                MEL_EXN_ID: "Failure",
-                                _1: "Invalid input line"
-                              });
+                            MEL_EXN_ID: "Failure",
+                            _1: "Invalid input line"
+                          });
                     }
                     return [
-                            {
-                              hd: {
-                                value: undefined,
-                                rank: /* Uninitialized */0,
-                                ticker_name: ticker_name,
-                                type_: /* Market */0
-                              },
-                              tl: all_tickers
-                            },
-                            ticker_map
-                          ];
+                      {
+                        hd: {
+                          value: undefined,
+                          rank: /* Uninitialized */0,
+                          ticker_name: ticker_name,
+                          type_: /* Market */0
+                        },
+                        tl: all_tickers
+                      },
+                      ticker_map
+                    ];
                 default:
                   throw new Caml_js_exceptions.MelangeError("Failure", {
-                            MEL_EXN_ID: "Failure",
-                            _1: "Invalid input line"
-                          });
-              }
-            } else {
-              throw new Caml_js_exceptions.MelangeError("Failure", {
                         MEL_EXN_ID: "Failure",
                         _1: "Invalid input line"
                       });
+              }
+            } else {
+              throw new Caml_js_exceptions.MelangeError("Failure", {
+                    MEL_EXN_ID: "Failure",
+                    _1: "Invalid input line"
+                  });
             }
           } else {
             throw new Caml_js_exceptions.MelangeError("Failure", {
-                      MEL_EXN_ID: "Failure",
-                      _1: "Invalid input line"
-                    });
-          }
-      default:
-        throw new Caml_js_exceptions.MelangeError("Failure", {
                   MEL_EXN_ID: "Failure",
                   _1: "Invalid input line"
                 });
-    }
-  } else {
-    throw new Caml_js_exceptions.MelangeError("Failure", {
+          }
+      default:
+        throw new Caml_js_exceptions.MelangeError("Failure", {
               MEL_EXN_ID: "Failure",
               _1: "Invalid input line"
             });
+    }
+  } else {
+    throw new Caml_js_exceptions.MelangeError("Failure", {
+          MEL_EXN_ID: "Failure",
+          _1: "Invalid input line"
+        });
   }
 }
 
diff --git a/jscomp/test/dist/jscomp/test/to_string_test.js b/jscomp/test/dist/jscomp/test/to_string_test.js
index 877d6f52e..279474aad 100644
--- a/jscomp/test/dist/jscomp/test/to_string_test.js
+++ b/jscomp/test/dist/jscomp/test/to_string_test.js
@@ -15,10 +15,10 @@ Mt.from_pair_suites("To_string_test", {
         "File \"jscomp/test/to_string_test.ml\", line 7, characters 2-9",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: Stdlib.string_of_float(Stdlib.infinity),
-                    _1: "inf"
-                  };
+              TAG: /* Eq */0,
+              _0: Stdlib.string_of_float(Stdlib.infinity),
+              _1: "inf"
+            };
           })
       ],
       tl: {
@@ -26,10 +26,10 @@ Mt.from_pair_suites("To_string_test", {
           "File \"jscomp/test/to_string_test.ml\", line 8, characters 1-8",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: Stdlib.string_of_float(Stdlib.neg_infinity),
-                      _1: "-inf"
-                    };
+                TAG: /* Eq */0,
+                _0: Stdlib.string_of_float(Stdlib.neg_infinity),
+                _1: "-inf"
+              };
             })
         ],
         tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/topsort_test.js b/jscomp/test/dist/jscomp/test/topsort_test.js
index 5f911b5d5..7cb32c659 100644
--- a/jscomp/test/dist/jscomp/test/topsort_test.js
+++ b/jscomp/test/dist/jscomp/test/topsort_test.js
@@ -63,15 +63,15 @@ const graph = {
 
 function nexts(x, g) {
   return Stdlib__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,13 +123,13 @@ if (!Caml_obj.caml_equal(dfs1({
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/topsort_test.ml",
-              29,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/topsort_test.ml",
+          29,
+          2
+        ]
+      });
 }
 
 Stdlib.print_newline(undefined);
@@ -160,13 +160,13 @@ if (!Caml_obj.caml_equal(dfs1({
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/topsort_test.ml",
-              32,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/topsort_test.ml",
+          32,
+          2
+        ]
+      });
 }
 
 function dfs2(nodes, graph, visited) {
@@ -220,13 +220,13 @@ if (!Caml_obj.caml_equal(dfs2({
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/topsort_test.ml",
-              47,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/topsort_test.ml",
+          47,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(dfs2({
@@ -255,13 +255,13 @@ if (!Caml_obj.caml_equal(dfs2({
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/topsort_test.ml",
-              48,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/topsort_test.ml",
+          48,
+          2
+        ]
+      });
 }
 
 function dfs3(nodes, graph) {
@@ -275,8 +275,8 @@ function dfs3(nodes, graph) {
         tl: visited.contents
       };
       return Stdlib__List.iter((function (x) {
-                    aux(x, graph);
-                  }), nexts(node, graph));
+              aux(x, graph);
+            }), nexts(node, graph));
     }
     
   };
@@ -312,13 +312,13 @@ if (!Caml_obj.caml_equal(dfs3({
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/topsort_test.ml",
-              65,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/topsort_test.ml",
+          65,
+          2
+        ]
+      });
 }
 
 if (!Caml_obj.caml_equal(dfs3({
@@ -347,13 +347,13 @@ if (!Caml_obj.caml_equal(dfs3({
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/topsort_test.ml",
-              66,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/topsort_test.ml",
+          66,
+          2
+        ]
+      });
 }
 
 const grwork = {
@@ -435,13 +435,13 @@ if (!Caml_obj.caml_equal(unsafe_topsort(grwork), {
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/topsort_test.ml",
-              110,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/topsort_test.ml",
+          110,
+          2
+        ]
+      });
 }
 
 const funarg = {
@@ -462,12 +462,12 @@ function create(l, v, r) {
   let hr;
   hr = /* tag */typeof r === "number" || typeof r === "string" ? 0 : r.h;
   return {
-          TAG: /* Node */0,
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: /* Node */0,
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, v, r) {
@@ -478,9 +478,9 @@ function bal(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (/* tag */typeof l === "number" || typeof l === "string") {
       throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-                MEL_EXN_ID: "Invalid_argument",
-                _1: "Set.bal"
-              });
+            MEL_EXN_ID: "Invalid_argument",
+            _1: "Set.bal"
+          });
     }
     const lr = l.r;
     const lv = l.v;
@@ -492,24 +492,24 @@ function bal(l, v, r) {
       return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
     }
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: /* Node */0,
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: /* Node */0,
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (/* tag */typeof r === "number" || typeof r === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.bal"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.bal"
+        });
   }
   const rr = r.r;
   const rv = r.v;
@@ -521,20 +521,20 @@ function bal(l, v, r) {
     return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
   }
   throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-            MEL_EXN_ID: "Invalid_argument",
-            _1: "Set.bal"
-          });
+        MEL_EXN_ID: "Invalid_argument",
+        _1: "Set.bal"
+      });
 }
 
 function add(x, t) {
   if (/* tag */typeof t === "number" || typeof t === "string") {
     return {
-            TAG: /* Node */0,
-            l: /* Empty */0,
-            v: x,
-            r: /* Empty */0,
-            h: 1
-          };
+      TAG: /* Node */0,
+      l: /* Empty */0,
+      v: x,
+      r: /* Empty */0,
+      h: 1
+    };
   }
   const r = t.r;
   const v = t.v;
@@ -561,12 +561,12 @@ function add(x, t) {
 
 function singleton(x) {
   return {
-          TAG: /* Node */0,
-          l: /* Empty */0,
-          v: x,
-          r: /* Empty */0,
-          h: 1
-        };
+    TAG: /* Node */0,
+    l: /* Empty */0,
+    v: x,
+    r: /* Empty */0,
+    h: 1
+  };
 }
 
 function add_min_element(x, param) {
@@ -608,8 +608,8 @@ function min_elt(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const l = param.l;
     if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -640,8 +640,8 @@ function max_elt(_param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     let tmp = param.r;
     if (/* tag */typeof tmp === "number" || typeof tmp === "string") {
@@ -670,9 +670,9 @@ function max_elt_opt(_param) {
 function remove_min_elt(param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     throw new Caml_js_exceptions.MelangeError("Invalid_argument", {
-              MEL_EXN_ID: "Invalid_argument",
-              _1: "Set.remove_min_elt"
-            });
+          MEL_EXN_ID: "Invalid_argument",
+          _1: "Set.remove_min_elt"
+        });
   }
   const l = param.l;
   if (/* tag */typeof l === "number" || typeof l === "string") {
@@ -695,10 +695,10 @@ function concat(t1, t2) {
 function split(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            false,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      false,
+      /* Empty */0
+    ];
   }
   const r = param.r;
   const v = param.v;
@@ -706,25 +706,25 @@ function split(x, param) {
   const c = Curry._2(funarg.compare, x, v);
   if (c === 0) {
     return [
-            l,
-            true,
-            r
-          ];
+      l,
+      true,
+      r
+    ];
   }
   if (c < 0) {
     const match = split(x, l);
     return [
-            match[0],
-            match[1],
-            join(match[2], v, r)
-          ];
+      match[0],
+      match[1],
+      join(match[2], v, r)
+    ];
   }
   const 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) {
@@ -830,12 +830,12 @@ function inter(s1, s2) {
 function split_bis(x, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return {
-            TAG: /* NotFound */0,
-            _0: /* Empty */0,
-            _1: (function (param) {
-                return /* Empty */0;
-              })
-          };
+      TAG: /* NotFound */0,
+      _0: /* Empty */0,
+      _1: (function (param) {
+          return /* Empty */0;
+        })
+    };
   }
   const r = param.r;
   const v = param.v;
@@ -851,22 +851,22 @@ function split_bis(x, param) {
     }
     const rl = match._1;
     return {
-            TAG: /* NotFound */0,
-            _0: match._0,
-            _1: (function (param) {
-                return join(Curry._1(rl, undefined), v, r);
-              })
-          };
+      TAG: /* NotFound */0,
+      _0: match._0,
+      _1: (function (param) {
+          return join(Curry._1(rl, undefined), v, r);
+        })
+    };
   }
   const match$1 = split_bis(x, r);
   if (/* tag */typeof match$1 === "number" || typeof match$1 === "string") {
     return /* Found */0;
   } else {
     return {
-            TAG: /* NotFound */0,
-            _0: join(l, v, match$1._0),
-            _1: match$1._1
-          };
+      TAG: /* NotFound */0,
+      _0: join(l, v, match$1._0),
+      _1: match$1._1
+    };
   }
 }
 
@@ -1098,9 +1098,9 @@ function filter(p, t) {
 function partition(p, param) {
   if (/* tag */typeof param === "number" || typeof param === "string") {
     return [
-            /* Empty */0,
-            /* Empty */0
-          ];
+      /* Empty */0,
+      /* Empty */0
+    ];
   }
   const v = param.v;
   const match = partition(p, param.l);
@@ -1112,14 +1112,14 @@ function partition(p, param) {
   const 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)
+    ];
   }
 }
 
@@ -1156,8 +1156,8 @@ function find(x, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     const c = Curry._2(funarg.compare, x, v);
@@ -1174,8 +1174,8 @@ function find_first(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -1238,8 +1238,8 @@ function find_last(f, _param) {
     const param = _param;
     if (/* tag */typeof param === "number" || typeof param === "string") {
       throw new Caml_js_exceptions.MelangeError(Stdlib.Not_found, {
-                MEL_EXN_ID: Stdlib.Not_found
-              });
+            MEL_EXN_ID: Stdlib.Not_found
+          });
     }
     const v = param.v;
     if (Curry._1(f, v)) {
@@ -1393,21 +1393,21 @@ function of_list(l) {
         switch (n) {
           case 0 :
               return [
-                      /* Empty */0,
-                      l
-                    ];
+                /* Empty */0,
+                l
+              ];
           case 1 :
               if (l) {
                 return [
-                        {
-                          TAG: /* Node */0,
-                          l: /* Empty */0,
-                          v: l.hd,
-                          r: /* Empty */0,
-                          h: 1
-                        },
-                        l.tl
-                      ];
+                  {
+                    TAG: /* Node */0,
+                    l: /* Empty */0,
+                    v: l.hd,
+                    r: /* Empty */0,
+                    h: 1
+                  },
+                  l.tl
+                ];
               }
               break;
           case 2 :
@@ -1415,21 +1415,21 @@ function of_list(l) {
                 const match = l.tl;
                 if (match) {
                   return [
-                          {
-                            TAG: /* Node */0,
-                            l: {
-                              TAG: /* Node */0,
-                              l: /* Empty */0,
-                              v: l.hd,
-                              r: /* Empty */0,
-                              h: 1
-                            },
-                            v: match.hd,
-                            r: /* Empty */0,
-                            h: 2
-                          },
-                          match.tl
-                        ];
+                    {
+                      TAG: /* Node */0,
+                      l: {
+                        TAG: /* Node */0,
+                        l: /* Empty */0,
+                        v: l.hd,
+                        r: /* Empty */0,
+                        h: 1
+                      },
+                      v: match.hd,
+                      r: /* Empty */0,
+                      h: 2
+                    },
+                    match.tl
+                  ];
                 }
                 
               }
@@ -1441,27 +1441,27 @@ function of_list(l) {
                   const match$2 = match$1.tl;
                   if (match$2) {
                     return [
-                            {
-                              TAG: /* Node */0,
-                              l: {
-                                TAG: /* Node */0,
-                                l: /* Empty */0,
-                                v: l.hd,
-                                r: /* Empty */0,
-                                h: 1
-                              },
-                              v: match$1.hd,
-                              r: {
-                                TAG: /* Node */0,
-                                l: /* Empty */0,
-                                v: match$2.hd,
-                                r: /* Empty */0,
-                                h: 1
-                              },
-                              h: 2
-                            },
-                            match$2.tl
-                          ];
+                      {
+                        TAG: /* Node */0,
+                        l: {
+                          TAG: /* Node */0,
+                          l: /* Empty */0,
+                          v: l.hd,
+                          r: /* Empty */0,
+                          h: 1
+                        },
+                        v: match$1.hd,
+                        r: {
+                          TAG: /* Node */0,
+                          l: /* Empty */0,
+                          v: match$2.hd,
+                          r: /* Empty */0,
+                          h: 1
+                        },
+                        h: 2
+                      },
+                      match$2.tl
+                    ];
                   }
                   
                 }
@@ -1477,18 +1477,18 @@ function of_list(l) {
         if (l$1) {
           const 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 new Caml_js_exceptions.MelangeError("Assert_failure", {
-                  MEL_EXN_ID: "Assert_failure",
-                  _1: [
-                    "jscomp/stdlib/set.ml",
-                    571,
-                    18
-                  ]
-                });
+              MEL_EXN_ID: "Assert_failure",
+              _1: [
+                "jscomp/stdlib/set.ml",
+                571,
+                18
+              ]
+            });
       };
       return sub(Stdlib__List.length(l$1), l$1)[0];
     } else {
@@ -1501,8 +1501,8 @@ function of_list(l) {
 
 function add_seq(i, m) {
   return Stdlib__Seq.fold_left((function (s, x) {
-                return add(x, s);
-              }), m, i);
+          return add(x, s);
+        }), m, i);
 }
 
 function of_seq(i) {
@@ -1515,12 +1515,12 @@ function seq_of_enum_(c, param) {
   }
   const partial_arg = cons_enum(c._1, c._2);
   return {
-          TAG: /* Cons */0,
-          _0: c._0,
-          _1: (function (param) {
-              return seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: c._0,
+    _1: (function (param) {
+        return seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_seq(c) {
@@ -1554,12 +1554,12 @@ function rev_seq_of_enum_(c, param) {
   }
   const partial_arg = snoc_enum(c._1, c._2);
   return {
-          TAG: /* Cons */0,
-          _0: c._0,
-          _1: (function (param) {
-              return rev_seq_of_enum_(partial_arg, param);
-            })
-        };
+    TAG: /* Cons */0,
+    _0: c._0,
+    _1: (function (param) {
+        return rev_seq_of_enum_(partial_arg, param);
+      })
+  };
 }
 
 function to_rev_seq(c) {
@@ -1582,11 +1582,11 @@ function to_seq_from(low, s) {
       const n = Curry._2(funarg.compare, v, low);
       if (n === 0) {
         return {
-                TAG: /* More */0,
-                _0: v,
-                _1: r,
-                _2: c
-              };
+          TAG: /* More */0,
+          _0: v,
+          _1: r,
+          _2: c
+        };
       }
       if (n < 0) {
         _s = r;
@@ -1670,20 +1670,20 @@ function pathsort(graph) {
     const set = param[0];
     if (Curry._2(mem, node, set)) {
       throw new Caml_js_exceptions.MelangeError(Cycle, {
-                MEL_EXN_ID: Cycle,
-                _1: {
-                  hd: node,
-                  tl: stack
-                }
-              });
-    }
-    return [
-            Curry._2(add, node, set),
-            {
+            MEL_EXN_ID: Cycle,
+            _1: {
               hd: node,
               tl: stack
             }
-          ];
+          });
+    }
+    return [
+      Curry._2(add, node, set),
+      {
+        hd: node,
+        tl: stack
+      }
+    ];
   };
   const sort_nodes = function (path, nodes) {
     Stdlib__List.iter((function (node) {
@@ -1727,13 +1727,13 @@ if (!Caml_obj.caml_equal(pathsort(grwork), {
         }
       })) {
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/topsort_test.ml",
-              150,
-              4
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/topsort_test.ml",
+          150,
+          4
+        ]
+      });
 }
 
 try {
@@ -1745,13 +1745,13 @@ try {
         tl: grwork
       });
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/topsort_test.ml",
-              156,
-              8
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/topsort_test.ml",
+          156,
+          8
+        ]
+      });
 }
 catch (raw_exn){
   const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -1782,13 +1782,13 @@ catch (raw_exn){
   }
   if (exit === 1) {
     throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-              MEL_EXN_ID: "Assert_failure",
-              _1: [
-                "jscomp/test/topsort_test.ml",
-                159,
-                11
-              ]
-            });
+          MEL_EXN_ID: "Assert_failure",
+          _1: [
+            "jscomp/test/topsort_test.ml",
+            159,
+            11
+          ]
+        });
   }
   
 }
diff --git a/jscomp/test/dist/jscomp/test/tramp_fib.js b/jscomp/test/dist/jscomp/test/tramp_fib.js
index a978e1f43..03da486a7 100644
--- a/jscomp/test/dist/jscomp/test/tramp_fib.js
+++ b/jscomp/test/dist/jscomp/test/tramp_fib.js
@@ -20,23 +20,23 @@ function fib(n, k) {
     return k(1);
   } else {
     return {
-            TAG: /* Suspend */1,
-            _0: (function () {
-                return fib(n - 1 | 0, (function (v0) {
-                              return fib(n - 2 | 0, (function (v1) {
-                                            return k(v0 + v1 | 0);
-                                          }));
-                            }));
-              })
-          };
+      TAG: /* Suspend */1,
+      _0: (function () {
+          return fib(n - 1 | 0, (function (v0) {
+                  return fib(n - 2 | 0, (function (v1) {
+                          return k(v0 + v1 | 0);
+                        }));
+                }));
+        })
+    };
   }
 }
 
 const u = fib(10, (function (x) {
         return {
-                TAG: /* Continue */0,
-                _0: x
-              };
+          TAG: /* Continue */0,
+          _0: x
+        };
       }));
 
 function iter(_bounce) {
@@ -54,22 +54,22 @@ function isEven(n) {
   if (n !== 0) {
     if (n !== 1) {
       return {
-              TAG: /* Suspend */1,
-              _0: (function () {
-                  return isOdd(n - 1 | 0);
-                })
-            };
+        TAG: /* Suspend */1,
+        _0: (function () {
+            return isOdd(n - 1 | 0);
+          })
+      };
     } else {
       return {
-              TAG: /* Continue */0,
-              _0: false
-            };
+        TAG: /* Continue */0,
+        _0: false
+      };
     }
   } else {
     return {
-            TAG: /* Continue */0,
-            _0: true
-          };
+      TAG: /* Continue */0,
+      _0: true
+    };
   }
 }
 
@@ -79,15 +79,15 @@ function isOdd(n) {
       return isEven(n - 1 | 0);
     } else {
       return {
-              TAG: /* Continue */0,
-              _0: true
-            };
+        TAG: /* Continue */0,
+        _0: true
+      };
     }
   } else {
     return {
-            TAG: /* Continue */0,
-            _0: false
-          };
+      TAG: /* Continue */0,
+      _0: false
+    };
   }
 }
 
diff --git a/jscomp/test/dist/jscomp/test/tscanf_test.js b/jscomp/test/dist/jscomp/test/tscanf_test.js
index 8fe74d934..33d99695d 100644
--- a/jscomp/test/dist/jscomp/test/tscanf_test.js
+++ b/jscomp/test/dist/jscomp/test/tscanf_test.js
@@ -46,34 +46,10 @@ function id(x) {
 
 function test0(param) {
   return ((((Curry._2(Stdlib__Scanf.sscanf("", {
-                          TAG: /* Format */0,
-                          _0: /* End_of_format */0,
-                          _1: ""
-                        }), id, 1) + Curry._2(Stdlib__Scanf.sscanf("", {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ' ' */32,
-                            _1: /* End_of_format */0
-                          },
-                          _1: " "
-                        }), id, 2) | 0) + Curry._2(Stdlib__Scanf.sscanf(" ", {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Char_literal */12,
-                          _0: /* ' ' */32,
-                          _1: /* End_of_format */0
-                        },
-                        _1: " "
-                      }), id, 3) | 0) + Curry._2(Stdlib__Scanf.sscanf("\t", {
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* Char_literal */12,
-                        _0: /* ' ' */32,
-                        _1: /* End_of_format */0
-                      },
-                      _1: " "
-                    }), id, 4) | 0) + Curry._2(Stdlib__Scanf.sscanf("\n", {
+                    TAG: /* Format */0,
+                    _0: /* End_of_format */0,
+                    _1: ""
+                  }), id, 1) + Curry._2(Stdlib__Scanf.sscanf("", {
                     TAG: /* Format */0,
                     _0: {
                       TAG: /* Char_literal */12,
@@ -81,79 +57,61 @@ function test0(param) {
                       _1: /* End_of_format */0
                     },
                     _1: " "
-                  }), id, 5) | 0) + Curry._1(Stdlib__Scanf.sscanf("\n\t 6", {
+                  }), id, 2) | 0) + Curry._2(Stdlib__Scanf.sscanf(" ", {
                   TAG: /* Format */0,
                   _0: {
                     TAG: /* Char_literal */12,
                     _0: /* ' ' */32,
-                    _1: {
-                      TAG: /* Int */4,
-                      _0: /* Int_d */0,
-                      _1: /* No_padding */0,
-                      _2: /* No_precision */0,
-                      _3: /* End_of_format */0
-                    }
+                    _1: /* End_of_format */0
                   },
-                  _1: " %d"
-                }), id) | 0;
+                  _1: " "
+                }), id, 3) | 0) + Curry._2(Stdlib__Scanf.sscanf("\t", {
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Char_literal */12,
+                  _0: /* ' ' */32,
+                  _1: /* End_of_format */0
+                },
+                _1: " "
+              }), id, 4) | 0) + Curry._2(Stdlib__Scanf.sscanf("\n", {
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char_literal */12,
+                _0: /* ' ' */32,
+                _1: /* End_of_format */0
+              },
+              _1: " "
+            }), id, 5) | 0) + Curry._1(Stdlib__Scanf.sscanf("\n\t 6", {
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Char_literal */12,
+              _0: /* ' ' */32,
+              _1: {
+                TAG: /* Int */4,
+                _0: /* Int_d */0,
+                _1: /* No_padding */0,
+                _2: /* No_precision */0,
+                _3: /* End_of_format */0
+              }
+            },
+            _1: " %d"
+          }), id) | 0;
 }
 
 test("File \"jscomp/test/tscanf_test.ml\", line 42, characters 5-12", test0(undefined) === 21);
 
 function test1(param) {
   return (((Curry._1(Stdlib__Scanf.sscanf("1", {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Int */4,
-                          _0: /* Int_d */0,
-                          _1: /* No_padding */0,
-                          _2: /* No_precision */0,
-                          _3: /* End_of_format */0
-                        },
-                        _1: "%d"
-                      }), id) + Curry._1(Stdlib__Scanf.sscanf(" 2", {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Char_literal */12,
-                          _0: /* ' ' */32,
-                          _1: {
-                            TAG: /* Int */4,
-                            _0: /* Int_d */0,
-                            _1: /* No_padding */0,
-                            _2: /* No_precision */0,
-                            _3: /* End_of_format */0
-                          }
-                        },
-                        _1: " %d"
-                      }), id) | 0) + Curry._1(Stdlib__Scanf.sscanf(" -2", {
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* Char_literal */12,
-                        _0: /* ' ' */32,
-                        _1: {
-                          TAG: /* Int */4,
-                          _0: /* Int_d */0,
-                          _1: /* No_padding */0,
-                          _2: /* No_precision */0,
-                          _3: /* End_of_format */0
-                        }
-                      },
-                      _1: " %d"
-                    }), id) | 0) + Curry._1(Stdlib__Scanf.sscanf(" +2", {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Char_literal */12,
-                      _0: /* ' ' */32,
-                      _1: {
-                        TAG: /* Int */4,
-                        _0: /* Int_d */0,
-                        _1: /* No_padding */0,
-                        _2: /* No_precision */0,
-                        _3: /* End_of_format */0
-                      }
-                    },
-                    _1: " %d"
-                  }), id) | 0) + Curry._1(Stdlib__Scanf.sscanf(" 2a ", {
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Int */4,
+                    _0: /* Int_d */0,
+                    _1: /* No_padding */0,
+                    _2: /* No_precision */0,
+                    _3: /* End_of_format */0
+                  },
+                  _1: "%d"
+                }), id) + Curry._1(Stdlib__Scanf.sscanf(" 2", {
                   TAG: /* Format */0,
                   _0: {
                     TAG: /* Char_literal */12,
@@ -163,137 +121,179 @@ function test1(param) {
                       _0: /* Int_d */0,
                       _1: /* No_padding */0,
                       _2: /* No_precision */0,
-                      _3: {
-                        TAG: /* Char_literal */12,
-                        _0: /* 'a' */97,
-                        _1: /* End_of_format */0
-                      }
+                      _3: /* End_of_format */0
                     }
                   },
-                  _1: " %da"
-                }), id) | 0;
+                  _1: " %d"
+                }), id) | 0) + Curry._1(Stdlib__Scanf.sscanf(" -2", {
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Char_literal */12,
+                  _0: /* ' ' */32,
+                  _1: {
+                    TAG: /* Int */4,
+                    _0: /* Int_d */0,
+                    _1: /* No_padding */0,
+                    _2: /* No_precision */0,
+                    _3: /* End_of_format */0
+                  }
+                },
+                _1: " %d"
+              }), id) | 0) + Curry._1(Stdlib__Scanf.sscanf(" +2", {
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char_literal */12,
+                _0: /* ' ' */32,
+                _1: {
+                  TAG: /* Int */4,
+                  _0: /* Int_d */0,
+                  _1: /* No_padding */0,
+                  _2: /* No_precision */0,
+                  _3: /* End_of_format */0
+                }
+              },
+              _1: " %d"
+            }), id) | 0) + Curry._1(Stdlib__Scanf.sscanf(" 2a ", {
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Char_literal */12,
+              _0: /* ' ' */32,
+              _1: {
+                TAG: /* Int */4,
+                _0: /* Int_d */0,
+                _1: /* No_padding */0,
+                _2: /* No_precision */0,
+                _3: {
+                  TAG: /* Char_literal */12,
+                  _0: /* 'a' */97,
+                  _1: /* End_of_format */0
+                }
+              }
+            },
+            _1: " %da"
+          }), id) | 0;
 }
 
 test("File \"jscomp/test/tscanf_test.ml\", line 54, characters 5-12", test1(undefined) === 5);
 
 function test2(param) {
   return (Curry._1(Stdlib__Scanf.sscanf("123", {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Int */4,
-                      _0: /* Int_i */3,
-                      _1: {
-                        TAG: /* Lit_padding */0,
-                        _0: /* Right */1,
-                        _1: 2
-                      },
-                      _2: /* No_precision */0,
-                      _3: /* End_of_format */0
-                    },
-                    _1: "%2i"
-                  }), id) + Curry._1(Stdlib__Scanf.sscanf("245", {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Int */4,
-                      _0: /* Int_d */0,
-                      _1: /* No_padding */0,
-                      _2: /* No_precision */0,
-                      _3: /* End_of_format */0
-                    },
-                    _1: "%d"
-                  }), id) | 0) + Curry._1(Stdlib__Scanf.sscanf(" 2a ", {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Char_literal */12,
-                    _0: /* ' ' */32,
-                    _1: {
-                      TAG: /* Int */4,
-                      _0: /* Int_d */0,
-                      _1: {
-                        TAG: /* Lit_padding */0,
-                        _0: /* Right */1,
-                        _1: 1
-                      },
-                      _2: /* No_precision */0,
-                      _3: {
-                        TAG: /* Char_literal */12,
-                        _0: /* 'a' */97,
-                        _1: /* End_of_format */0
-                      }
-                    }
-                  },
-                  _1: " %1da"
-                }), id) | 0;
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Int */4,
+                _0: /* Int_i */3,
+                _1: {
+                  TAG: /* Lit_padding */0,
+                  _0: /* Right */1,
+                  _1: 2
+                },
+                _2: /* No_precision */0,
+                _3: /* End_of_format */0
+              },
+              _1: "%2i"
+            }), id) + Curry._1(Stdlib__Scanf.sscanf("245", {
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Int */4,
+                _0: /* Int_d */0,
+                _1: /* No_padding */0,
+                _2: /* No_precision */0,
+                _3: /* End_of_format */0
+              },
+              _1: "%d"
+            }), id) | 0) + Curry._1(Stdlib__Scanf.sscanf(" 2a ", {
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Char_literal */12,
+              _0: /* ' ' */32,
+              _1: {
+                TAG: /* Int */4,
+                _0: /* Int_d */0,
+                _1: {
+                  TAG: /* Lit_padding */0,
+                  _0: /* Right */1,
+                  _1: 1
+                },
+                _2: /* No_precision */0,
+                _3: {
+                  TAG: /* Char_literal */12,
+                  _0: /* 'a' */97,
+                  _1: /* End_of_format */0
+                }
+              }
+            },
+            _1: " %1da"
+          }), id) | 0;
 }
 
 test("File \"jscomp/test/tscanf_test.ml\", line 63, characters 5-12", test2(undefined) === 259);
 
 function test3(param) {
   return ((Curry._1(Stdlib__Scanf.sscanf("0xff", {
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* Int */4,
-                        _0: /* Int_i */3,
-                        _1: {
-                          TAG: /* Lit_padding */0,
-                          _0: /* Right */1,
-                          _1: 3
-                        },
-                        _2: /* No_precision */0,
-                        _3: /* End_of_format */0
-                      },
-                      _1: "%3i"
-                    }), id) + Curry._1(Stdlib__Scanf.sscanf("0XEF", {
-                      TAG: /* Format */0,
-                      _0: {
-                        TAG: /* Int */4,
-                        _0: /* Int_i */3,
-                        _1: {
-                          TAG: /* Lit_padding */0,
-                          _0: /* Right */1,
-                          _1: 3
-                        },
-                        _2: /* No_precision */0,
-                        _3: /* End_of_format */0
-                      },
-                      _1: "%3i"
-                    }), id) | 0) + Curry._1(Stdlib__Scanf.sscanf("x=-245", {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: " x = ",
-                      _1: {
-                        TAG: /* Int */4,
-                        _0: /* Int_d */0,
-                        _1: /* No_padding */0,
-                        _2: /* No_precision */0,
-                        _3: /* End_of_format */0
-                      }
-                    },
-                    _1: " x = %d"
-                  }), id) | 0) + Curry._1(Stdlib__Scanf.sscanf(" 2a ", {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Char_literal */12,
-                    _0: /* ' ' */32,
-                    _1: {
-                      TAG: /* Int */4,
-                      _0: /* Int_d */0,
-                      _1: {
-                        TAG: /* Lit_padding */0,
-                        _0: /* Right */1,
-                        _1: 1
-                      },
-                      _2: /* No_precision */0,
-                      _3: {
-                        TAG: /* Char_literal */12,
-                        _0: /* 'a' */97,
-                        _1: /* End_of_format */0
-                      }
-                    }
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Int */4,
+                  _0: /* Int_i */3,
+                  _1: {
+                    TAG: /* Lit_padding */0,
+                    _0: /* Right */1,
+                    _1: 3
                   },
-                  _1: " %1da"
-                }), id) | 0;
+                  _2: /* No_precision */0,
+                  _3: /* End_of_format */0
+                },
+                _1: "%3i"
+              }), id) + Curry._1(Stdlib__Scanf.sscanf("0XEF", {
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Int */4,
+                  _0: /* Int_i */3,
+                  _1: {
+                    TAG: /* Lit_padding */0,
+                    _0: /* Right */1,
+                    _1: 3
+                  },
+                  _2: /* No_precision */0,
+                  _3: /* End_of_format */0
+                },
+                _1: "%3i"
+              }), id) | 0) + Curry._1(Stdlib__Scanf.sscanf("x=-245", {
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: " x = ",
+                _1: {
+                  TAG: /* Int */4,
+                  _0: /* Int_d */0,
+                  _1: /* No_padding */0,
+                  _2: /* No_precision */0,
+                  _3: /* End_of_format */0
+                }
+              },
+              _1: " x = %d"
+            }), id) | 0) + Curry._1(Stdlib__Scanf.sscanf(" 2a ", {
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Char_literal */12,
+              _0: /* ' ' */32,
+              _1: {
+                TAG: /* Int */4,
+                _0: /* Int_d */0,
+                _1: {
+                  TAG: /* Lit_padding */0,
+                  _0: /* Right */1,
+                  _1: 1
+                },
+                _2: /* No_precision */0,
+                _3: {
+                  TAG: /* Char_literal */12,
+                  _0: /* 'a' */97,
+                  _1: /* End_of_format */0
+                }
+              }
+            },
+            _1: " %1da"
+          }), id) | 0;
 }
 
 test("File \"jscomp/test/tscanf_test.ml\", line 73, characters 5-12", test3(undefined) === -214);
@@ -553,25 +553,25 @@ function test4(param) {
             return b0 === 0.113;
           }))) {
     return Curry._1(Stdlib__Scanf.bscanf(Stdlib__Scanf.Scanning.from_string("-000.113"), {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Float */8,
-                      _0: [
-                        /* Float_flag_ */0,
-                        /* Float_f */0
-                      ],
-                      _1: {
-                        TAG: /* Lit_padding */0,
-                        _0: /* Right */1,
-                        _1: 15
-                      },
-                      _2: /* No_precision */0,
-                      _3: /* End_of_format */0
-                    },
-                    _1: "%15f"
-                  }), (function (b0) {
-                  return b0 === -0.113;
-                }));
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Float */8,
+                _0: [
+                  /* Float_flag_ */0,
+                  /* Float_f */0
+                ],
+                _1: {
+                  TAG: /* Lit_padding */0,
+                  _0: /* Right */1,
+                  _1: 15
+                },
+                _2: /* No_precision */0,
+                _3: /* End_of_format */0
+              },
+              _1: "%15f"
+            }), (function (b0) {
+            return b0 === -0.113;
+          }));
   } else {
     return false;
   }
@@ -683,64 +683,64 @@ function test5(param) {
             return b1 === 10.0 && b2 === b1 ? b3 === 0.13 : false;
           }))) {
     return Curry._1(Stdlib__Scanf.bscanf(Stdlib__Scanf.Scanning.from_string("1 1.1 0e+1 1.3e-1"), {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Float */8,
-                      _0: [
-                        /* Float_flag_ */0,
-                        /* Float_g */3
-                      ],
-                      _1: /* No_padding */0,
-                      _2: /* No_precision */0,
-                      _3: {
-                        TAG: /* Char_literal */12,
-                        _0: /* ' ' */32,
-                        _1: {
-                          TAG: /* Float */8,
-                          _0: [
-                            /* Float_flag_ */0,
-                            /* Float_g */3
-                          ],
-                          _1: /* No_padding */0,
-                          _2: /* No_precision */0,
-                          _3: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ' ' */32,
-                            _1: {
-                              TAG: /* Float */8,
-                              _0: [
-                                /* Float_flag_ */0,
-                                /* Float_g */3
-                              ],
-                              _1: /* No_padding */0,
-                              _2: /* No_precision */0,
-                              _3: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
-                                _1: {
-                                  TAG: /* Float */8,
-                                  _0: [
-                                    /* Float_flag_ */0,
-                                    /* Float_g */3
-                                  ],
-                                  _1: /* No_padding */0,
-                                  _2: /* No_precision */0,
-                                  _3: /* End_of_format */0
-                                }
-                              }
-                            }
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Float */8,
+                _0: [
+                  /* Float_flag_ */0,
+                  /* Float_g */3
+                ],
+                _1: /* No_padding */0,
+                _2: /* No_precision */0,
+                _3: {
+                  TAG: /* Char_literal */12,
+                  _0: /* ' ' */32,
+                  _1: {
+                    TAG: /* Float */8,
+                    _0: [
+                      /* Float_flag_ */0,
+                      /* Float_g */3
+                    ],
+                    _1: /* No_padding */0,
+                    _2: /* No_precision */0,
+                    _3: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
+                      _1: {
+                        TAG: /* Float */8,
+                        _0: [
+                          /* Float_flag_ */0,
+                          /* Float_g */3
+                        ],
+                        _1: /* No_padding */0,
+                        _2: /* No_precision */0,
+                        _3: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: {
+                            TAG: /* Float */8,
+                            _0: [
+                              /* Float_flag_ */0,
+                              /* Float_g */3
+                            ],
+                            _1: /* No_padding */0,
+                            _2: /* No_precision */0,
+                            _3: /* End_of_format */0
                           }
                         }
                       }
-                    },
-                    _1: "%g %g %g %g"
-                  }), (function (b1, b2, b3, b4) {
-                  if (b1 === 1.0 && b2 === 1.1 && b3 === 0.0) {
-                    return b4 === 0.13;
-                  } else {
-                    return false;
+                    }
                   }
-                }));
+                }
+              },
+              _1: "%g %g %g %g"
+            }), (function (b1, b2, b3, b4) {
+            if (b1 === 1.0 && b2 === 1.1 && b3 === 0.0) {
+              return b4 === 0.13;
+            } else {
+              return false;
+            }
+          }));
   } else {
     return false;
   }
@@ -763,12 +763,12 @@ function test6(param) {
               _1: "%B%B"
             }), (function (b1, b2) {
             return Caml_obj.caml_equal([
-                        b1,
-                        b2
-                      ], [
-                        true,
-                        true
-                      ]);
+                  b1,
+                  b2
+                ], [
+                  true,
+                  true
+                ]);
           })) && Curry._1(Stdlib__Scanf.bscanf(Stdlib__Scanf.Scanning.from_string("truefalse"), {
               TAG: /* Format */0,
               _0: {
@@ -783,12 +783,12 @@ function test6(param) {
               _1: "%B%B"
             }), (function (b1, b2) {
             return Caml_obj.caml_equal([
-                        b1,
-                        b2
-                      ], [
-                        true,
-                        false
-                      ]);
+                  b1,
+                  b2
+                ], [
+                  true,
+                  false
+                ]);
           })) && Curry._1(Stdlib__Scanf.bscanf(Stdlib__Scanf.Scanning.from_string("falsetrue"), {
               TAG: /* Format */0,
               _0: {
@@ -803,12 +803,12 @@ function test6(param) {
               _1: "%B%B"
             }), (function (b1, b2) {
             return Caml_obj.caml_equal([
-                        b1,
-                        b2
-                      ], [
-                        false,
-                        true
-                      ]);
+                  b1,
+                  b2
+                ], [
+                  false,
+                  true
+                ]);
           })) && Curry._1(Stdlib__Scanf.bscanf(Stdlib__Scanf.Scanning.from_string("falsefalse"), {
               TAG: /* Format */0,
               _0: {
@@ -823,38 +823,38 @@ function test6(param) {
               _1: "%B%B"
             }), (function (b1, b2) {
             return Caml_obj.caml_equal([
-                        b1,
-                        b2
-                      ], [
-                        false,
-                        false
-                      ]);
+                  b1,
+                  b2
+                ], [
+                  false,
+                  false
+                ]);
           }))) {
     return Curry._1(Stdlib__Scanf.bscanf(Stdlib__Scanf.Scanning.from_string("true false"), {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Bool */9,
-                      _0: /* No_padding */0,
-                      _1: {
-                        TAG: /* Char_literal */12,
-                        _0: /* ' ' */32,
-                        _1: {
-                          TAG: /* Bool */9,
-                          _0: /* No_padding */0,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "%B %B"
-                  }), (function (b1, b2) {
-                  return Caml_obj.caml_equal([
-                              b1,
-                              b2
-                            ], [
-                              true,
-                              false
-                            ]);
-                }));
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Bool */9,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* Char_literal */12,
+                  _0: /* ' ' */32,
+                  _1: {
+                    TAG: /* Bool */9,
+                    _0: /* No_padding */0,
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: "%B %B"
+            }), (function (b1, b2) {
+            return Caml_obj.caml_equal([
+                  b1,
+                  b2
+                ], [
+                  true,
+                  false
+                ]);
+          }));
   } else {
     return false;
   }
@@ -902,37 +902,37 @@ function test7(param) {
             return c1 === /* 'a' */97 && c2 === /* '\n' */10 && c3 === /* '\t' */9 && c4 === /* '\000' */0 ? c5 === /* ' ' */32 : false;
           }))) {
     return Curry._1(Stdlib__Scanf.bscanf(Stdlib__Scanf.Scanning.from_string("a \n \t \0  b"), {
-                    TAG: /* Format */0,
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char */0,
+                _0: {
+                  TAG: /* Char_literal */12,
+                  _0: /* ' ' */32,
+                  _1: {
+                    TAG: /* Char */0,
                     _0: {
-                      TAG: /* Char */0,
-                      _0: {
-                        TAG: /* Char_literal */12,
-                        _0: /* ' ' */32,
-                        _1: {
-                          TAG: /* Char */0,
-                          _0: {
-                            TAG: /* Char_literal */12,
-                            _0: /* ' ' */32,
-                            _1: {
-                              TAG: /* Char */0,
-                              _0: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
-                                _1: /* End_of_format */0
-                              }
-                            }
-                          }
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
+                      _1: {
+                        TAG: /* Char */0,
+                        _0: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: /* End_of_format */0
                         }
                       }
-                    },
-                    _1: "%c %c %c "
-                  }), (function (c1, c2, c3) {
-                  if (c1 === /* 'a' */97 && c2 === /* '\000' */0) {
-                    return c3 === /* 'b' */98;
-                  } else {
-                    return false;
+                    }
                   }
-                }));
+                }
+              },
+              _1: "%c %c %c "
+            }), (function (c1, c2, c3) {
+            if (c1 === /* 'a' */97 && c2 === /* '\000' */0) {
+              return c3 === /* 'b' */98;
+            } else {
+              return false;
+            }
+          }));
   } else {
     return false;
   }
@@ -961,13 +961,13 @@ function verify_read(c) {
     return ;
   }
   throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-            MEL_EXN_ID: "Assert_failure",
-            _1: [
-              "jscomp/test/tscanf_test.ml",
-              174,
-              2
-            ]
-          });
+        MEL_EXN_ID: "Assert_failure",
+        _1: [
+          "jscomp/test/tscanf_test.ml",
+          174,
+          2
+        ]
+      });
 }
 
 function verify_scan_Chars(param) {
@@ -1068,16 +1068,16 @@ function test9(param) {
             return s;
           })) === "\\xef\\xbb\\xbf") {
     return Curry._1(Stdlib__Scanf.sscanf("\" \"", {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Caml_string */3,
-                      _0: /* No_padding */0,
-                      _1: /* End_of_format */0
-                    },
-                    _1: "%S"
-                  }), (function (s) {
-                  return s;
-                })) === " ";
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Caml_string */3,
+                _0: /* No_padding */0,
+                _1: /* End_of_format */0
+              },
+              _1: "%S"
+            }), (function (s) {
+            return s;
+          })) === " ";
   } else {
     return false;
   }
@@ -1089,14 +1089,14 @@ function test10(param) {
   const unit = function (s) {
     const ib = Stdlib__Scanf.Scanning.from_string(s);
     return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Caml_string */3,
-                      _0: /* No_padding */0,
-                      _1: /* End_of_format */0
-                    },
-                    _1: "%S"
-                  }), id);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Caml_string */3,
+                _0: /* No_padding */0,
+                _1: /* End_of_format */0
+              },
+              _1: "%S"
+            }), id);
   };
   const res = Curry._1(Stdlib__Scanf.sscanf("Une chaine: \"celle-ci\" et \"celle-la\"!", {
             TAG: /* Format */0,
@@ -1217,8 +1217,20 @@ function test11(param) {
             return prenom === "Jean-Luc" && nom === "de Leage" ? poids === 68 : false;
           }))) {
     return Curry._1(Stdlib__Scanf.sscanf("Daniel\tde Rauglaudre\t66", {
-                    TAG: /* Format */0,
-                    _0: {
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String */2,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* Formatting_lit */17,
+                  _0: {
+                    TAG: /* Scan_indic */2,
+                    _0: /* '\t' */9
+                  },
+                  _1: {
+                    TAG: /* Char_literal */12,
+                    _0: /* ' ' */32,
+                    _1: {
                       TAG: /* String */2,
                       _0: /* No_padding */0,
                       _1: {
@@ -1231,38 +1243,26 @@ function test11(param) {
                           TAG: /* Char_literal */12,
                           _0: /* ' ' */32,
                           _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* Formatting_lit */17,
-                              _0: {
-                                TAG: /* Scan_indic */2,
-                                _0: /* '\t' */9
-                              },
-                              _1: {
-                                TAG: /* Char_literal */12,
-                                _0: /* ' ' */32,
-                                _1: {
-                                  TAG: /* Int */4,
-                                  _0: /* Int_d */0,
-                                  _1: /* No_padding */0,
-                                  _2: /* No_precision */0,
-                                  _3: /* End_of_format */0
-                                }
-                              }
-                            }
+                            TAG: /* Int */4,
+                            _0: /* Int_d */0,
+                            _1: /* No_padding */0,
+                            _2: /* No_precision */0,
+                            _3: /* End_of_format */0
                           }
                         }
                       }
-                    },
-                    _1: "%s@\t %s@\t %d"
-                  }), (function (prenom, nom, poids) {
-                  if (prenom === "Daniel" && nom === "de Rauglaudre") {
-                    return poids === 66;
-                  } else {
-                    return false;
+                    }
                   }
-                }));
+                }
+              },
+              _1: "%s@\t %s@\t %d"
+            }), (function (prenom, nom, poids) {
+            if (prenom === "Daniel" && nom === "de Rauglaudre") {
+              return poids === 66;
+            } else {
+              return false;
+            }
+          }));
   } else {
     return false;
   }
@@ -1499,202 +1499,97 @@ function test110(param) {
             return x === "poi" ? y === "!" : false;
           }))) {
     return Curry._1(Stdlib__Scanf.sscanf(" poi !", {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String */2,
-                      _0: /* No_padding */0,
-                      _1: {
-                        TAG: /* Formatting_lit */17,
-                        _0: {
-                          TAG: /* Break */0,
-                          _0: "@ ",
-                          _1: 1,
-                          _2: 0
-                        },
-                        _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* Formatting_lit */17,
-                            _0: /* Flush_newline */4,
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      }
-                    },
-                    _1: "%s@ %s@."
-                  }), (function (x, y) {
-                  if (x === "") {
-                    return y === "poi !";
-                  } else {
-                    return false;
-                  }
-                }));
-  } else {
-    return false;
-  }
-}
-
-function test111(param) {
-  return Curry._1(Stdlib__Scanf.sscanf("", {
-                  TAG: /* Format */0,
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String */2,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* Formatting_lit */17,
                   _0: {
-                    TAG: /* Scan_char_set */20,
-                    _0: undefined,
-                    _1: "\xff\xfb\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
-                    _2: {
-                      TAG: /* Formatting_lit */17,
-                      _0: /* Force_newline */3,
-                      _1: /* End_of_format */0
-                    }
+                    TAG: /* Break */0,
+                    _0: "@ ",
+                    _1: 1,
+                    _2: 0
                   },
-                  _1: "%[^\n]@\n"
-                }), (function (x) {
-                return x === "";
-              }));
-}
-
-test("File \"jscomp/test/tscanf_test.ml\", line 293, characters 5-12", test11(undefined) && test110(undefined) && test111(undefined));
-
-function ib(param) {
-  return Stdlib__Scanf.Scanning.from_string("[1;2;3;4; ]");
-}
-
-function f(ib) {
-  Curry._1(Stdlib__Scanf.bscanf(ib, {
-            TAG: /* Format */0,
-            _0: {
-              TAG: /* String_literal */11,
-              _0: " [",
-              _1: /* End_of_format */0
-            },
-            _1: " ["
-          }), undefined);
-  return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Char_literal */12,
-                    _0: /* ' ' */32,
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
                     _1: {
-                      TAG: /* Int */4,
-                      _0: /* Int_i */3,
-                      _1: /* No_padding */0,
-                      _2: /* No_precision */0,
-                      _3: {
-                        TAG: /* Char_literal */12,
-                        _0: /* ';' */59,
-                        _1: /* End_of_format */0
-                      }
-                    }
-                  },
-                  _1: " %i;"
-                }), (function (i) {
-                return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* ' ' */32,
-                                  _1: {
-                                    TAG: /* Int */4,
-                                    _0: /* Int_i */3,
-                                    _1: /* No_padding */0,
-                                    _2: /* No_precision */0,
-                                    _3: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* ';' */59,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                },
-                                _1: " %i;"
-                              }), (function (j) {
-                              return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                              TAG: /* Format */0,
-                                              _0: {
-                                                TAG: /* Char_literal */12,
-                                                _0: /* ' ' */32,
-                                                _1: {
-                                                  TAG: /* Int */4,
-                                                  _0: /* Int_i */3,
-                                                  _1: /* No_padding */0,
-                                                  _2: /* No_precision */0,
-                                                  _3: {
-                                                    TAG: /* Char_literal */12,
-                                                    _0: /* ';' */59,
-                                                    _1: /* End_of_format */0
-                                                  }
-                                                }
-                                              },
-                                              _1: " %i;"
-                                            }), (function (k) {
-                                            return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                                            TAG: /* Format */0,
-                                                            _0: {
-                                                              TAG: /* Char_literal */12,
-                                                              _0: /* ' ' */32,
-                                                              _1: {
-                                                                TAG: /* Int */4,
-                                                                _0: /* Int_i */3,
-                                                                _1: /* No_padding */0,
-                                                                _2: /* No_precision */0,
-                                                                _3: {
-                                                                  TAG: /* Char_literal */12,
-                                                                  _0: /* ';' */59,
-                                                                  _1: /* End_of_format */0
-                                                                }
-                                                              }
-                                                            },
-                                                            _1: " %i;"
-                                                          }), (function (l) {
-                                                          Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                                                    TAG: /* Format */0,
-                                                                    _0: {
-                                                                      TAG: /* String_literal */11,
-                                                                      _0: " ]",
-                                                                      _1: /* End_of_format */0
-                                                                    },
-                                                                    _1: " ]"
-                                                                  }), undefined);
-                                                          return {
-                                                                  hd: i,
-                                                                  tl: {
-                                                                    hd: j,
-                                                                    tl: {
-                                                                      hd: k,
-                                                                      tl: {
-                                                                        hd: l,
-                                                                        tl: /* [] */0
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                };
-                                                        }));
-                                          }));
-                            }));
-              }));
-}
-
-function test12(param) {
-  return Caml_obj.caml_equal(f(Stdlib__Scanf.Scanning.from_string("[1;2;3;4; ]")), {
-              hd: 1,
-              tl: {
-                hd: 2,
-                tl: {
-                  hd: 3,
-                  tl: {
-                    hd: 4,
-                    tl: /* [] */0
+                      TAG: /* Formatting_lit */17,
+                      _0: /* Flush_newline */4,
+                      _1: /* End_of_format */0
+                    }
                   }
                 }
+              },
+              _1: "%s@ %s@."
+            }), (function (x, y) {
+            if (x === "") {
+              return y === "poi !";
+            } else {
+              return false;
+            }
+          }));
+  } else {
+    return false;
+  }
+}
+
+function test111(param) {
+  return Curry._1(Stdlib__Scanf.sscanf("", {
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Scan_char_set */20,
+              _0: undefined,
+              _1: "\xff\xfb\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
+              _2: {
+                TAG: /* Formatting_lit */17,
+                _0: /* Force_newline */3,
+                _1: /* End_of_format */0
               }
-            });
+            },
+            _1: "%[^\n]@\n"
+          }), (function (x) {
+          return x === "";
+        }));
 }
 
-test("File \"jscomp/test/tscanf_test.ml\", line 311, characters 5-12", test12(undefined));
+test("File \"jscomp/test/tscanf_test.ml\", line 293, characters 5-12", test11(undefined) && test110(undefined) && test111(undefined));
 
-function scan_elems(ib, accu) {
-  try {
-    return Curry._1(Stdlib__Scanf.bscanf(ib, {
+function ib(param) {
+  return Stdlib__Scanf.Scanning.from_string("[1;2;3;4; ]");
+}
+
+function f(ib) {
+  Curry._1(Stdlib__Scanf.bscanf(ib, {
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* String_literal */11,
+              _0: " [",
+              _1: /* End_of_format */0
+            },
+            _1: " ["
+          }), undefined);
+  return Curry._1(Stdlib__Scanf.bscanf(ib, {
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Char_literal */12,
+              _0: /* ' ' */32,
+              _1: {
+                TAG: /* Int */4,
+                _0: /* Int_i */3,
+                _1: /* No_padding */0,
+                _2: /* No_precision */0,
+                _3: {
+                  TAG: /* Char_literal */12,
+                  _0: /* ';' */59,
+                  _1: /* End_of_format */0
+                }
+              }
+            },
+            _1: " %i;"
+          }), (function (i) {
+          return Curry._1(Stdlib__Scanf.bscanf(ib, {
                     TAG: /* Format */0,
                     _0: {
                       TAG: /* Char_literal */12,
@@ -1712,12 +1607,117 @@ function scan_elems(ib, accu) {
                       }
                     },
                     _1: " %i;"
-                  }), (function (i) {
-                  return scan_elems(ib, {
-                              hd: i,
-                              tl: accu
-                            });
+                  }), (function (j) {
+                  return Curry._1(Stdlib__Scanf.bscanf(ib, {
+                            TAG: /* Format */0,
+                            _0: {
+                              TAG: /* Char_literal */12,
+                              _0: /* ' ' */32,
+                              _1: {
+                                TAG: /* Int */4,
+                                _0: /* Int_i */3,
+                                _1: /* No_padding */0,
+                                _2: /* No_precision */0,
+                                _3: {
+                                  TAG: /* Char_literal */12,
+                                  _0: /* ';' */59,
+                                  _1: /* End_of_format */0
+                                }
+                              }
+                            },
+                            _1: " %i;"
+                          }), (function (k) {
+                          return Curry._1(Stdlib__Scanf.bscanf(ib, {
+                                    TAG: /* Format */0,
+                                    _0: {
+                                      TAG: /* Char_literal */12,
+                                      _0: /* ' ' */32,
+                                      _1: {
+                                        TAG: /* Int */4,
+                                        _0: /* Int_i */3,
+                                        _1: /* No_padding */0,
+                                        _2: /* No_precision */0,
+                                        _3: {
+                                          TAG: /* Char_literal */12,
+                                          _0: /* ';' */59,
+                                          _1: /* End_of_format */0
+                                        }
+                                      }
+                                    },
+                                    _1: " %i;"
+                                  }), (function (l) {
+                                  Curry._1(Stdlib__Scanf.bscanf(ib, {
+                                            TAG: /* Format */0,
+                                            _0: {
+                                              TAG: /* String_literal */11,
+                                              _0: " ]",
+                                              _1: /* End_of_format */0
+                                            },
+                                            _1: " ]"
+                                          }), undefined);
+                                  return {
+                                    hd: i,
+                                    tl: {
+                                      hd: j,
+                                      tl: {
+                                        hd: k,
+                                        tl: {
+                                          hd: l,
+                                          tl: /* [] */0
+                                        }
+                                      }
+                                    }
+                                  };
+                                }));
+                        }));
                 }));
+        }));
+}
+
+function test12(param) {
+  return Caml_obj.caml_equal(f(Stdlib__Scanf.Scanning.from_string("[1;2;3;4; ]")), {
+        hd: 1,
+        tl: {
+          hd: 2,
+          tl: {
+            hd: 3,
+            tl: {
+              hd: 4,
+              tl: /* [] */0
+            }
+          }
+        }
+      });
+}
+
+test("File \"jscomp/test/tscanf_test.ml\", line 311, characters 5-12", test12(undefined));
+
+function scan_elems(ib, accu) {
+  try {
+    return Curry._1(Stdlib__Scanf.bscanf(ib, {
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char_literal */12,
+                _0: /* ' ' */32,
+                _1: {
+                  TAG: /* Int */4,
+                  _0: /* Int_i */3,
+                  _1: /* No_padding */0,
+                  _2: /* No_precision */0,
+                  _3: {
+                    TAG: /* Char_literal */12,
+                    _0: /* ';' */59,
+                    _1: /* End_of_format */0
+                  }
+                }
+              },
+              _1: " %i;"
+            }), (function (i) {
+            return scan_elems(ib, {
+                  hd: i,
+                  tl: accu
+                });
+          }));
   }
   catch (exn){
     return accu;
@@ -1739,18 +1739,18 @@ function g(ib) {
 
 function test13(param) {
   return Caml_obj.caml_equal(g(Stdlib__Scanf.Scanning.from_string("[1;2;3;4; ]")), {
-              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
+            }
+          }
+        }
+      });
 }
 
 test("File \"jscomp/test/tscanf_test.ml\", line 324, characters 5-12", test13(undefined));
@@ -1780,62 +1780,62 @@ function scan_int_list(ib) {
 
 function test14(param) {
   return Caml_obj.caml_equal(scan_int_list(Stdlib__Scanf.Scanning.from_string("[1;2;3;4; ]")), {
-              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
+            }
+          }
+        }
+      });
 }
 
 test("File \"jscomp/test/tscanf_test.ml\", line 337, characters 5-12", test14(undefined));
 
 function scan_elems$1(ib, accu) {
   return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Char_literal */12,
-                    _0: /* ' ' */32,
-                    _1: {
-                      TAG: /* Int */4,
-                      _0: /* Int_i */3,
-                      _1: /* No_padding */0,
-                      _2: /* No_precision */0,
-                      _3: {
-                        TAG: /* Char_literal */12,
-                        _0: /* ' ' */32,
-                        _1: {
-                          TAG: /* Char */0,
-                          _0: /* End_of_format */0
-                        }
-                      }
-                    }
-                  },
-                  _1: " %i %c"
-                }), (function (i, c) {
-                if (c === 59) {
-                  return scan_elems$1(ib, {
-                              hd: i,
-                              tl: accu
-                            });
-                }
-                if (c !== 93) {
-                  throw new Caml_js_exceptions.MelangeError("Failure", {
-                            MEL_EXN_ID: "Failure",
-                            _1: "scan_elems"
-                          });
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Char_literal */12,
+              _0: /* ' ' */32,
+              _1: {
+                TAG: /* Int */4,
+                _0: /* Int_i */3,
+                _1: /* No_padding */0,
+                _2: /* No_precision */0,
+                _3: {
+                  TAG: /* Char_literal */12,
+                  _0: /* ' ' */32,
+                  _1: {
+                    TAG: /* Char */0,
+                    _0: /* End_of_format */0
+                  }
                 }
-                return Stdlib__List.rev({
-                            hd: i,
-                            tl: accu
-                          });
-              }));
+              }
+            },
+            _1: " %i %c"
+          }), (function (i, c) {
+          if (c === 59) {
+            return scan_elems$1(ib, {
+                  hd: i,
+                  tl: accu
+                });
+          }
+          if (c !== 93) {
+            throw new Caml_js_exceptions.MelangeError("Failure", {
+                  MEL_EXN_ID: "Failure",
+                  _1: "scan_elems"
+                });
+          }
+          return Stdlib__List.rev({
+                hd: i,
+                tl: accu
+              });
+        }));
 }
 
 function scan_int_list$1(ib) {
@@ -1853,18 +1853,18 @@ function scan_int_list$1(ib) {
 
 function test15(param) {
   return Caml_obj.caml_equal(scan_int_list$1(Stdlib__Scanf.Scanning.from_string("[1;2;3;4]")), {
-              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
+            }
+          }
+        }
+      });
 }
 
 test("File \"jscomp/test/tscanf_test.ml\", line 357, characters 5-12", test15(undefined));
@@ -1872,57 +1872,57 @@ test("File \"jscomp/test/tscanf_test.ml\", line 357, characters 5-12", test15(un
 function scan_elems$2(ib, accu) {
   try {
     return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Char */0,
-                      _0: {
-                        TAG: /* Char_literal */12,
-                        _0: /* ' ' */32,
-                        _1: {
-                          TAG: /* Int */4,
-                          _0: /* Int_i */3,
-                          _1: /* No_padding */0,
-                          _2: /* No_precision */0,
-                          _3: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "%c %i"
-                  }), (function (c, i) {
-                  if (c >= 91) {
-                    if (c < 94) {
-                      switch (c) {
-                        case 91 :
-                            if (Caml_obj.caml_equal(accu, /* [] */0)) {
-                              return scan_elems$2(ib, {
-                                          hd: i,
-                                          tl: accu
-                                        });
-                            }
-                            break;
-                        case 92 :
-                            break;
-                        case 93 :
-                            return Stdlib__List.rev({
-                                        hd: i,
-                                        tl: accu
-                                      });
-                        
-                      }
-                    }
-                    
-                  } else if (c === 59) {
-                    return scan_elems$2(ib, {
-                                hd: i,
-                                tl: accu
-                              });
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char */0,
+                _0: {
+                  TAG: /* Char_literal */12,
+                  _0: /* ' ' */32,
+                  _1: {
+                    TAG: /* Int */4,
+                    _0: /* Int_i */3,
+                    _1: /* No_padding */0,
+                    _2: /* No_precision */0,
+                    _3: /* End_of_format */0
                   }
-                  console.log(Caml_bytes.bytes_to_string(Stdlib__Bytes.make(1, c)));
-                  throw new Caml_js_exceptions.MelangeError("Failure", {
-                            MEL_EXN_ID: "Failure",
-                            _1: "scan_elems"
+                }
+              },
+              _1: "%c %i"
+            }), (function (c, i) {
+            if (c >= 91) {
+              if (c < 94) {
+                switch (c) {
+                  case 91 :
+                      if (Caml_obj.caml_equal(accu, /* [] */0)) {
+                        return scan_elems$2(ib, {
+                              hd: i,
+                              tl: accu
+                            });
+                      }
+                      break;
+                  case 92 :
+                      break;
+                  case 93 :
+                      return Stdlib__List.rev({
+                            hd: i,
+                            tl: accu
                           });
-                }));
+                  
+                }
+              }
+              
+            } else if (c === 59) {
+              return scan_elems$2(ib, {
+                    hd: i,
+                    tl: accu
+                  });
+            }
+            console.log(Caml_bytes.bytes_to_string(Stdlib__Bytes.make(1, c)));
+            throw new Caml_js_exceptions.MelangeError("Failure", {
+                  MEL_EXN_ID: "Failure",
+                  _1: "scan_elems"
+                });
+          }));
   }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -1958,7 +1958,20 @@ function test16(param) {
                   }
                 }
               }
-            })) && Caml_obj.caml_equal(scan_elems$2(Stdlib__Scanf.Scanning.from_string("[1;2;3;4; ]"), /* [] */0), Stdlib__List.rev({
+            })) && Caml_obj.caml_equal(scan_elems$2(Stdlib__Scanf.Scanning.from_string("[1;2;3;4; ]"), /* [] */0), Stdlib__List.rev({
+              hd: 1,
+              tl: {
+                hd: 2,
+                tl: {
+                  hd: 3,
+                  tl: {
+                    hd: 4,
+                    tl: /* [] */0
+                  }
+                }
+              }
+            }))) {
+    return Caml_obj.caml_equal(scan_elems$2(Stdlib__Scanf.Scanning.from_string("[1;2;3;4"), /* [] */0), Stdlib__List.rev({
               hd: 1,
               tl: {
                 hd: 2,
@@ -1970,20 +1983,7 @@ function test16(param) {
                   }
                 }
               }
-            }))) {
-    return Caml_obj.caml_equal(scan_elems$2(Stdlib__Scanf.Scanning.from_string("[1;2;3;4"), /* [] */0), Stdlib__List.rev({
-                    hd: 1,
-                    tl: {
-                      hd: 2,
-                      tl: {
-                        hd: 3,
-                        tl: {
-                          hd: 4,
-                          tl: /* [] */0
-                        }
-                      }
-                    }
-                  }));
+            }));
   } else {
     return false;
   }
@@ -1993,43 +1993,43 @@ test("File \"jscomp/test/tscanf_test.ml\", line 383, characters 5-12", test16(un
 
 function scan_elems$3(ib, accu) {
   return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Char_literal */12,
-                    _0: /* ' ' */32,
-                    _1: {
-                      TAG: /* Int */4,
-                      _0: /* Int_i */3,
-                      _1: /* No_padding */0,
-                      _2: /* No_precision */0,
-                      _3: {
-                        TAG: /* Scan_char_set */20,
-                        _0: undefined,
-                        _1: "\0&\0\0\x01\0\0\b\0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                        _2: /* End_of_format */0
-                      }
-                    }
-                  },
-                  _1: " %i%[]; \t\n\r]"
-                }), (function (i, s) {
-                switch (s) {
-                  case ";" :
-                      return scan_elems$3(ib, {
-                                  hd: i,
-                                  tl: accu
-                                });
-                  case "]" :
-                      return Stdlib__List.rev({
-                                  hd: i,
-                                  tl: accu
-                                });
-                  default:
-                    return Stdlib__List.rev({
-                                hd: i,
-                                tl: accu
-                              });
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Char_literal */12,
+              _0: /* ' ' */32,
+              _1: {
+                TAG: /* Int */4,
+                _0: /* Int_i */3,
+                _1: /* No_padding */0,
+                _2: /* No_precision */0,
+                _3: {
+                  TAG: /* Scan_char_set */20,
+                  _0: undefined,
+                  _1: "\0&\0\0\x01\0\0\b\0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                  _2: /* End_of_format */0
                 }
-              }));
+              }
+            },
+            _1: " %i%[]; \t\n\r]"
+          }), (function (i, s) {
+          switch (s) {
+            case ";" :
+                return scan_elems$3(ib, {
+                      hd: i,
+                      tl: accu
+                    });
+            case "]" :
+                return Stdlib__List.rev({
+                      hd: i,
+                      tl: accu
+                    });
+            default:
+              return Stdlib__List.rev({
+                    hd: i,
+                    tl: accu
+                  });
+          }
+        }));
 }
 
 function scan_int_list$2(ib) {
@@ -2072,18 +2072,18 @@ function test17(param) {
           }
         })) {
     return Caml_obj.caml_equal(scan_int_list$2(Stdlib__Scanf.Scanning.from_string("[1;2;3;4 5]")), {
-                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
+              }
+            }
+          }
+        });
   } else {
     return false;
   }
@@ -2093,141 +2093,141 @@ test("File \"jscomp/test/tscanf_test.ml\", line 406, characters 5-12", test17(un
 
 function scan_rest(ib, accu) {
   return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Char_literal */12,
-                    _0: /* ' ' */32,
-                    _1: {
-                      TAG: /* Char */0,
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Char_literal */12,
+              _0: /* ' ' */32,
+              _1: {
+                TAG: /* Char */0,
+                _0: {
+                  TAG: /* Char_literal */12,
+                  _0: /* ' ' */32,
+                  _1: /* End_of_format */0
+                }
+              }
+            },
+            _1: " %c "
+          }), (function (c) {
+          if (c === 59) {
+            return Curry._1(Stdlib__Scanf.bscanf(ib, {
+                      TAG: /* Format */0,
                       _0: {
-                        TAG: /* Char_literal */12,
-                        _0: /* ' ' */32,
-                        _1: /* End_of_format */0
-                      }
+                        TAG: /* Scan_char_set */20,
+                        _0: undefined,
+                        _1: "\0\0\0\0\0\0\0\0\0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                        _2: /* End_of_format */0
+                      },
+                      _1: "%[]]"
+                    }), (function (param) {
+                    if (param === "]") {
+                      return accu;
+                    } else {
+                      return Curry._1(Stdlib__Scanf.bscanf(ib, {
+                                TAG: /* Format */0,
+                                _0: {
+                                  TAG: /* Char_literal */12,
+                                  _0: /* ' ' */32,
+                                  _1: {
+                                    TAG: /* Int */4,
+                                    _0: /* Int_i */3,
+                                    _1: /* No_padding */0,
+                                    _2: /* No_precision */0,
+                                    _3: {
+                                      TAG: /* Char_literal */12,
+                                      _0: /* ' ' */32,
+                                      _1: /* End_of_format */0
+                                    }
+                                  }
+                                },
+                                _1: " %i "
+                              }), (function (i) {
+                              return scan_rest(ib, {
+                                    hd: i,
+                                    tl: accu
+                                  });
+                            }));
                     }
-                  },
-                  _1: " %c "
-                }), (function (c) {
-                if (c === 59) {
-                  return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* Scan_char_set */20,
-                                    _0: undefined,
-                                    _1: "\0\0\0\0\0\0\0\0\0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                                    _2: /* End_of_format */0
-                                  },
-                                  _1: "%[]]"
-                                }), (function (param) {
-                                if (param === "]") {
-                                  return accu;
-                                } else {
-                                  return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                                  TAG: /* Format */0,
-                                                  _0: {
-                                                    TAG: /* Char_literal */12,
-                                                    _0: /* ' ' */32,
-                                                    _1: {
-                                                      TAG: /* Int */4,
-                                                      _0: /* Int_i */3,
-                                                      _1: /* No_padding */0,
-                                                      _2: /* No_precision */0,
-                                                      _3: {
-                                                        TAG: /* Char_literal */12,
-                                                        _0: /* ' ' */32,
-                                                        _1: /* End_of_format */0
-                                                      }
-                                                    }
-                                                  },
-                                                  _1: " %i "
-                                                }), (function (i) {
-                                                return scan_rest(ib, {
-                                                            hd: i,
-                                                            tl: accu
-                                                          });
-                                              }));
-                                }
-                              }));
-                }
-                if (c !== 93) {
-                  throw new Caml_js_exceptions.MelangeError("Failure", {
-                            MEL_EXN_ID: "Failure",
-                            _1: "scan_rest"
-                          });
-                }
-                return accu;
-              }));
+                  }));
+          }
+          if (c !== 93) {
+            throw new Caml_js_exceptions.MelangeError("Failure", {
+                  MEL_EXN_ID: "Failure",
+                  _1: "scan_rest"
+                });
+          }
+          return accu;
+        }));
 }
 
 function scan_elems$4(ib, accu) {
   return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Char_literal */12,
-                    _0: /* ' ' */32,
-                    _1: {
-                      TAG: /* Char */0,
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Char_literal */12,
+              _0: /* ' ' */32,
+              _1: {
+                TAG: /* Char */0,
+                _0: {
+                  TAG: /* Char_literal */12,
+                  _0: /* ' ' */32,
+                  _1: /* End_of_format */0
+                }
+              }
+            },
+            _1: " %c "
+          }), (function (c) {
+          if (c !== 91) {
+            throw new Caml_js_exceptions.MelangeError("Failure", {
+                  MEL_EXN_ID: "Failure",
+                  _1: "scan_elems"
+                });
+          }
+          if (Caml_obj.caml_equal(accu, /* [] */0)) {
+            return Curry._1(Stdlib__Scanf.bscanf(ib, {
+                      TAG: /* Format */0,
                       _0: {
-                        TAG: /* Char_literal */12,
-                        _0: /* ' ' */32,
-                        _1: /* End_of_format */0
-                      }
+                        TAG: /* Scan_char_set */20,
+                        _0: undefined,
+                        _1: "\0\0\0\0\0\0\0\0\0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                        _2: /* End_of_format */0
+                      },
+                      _1: "%[]]"
+                    }), (function (param) {
+                    if (param === "]") {
+                      return accu;
+                    } else {
+                      return Curry._1(Stdlib__Scanf.bscanf(ib, {
+                                TAG: /* Format */0,
+                                _0: {
+                                  TAG: /* Char_literal */12,
+                                  _0: /* ' ' */32,
+                                  _1: {
+                                    TAG: /* Int */4,
+                                    _0: /* Int_i */3,
+                                    _1: /* No_padding */0,
+                                    _2: /* No_precision */0,
+                                    _3: {
+                                      TAG: /* Char_literal */12,
+                                      _0: /* ' ' */32,
+                                      _1: /* End_of_format */0
+                                    }
+                                  }
+                                },
+                                _1: " %i "
+                              }), (function (i) {
+                              return scan_rest(ib, {
+                                    hd: i,
+                                    tl: accu
+                                  });
+                            }));
                     }
-                  },
-                  _1: " %c "
-                }), (function (c) {
-                if (c !== 91) {
-                  throw new Caml_js_exceptions.MelangeError("Failure", {
-                            MEL_EXN_ID: "Failure",
-                            _1: "scan_elems"
-                          });
-                }
-                if (Caml_obj.caml_equal(accu, /* [] */0)) {
-                  return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* Scan_char_set */20,
-                                    _0: undefined,
-                                    _1: "\0\0\0\0\0\0\0\0\0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                                    _2: /* End_of_format */0
-                                  },
-                                  _1: "%[]]"
-                                }), (function (param) {
-                                if (param === "]") {
-                                  return accu;
-                                } else {
-                                  return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                                  TAG: /* Format */0,
-                                                  _0: {
-                                                    TAG: /* Char_literal */12,
-                                                    _0: /* ' ' */32,
-                                                    _1: {
-                                                      TAG: /* Int */4,
-                                                      _0: /* Int_i */3,
-                                                      _1: /* No_padding */0,
-                                                      _2: /* No_precision */0,
-                                                      _3: {
-                                                        TAG: /* Char_literal */12,
-                                                        _0: /* ' ' */32,
-                                                        _1: /* End_of_format */0
-                                                      }
-                                                    }
-                                                  },
-                                                  _1: " %i "
-                                                }), (function (i) {
-                                                return scan_rest(ib, {
-                                                            hd: i,
-                                                            tl: accu
-                                                          });
-                                              }));
-                                }
-                              }));
-                }
-                throw new Caml_js_exceptions.MelangeError("Failure", {
-                          MEL_EXN_ID: "Failure",
-                          _1: "scan_elems"
-                        });
-              }));
+                  }));
+          }
+          throw new Caml_js_exceptions.MelangeError("Failure", {
+                MEL_EXN_ID: "Failure",
+                _1: "scan_elems"
+              });
+        }));
 }
 
 function scan_int_list$3(ib) {
@@ -2261,18 +2261,18 @@ function test18(param) {
   }
   const ib$3 = Stdlib__Scanf.Scanning.from_string("[1;2;3;4; ]");
   return Caml_obj.caml_equal(Stdlib__List.rev(scan_elems$4(ib$3, /* [] */0)), {
-              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
+            }
+          }
+        }
+      });
 }
 
 test("File \"jscomp/test/tscanf_test.ml\", line 446, characters 5-12", test18(undefined));
@@ -2297,75 +2297,75 @@ test21(undefined);
 
 function scan_rest$1(ib, accu) {
   return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Scan_char_set */20,
-                    _0: undefined,
-                    _1: "\0\0\0\0\0\0\0\0\0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                    _2: /* End_of_format */0
-                  },
-                  _1: "%[]]"
-                }), (function (param) {
-                if (param === "]") {
-                  return accu;
-                } else {
-                  return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                  TAG: /* Format */0,
-                                  _0: {
-                                    TAG: /* Char_literal */12,
-                                    _0: /* ' ' */32,
-                                    _1: {
-                                      TAG: /* Int */4,
-                                      _0: /* Int_i */3,
-                                      _1: /* No_padding */0,
-                                      _2: /* No_precision */0,
-                                      _3: {
-                                        TAG: /* Char_literal */12,
-                                        _0: /* ' ' */32,
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Scan_char_set */20,
+              _0: undefined,
+              _1: "\0\0\0\0\0\0\0\0\0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+              _2: /* End_of_format */0
+            },
+            _1: "%[]]"
+          }), (function (param) {
+          if (param === "]") {
+            return accu;
+          } else {
+            return Curry._1(Stdlib__Scanf.bscanf(ib, {
+                      TAG: /* Format */0,
+                      _0: {
+                        TAG: /* Char_literal */12,
+                        _0: /* ' ' */32,
+                        _1: {
+                          TAG: /* Int */4,
+                          _0: /* Int_i */3,
+                          _1: /* No_padding */0,
+                          _2: /* No_precision */0,
+                          _3: {
+                            TAG: /* Char_literal */12,
+                            _0: /* ' ' */32,
+                            _1: /* End_of_format */0
+                          }
+                        }
+                      },
+                      _1: " %i "
+                    }), (function (i) {
+                    let accu$1 = {
+                      hd: i,
+                      tl: accu
+                    };
+                    return Curry._1(Stdlib__Scanf.bscanf(ib, {
+                              TAG: /* Format */0,
+                              _0: {
+                                TAG: /* Scan_char_set */20,
+                                _0: 1,
+                                _1: "\0\0\0\0\0\0\0\b\0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                                _2: /* End_of_format */0
+                              },
+                              _1: "%1[];]"
+                            }), (function (param) {
+                            switch (param) {
+                              case ";" :
+                                  return scan_rest$1(ib, accu$1);
+                              case "]" :
+                                  return accu$1;
+                              default:
+                                const s = Stdlib__Printf.sprintf({
+                                      TAG: /* Format */0,
+                                      _0: {
+                                        TAG: /* String_literal */11,
+                                        _0: "scan_int_list",
                                         _1: /* End_of_format */0
-                                      }
-                                    }
-                                  },
-                                  _1: " %i "
-                                }), (function (i) {
-                                let accu$1 = {
-                                  hd: i,
-                                  tl: accu
-                                };
-                                return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                                TAG: /* Format */0,
-                                                _0: {
-                                                  TAG: /* Scan_char_set */20,
-                                                  _0: 1,
-                                                  _1: "\0\0\0\0\0\0\0\b\0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                                                  _2: /* End_of_format */0
-                                                },
-                                                _1: "%1[];]"
-                                              }), (function (param) {
-                                              switch (param) {
-                                                case ";" :
-                                                    return scan_rest$1(ib, accu$1);
-                                                case "]" :
-                                                    return accu$1;
-                                                default:
-                                                  const s = Stdlib__Printf.sprintf({
-                                                        TAG: /* Format */0,
-                                                        _0: {
-                                                          TAG: /* String_literal */11,
-                                                          _0: "scan_int_list",
-                                                          _1: /* End_of_format */0
-                                                        },
-                                                        _1: "scan_int_list"
-                                                      });
-                                                  throw new Caml_js_exceptions.MelangeError("Failure", {
-                                                            MEL_EXN_ID: "Failure",
-                                                            _1: s
-                                                          });
-                                              }
-                                            }));
-                              }));
-                }
-              }));
+                                      },
+                                      _1: "scan_int_list"
+                                    });
+                                throw new Caml_js_exceptions.MelangeError("Failure", {
+                                      MEL_EXN_ID: "Failure",
+                                      _1: s
+                                    });
+                            }
+                          }));
+                  }));
+          }
+        }));
 }
 
 function scan_int_list$4(ib) {
@@ -2399,39 +2399,39 @@ function test22(param) {
           }
         })) {
     return Caml_obj.caml_equal(scan_int_list$4(Stdlib__Scanf.Scanning.from_string("[1;2;3;4;]")), {
-                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
+              }
+            }
+          }
+        });
   } else {
     return false;
   }
-}
-
-test("File \"jscomp/test/tscanf_test.ml\", line 506, characters 5-12", test22(undefined));
-
-function scan_elems$5(ib, scan_elem, accu) {
-  try {
-    return Curry._2(scan_elem, ib, (function (i, s) {
-                  const accu$1 = {
-                    hd: i,
-                    tl: accu
-                  };
-                  if (s === "") {
-                    return accu$1;
-                  } else {
-                    return scan_elems$5(ib, scan_elem, accu$1);
-                  }
-                }));
-  }
+}
+
+test("File \"jscomp/test/tscanf_test.ml\", line 506, characters 5-12", test22(undefined));
+
+function scan_elems$5(ib, scan_elem, accu) {
+  try {
+    return Curry._2(scan_elem, ib, (function (i, s) {
+            const accu$1 = {
+              hd: i,
+              tl: accu
+            };
+            if (s === "") {
+              return accu$1;
+            } else {
+              return scan_elems$5(ib, scan_elem, accu$1);
+            }
+          }));
+  }
   catch (raw_exn){
     const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
     if (exn.MEL_EXN_ID === Stdlib__Scanf.Scan_failure) {
@@ -2466,29 +2466,29 @@ function scan_list(scan_elem, ib) {
 
 function scan_int_elem(ib) {
   return Stdlib__Scanf.bscanf(ib, {
-              TAG: /* Format */0,
-              _0: {
-                TAG: /* Char_literal */12,
-                _0: /* ' ' */32,
-                _1: {
-                  TAG: /* Int */4,
-                  _0: /* Int_i */3,
-                  _1: /* No_padding */0,
-                  _2: /* No_precision */0,
-                  _3: {
-                    TAG: /* Char_literal */12,
-                    _0: /* ' ' */32,
-                    _1: {
-                      TAG: /* Scan_char_set */20,
-                      _0: 1,
-                      _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                      _2: /* End_of_format */0
-                    }
-                  }
-                }
-              },
-              _1: " %i %1[;]"
-            });
+        TAG: /* Format */0,
+        _0: {
+          TAG: /* Char_literal */12,
+          _0: /* ' ' */32,
+          _1: {
+            TAG: /* Int */4,
+            _0: /* Int_i */3,
+            _1: /* No_padding */0,
+            _2: /* No_precision */0,
+            _3: {
+              TAG: /* Char_literal */12,
+              _0: /* ' ' */32,
+              _1: {
+                TAG: /* Scan_char_set */20,
+                _0: 1,
+                _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                _2: /* End_of_format */0
+              }
+            }
+          }
+        },
+        _1: " %i %1[;]"
+      });
 }
 
 function scan_int_list$5(param) {
@@ -2513,18 +2513,18 @@ function test23(param) {
           }
         })) {
     return Caml_obj.caml_equal(scan_list(scan_int_elem, Stdlib__Scanf.Scanning.from_string("[1;2;3;4;]")), {
-                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
+              }
+            }
+          }
+        });
   } else {
     return false;
   }
@@ -2552,59 +2552,59 @@ test24(undefined) && test25(undefined) && test26(undefined) && test27(undefined)
 
 function scan_string_elem(ib) {
   return Stdlib__Scanf.bscanf(ib, {
-              TAG: /* Format */0,
+        TAG: /* Format */0,
+        _0: {
+          TAG: /* String_literal */11,
+          _0: " \"",
+          _1: {
+            TAG: /* String */2,
+            _0: /* No_padding */0,
+            _1: {
+              TAG: /* Formatting_lit */17,
               _0: {
-                TAG: /* String_literal */11,
-                _0: " \"",
+                TAG: /* Scan_indic */2,
+                _0: /* '"' */34
+              },
+              _1: {
+                TAG: /* Char_literal */12,
+                _0: /* ' ' */32,
                 _1: {
-                  TAG: /* String */2,
-                  _0: /* No_padding */0,
-                  _1: {
-                    TAG: /* Formatting_lit */17,
-                    _0: {
-                      TAG: /* Scan_indic */2,
-                      _0: /* '"' */34
-                    },
-                    _1: {
-                      TAG: /* Char_literal */12,
-                      _0: /* ' ' */32,
-                      _1: {
-                        TAG: /* Scan_char_set */20,
-                        _0: 1,
-                        _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                        _2: /* End_of_format */0
-                      }
-                    }
-                  }
+                  TAG: /* Scan_char_set */20,
+                  _0: 1,
+                  _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                  _2: /* End_of_format */0
                 }
-              },
-              _1: " \"%s@\" %1[;]"
-            });
+              }
+            }
+          }
+        },
+        _1: " \"%s@\" %1[;]"
+      });
 }
 
 function scan_String_elem(ib) {
   return Stdlib__Scanf.bscanf(ib, {
-              TAG: /* Format */0,
-              _0: {
-                TAG: /* Char_literal */12,
-                _0: /* ' ' */32,
-                _1: {
-                  TAG: /* Caml_string */3,
-                  _0: /* No_padding */0,
-                  _1: {
-                    TAG: /* Char_literal */12,
-                    _0: /* ' ' */32,
-                    _1: {
-                      TAG: /* Scan_char_set */20,
-                      _0: 1,
-                      _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                      _2: /* End_of_format */0
-                    }
-                  }
-                }
-              },
-              _1: " %S %1[;]"
-            });
+        TAG: /* Format */0,
+        _0: {
+          TAG: /* Char_literal */12,
+          _0: /* ' ' */32,
+          _1: {
+            TAG: /* Caml_string */3,
+            _0: /* No_padding */0,
+            _1: {
+              TAG: /* Char_literal */12,
+              _0: /* ' ' */32,
+              _1: {
+                TAG: /* Scan_char_set */20,
+                _0: 1,
+                _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                _2: /* End_of_format */0
+              }
+            }
+          }
+        },
+        _1: " %S %1[;]"
+      });
 }
 
 function scan_String_list(param) {
@@ -2656,18 +2656,18 @@ function test28(param) {
           }
         })) {
     return Caml_obj.caml_equal(scan_String_list(Stdlib__Scanf.Scanning.from_string("[\"Le\";\"langage\";\"Objective\";\"Caml\"; ]")), {
-                hd: "Le",
-                tl: {
-                  hd: "langage",
-                  tl: {
-                    hd: "Objective",
-                    tl: {
-                      hd: "Caml",
-                      tl: /* [] */0
-                    }
-                  }
-                }
-              });
+          hd: "Le",
+          tl: {
+            hd: "langage",
+            tl: {
+              hd: "Objective",
+              tl: {
+                hd: "Caml",
+                tl: /* [] */0
+              }
+            }
+          }
+        });
   } else {
     return false;
   }
@@ -2677,18 +2677,18 @@ test("File \"jscomp/test/tscanf_test.ml\", line 609, characters 5-12", test28(un
 
 function scan_elems$6(ib, scan_elem, accu) {
   return Curry._3(scan_elem, ib, (function (i, s) {
-                const accu$1 = {
-                  hd: i,
-                  tl: accu
-                };
-                if (s === "") {
-                  return accu$1;
-                } else {
-                  return scan_elems$6(ib, scan_elem, accu$1);
-                }
-              }), (function (ib, exc) {
-                return accu;
-              }));
+          const accu$1 = {
+            hd: i,
+            tl: accu
+          };
+          if (s === "") {
+            return accu$1;
+          } else {
+            return scan_elems$6(ib, scan_elem, accu$1);
+          }
+        }), (function (ib, exc) {
+          return accu;
+        }));
 }
 
 function scan_list$1(scan_elem, ib) {
@@ -2716,29 +2716,29 @@ function scan_list$1(scan_elem, ib) {
 
 function scan_int_elem$1(ib, f, ek) {
   return Curry._1(Stdlib__Scanf.kscanf(ib, ek, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Char_literal */12,
-                    _0: /* ' ' */32,
-                    _1: {
-                      TAG: /* Int */4,
-                      _0: /* Int_i */3,
-                      _1: /* No_padding */0,
-                      _2: /* No_precision */0,
-                      _3: {
-                        TAG: /* Char_literal */12,
-                        _0: /* ' ' */32,
-                        _1: {
-                          TAG: /* Scan_char_set */20,
-                          _0: 1,
-                          _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                          _2: /* End_of_format */0
-                        }
-                      }
-                    }
-                  },
-                  _1: " %i %1[;]"
-                }), f);
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Char_literal */12,
+              _0: /* ' ' */32,
+              _1: {
+                TAG: /* Int */4,
+                _0: /* Int_i */3,
+                _1: /* No_padding */0,
+                _2: /* No_precision */0,
+                _3: {
+                  TAG: /* Char_literal */12,
+                  _0: /* ' ' */32,
+                  _1: {
+                    TAG: /* Scan_char_set */20,
+                    _0: 1,
+                    _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                    _2: /* End_of_format */0
+                  }
+                }
+              }
+            },
+            _1: " %i %1[;]"
+          }), f);
 }
 
 function test29(param) {
@@ -2759,18 +2759,18 @@ function test29(param) {
           }
         })) {
     return Caml_obj.caml_equal(scan_list$1(scan_int_elem$1, Stdlib__Scanf.Scanning.from_string("[1;2;3;4;]")), {
-                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
+              }
+            }
+          }
+        });
   } else {
     return false;
   }
@@ -2780,27 +2780,27 @@ test("File \"jscomp/test/tscanf_test.ml\", line 639, characters 5-12", test29(un
 
 function scan_string_elem$1(ib, f, ek) {
   return Curry._1(Stdlib__Scanf.kscanf(ib, ek, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Char_literal */12,
-                    _0: /* ' ' */32,
-                    _1: {
-                      TAG: /* Caml_string */3,
-                      _0: /* No_padding */0,
-                      _1: {
-                        TAG: /* Char_literal */12,
-                        _0: /* ' ' */32,
-                        _1: {
-                          TAG: /* Scan_char_set */20,
-                          _0: 1,
-                          _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                          _2: /* End_of_format */0
-                        }
-                      }
-                    }
-                  },
-                  _1: " %S %1[;]"
-                }), f);
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Char_literal */12,
+              _0: /* ' ' */32,
+              _1: {
+                TAG: /* Caml_string */3,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* Char_literal */12,
+                  _0: /* ' ' */32,
+                  _1: {
+                    TAG: /* Scan_char_set */20,
+                    _0: 1,
+                    _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                    _2: /* End_of_format */0
+                  }
+                }
+              }
+            },
+            _1: " %S %1[;]"
+          }), f);
 }
 
 function test30(param) {
@@ -2821,18 +2821,18 @@ function test30(param) {
           }
         })) {
     return Caml_obj.caml_equal(scan_list$1(scan_string_elem$1, Stdlib__Scanf.Scanning.from_string("[\"1\"; \"2\"; \"3\"; \"4\";]")), {
-                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
+              }
+            }
+          }
+        });
   } else {
     return false;
   }
@@ -2846,35 +2846,35 @@ function scan_elem(fmt, ib, f, ek) {
 
 function scan_elems$7(ib, scan_elem, accu) {
   return Curry._3(scan_elem, ib, (function (i) {
-                const accu$1 = {
-                  hd: i,
-                  tl: accu
-                };
-                return Curry._1(Stdlib__Scanf.kscanf(ib, (function (ib, exc) {
-                                  return accu$1;
-                                }), {
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* ' ' */32,
-                                  _1: {
-                                    TAG: /* Scan_char_set */20,
-                                    _0: 1,
-                                    _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                                    _2: /* End_of_format */0
-                                  }
-                                },
-                                _1: " %1[;]"
-                              }), (function (s) {
-                              if (s === "") {
-                                return accu$1;
-                              } else {
-                                return scan_elems$7(ib, scan_elem, accu$1);
-                              }
-                            }));
-              }), (function (ib, exc) {
-                return accu;
-              }));
+          const accu$1 = {
+            hd: i,
+            tl: accu
+          };
+          return Curry._1(Stdlib__Scanf.kscanf(ib, (function (ib, exc) {
+                      return accu$1;
+                    }), {
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
+                      _1: {
+                        TAG: /* Scan_char_set */20,
+                        _0: 1,
+                        _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                        _2: /* End_of_format */0
+                      }
+                    },
+                    _1: " %1[;]"
+                  }), (function (s) {
+                  if (s === "") {
+                    return accu$1;
+                  } else {
+                    return scan_elems$7(ib, scan_elem, accu$1);
+                  }
+                }));
+        }), (function (ib, exc) {
+          return accu;
+        }));
 }
 
 function scan_list$2(scan_elem, ib) {
@@ -2964,18 +2964,18 @@ function test31(param) {
           }
         })) {
     return Caml_obj.caml_equal(Curry._1(scan_int_list$6, Stdlib__Scanf.Scanning.from_string("[1;2;3;4;]")), {
-                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
+              }
+            }
+          }
+        });
   } else {
     return false;
   }
@@ -3001,18 +3001,18 @@ function test32(param) {
           }
         })) {
     return Caml_obj.caml_equal(Curry._1(scan_string_list, Stdlib__Scanf.Scanning.from_string("[\"1\"; \"2\"; \"3\"; \"4\";]")), {
-                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
+              }
+            }
+          }
+        });
   } else {
     return false;
   }
@@ -3022,37 +3022,37 @@ test("File \"jscomp/test/tscanf_test.ml\", line 728, characters 5-12", test32(un
 
 function scan_elems$8(ib, scan_elem_fmt, accu) {
   return Curry._1(Stdlib__Scanf.kscanf(ib, (function (ib, exc) {
-                    return accu;
-                  }), scan_elem_fmt), (function (i) {
-                const accu$1 = {
-                  hd: i,
-                  tl: accu
-                };
-                return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                TAG: /* Format */0,
-                                _0: {
-                                  TAG: /* Char_literal */12,
-                                  _0: /* ' ' */32,
-                                  _1: {
-                                    TAG: /* Scan_char_set */20,
-                                    _0: 1,
-                                    _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                                    _2: {
-                                      TAG: /* Char_literal */12,
-                                      _0: /* ' ' */32,
-                                      _1: /* End_of_format */0
-                                    }
-                                  }
-                                },
-                                _1: " %1[;] "
-                              }), (function (param) {
-                              if (param === "") {
-                                return accu$1;
-                              } else {
-                                return scan_elems$8(ib, scan_elem_fmt, accu$1);
-                              }
-                            }));
-              }));
+              return accu;
+            }), scan_elem_fmt), (function (i) {
+          const accu$1 = {
+            hd: i,
+            tl: accu
+          };
+          return Curry._1(Stdlib__Scanf.bscanf(ib, {
+                    TAG: /* Format */0,
+                    _0: {
+                      TAG: /* Char_literal */12,
+                      _0: /* ' ' */32,
+                      _1: {
+                        TAG: /* Scan_char_set */20,
+                        _0: 1,
+                        _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                        _2: {
+                          TAG: /* Char_literal */12,
+                          _0: /* ' ' */32,
+                          _1: /* End_of_format */0
+                        }
+                      }
+                    },
+                    _1: " %1[;] "
+                  }), (function (param) {
+                  if (param === "") {
+                    return accu$1;
+                  } else {
+                    return scan_elems$8(ib, scan_elem_fmt, accu$1);
+                  }
+                }));
+        }));
 }
 
 function scan_list$3(scan_elem_fmt, ib) {
@@ -3126,18 +3126,18 @@ function test33(param) {
           }
         })) {
     return Caml_obj.caml_equal(Curry._1(scan_int_list$7, Stdlib__Scanf.Scanning.from_string("[1;2;3;4;]")), {
-                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
+              }
+            }
+          }
+        });
   } else {
     return false;
   }
@@ -3163,18 +3163,18 @@ function test34(param) {
           }
         })) {
     return Caml_obj.caml_equal(Curry._1(scan_string_list$1, Stdlib__Scanf.Scanning.from_string("[\"1\"; \"2\"; \"3\"; \"4\";]")), {
-                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
+              }
+            }
+          }
+        });
   } else {
     return false;
   }
@@ -3184,48 +3184,48 @@ test("File \"jscomp/test/tscanf_test.ml\", line 787, characters 5-12", test34(un
 
 function scan_elems$9(scan_elem, accu, ib) {
   return Curry._2(Stdlib__Scanf.kscanf(ib, (function (ib, exc) {
-                    return accu;
-                  }), {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Reader */19,
-                    _0: /* End_of_format */0
-                  },
-                  _1: "%r"
-                }), (function (ib) {
-                return Curry._2(scan_elem, ib, (function (elem) {
-                              const accu$1 = {
-                                hd: elem,
-                                tl: accu
-                              };
-                              return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                              TAG: /* Format */0,
-                                              _0: {
-                                                TAG: /* Char_literal */12,
-                                                _0: /* ' ' */32,
-                                                _1: {
-                                                  TAG: /* Scan_char_set */20,
-                                                  _0: 1,
-                                                  _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                                                  _2: {
-                                                    TAG: /* Char_literal */12,
-                                                    _0: /* ' ' */32,
-                                                    _1: /* End_of_format */0
-                                                  }
-                                                }
-                                              },
-                                              _1: " %1[;] "
-                                            }), (function (param) {
-                                            if (param === "") {
-                                              return accu$1;
-                                            } else {
-                                              return scan_elems$9(scan_elem, accu$1, ib);
-                                            }
-                                          }));
-                            }));
-              }), (function (l) {
-                return l;
-              }));
+              return accu;
+            }), {
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Reader */19,
+              _0: /* End_of_format */0
+            },
+            _1: "%r"
+          }), (function (ib) {
+          return Curry._2(scan_elem, ib, (function (elem) {
+                  const accu$1 = {
+                    hd: elem,
+                    tl: accu
+                  };
+                  return Curry._1(Stdlib__Scanf.bscanf(ib, {
+                            TAG: /* Format */0,
+                            _0: {
+                              TAG: /* Char_literal */12,
+                              _0: /* ' ' */32,
+                              _1: {
+                                TAG: /* Scan_char_set */20,
+                                _0: 1,
+                                _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                                _2: {
+                                  TAG: /* Char_literal */12,
+                                  _0: /* ' ' */32,
+                                  _1: /* End_of_format */0
+                                }
+                              }
+                            },
+                            _1: " %1[;] "
+                          }), (function (param) {
+                          if (param === "") {
+                            return accu$1;
+                          } else {
+                            return scan_elems$9(scan_elem, accu$1, ib);
+                          }
+                        }));
+                }));
+        }), (function (l) {
+          return l;
+        }));
 }
 
 function scan_list$4(scan_elem, ib) {
@@ -3253,122 +3253,122 @@ function scan_list$4(scan_elem, ib) {
 
 function scan_float(ib) {
   return Stdlib__Scanf.bscanf(ib, {
-              TAG: /* Format */0,
-              _0: {
-                TAG: /* Float */8,
-                _0: [
-                  /* Float_flag_ */0,
-                  /* Float_f */0
-                ],
-                _1: /* No_padding */0,
-                _2: /* No_precision */0,
-                _3: /* End_of_format */0
-              },
-              _1: "%f"
-            });
+        TAG: /* Format */0,
+        _0: {
+          TAG: /* Float */8,
+          _0: [
+            /* Float_flag_ */0,
+            /* Float_f */0
+          ],
+          _1: /* No_padding */0,
+          _2: /* No_precision */0,
+          _3: /* End_of_format */0
+        },
+        _1: "%f"
+      });
 }
 
 function scan_int_list$8(param) {
   return scan_list$4((function (ib) {
-                return Stdlib__Scanf.bscanf(ib, {
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* Int */4,
-                              _0: /* Int_i */3,
-                              _1: /* No_padding */0,
-                              _2: /* No_precision */0,
-                              _3: /* End_of_format */0
-                            },
-                            _1: "%i"
-                          });
-              }), param);
+          return Stdlib__Scanf.bscanf(ib, {
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Int */4,
+                  _0: /* Int_i */3,
+                  _1: /* No_padding */0,
+                  _2: /* No_precision */0,
+                  _3: /* End_of_format */0
+                },
+                _1: "%i"
+              });
+        }), param);
 }
 
 function scan_string_list$2(param) {
   return scan_list$4((function (ib) {
-                return Stdlib__Scanf.bscanf(ib, {
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* Caml_string */3,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            },
-                            _1: "%S"
-                          });
-              }), param);
+          return Stdlib__Scanf.bscanf(ib, {
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Caml_string */3,
+                  _0: /* No_padding */0,
+                  _1: /* End_of_format */0
+                },
+                _1: "%S"
+              });
+        }), param);
 }
 
 function scan_bool_list(param) {
   return scan_list$4((function (ib) {
-                return Stdlib__Scanf.bscanf(ib, {
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* Bool */9,
-                              _0: /* No_padding */0,
-                              _1: /* End_of_format */0
-                            },
-                            _1: "%B"
-                          });
-              }), param);
+          return Stdlib__Scanf.bscanf(ib, {
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Bool */9,
+                  _0: /* No_padding */0,
+                  _1: /* End_of_format */0
+                },
+                _1: "%B"
+              });
+        }), param);
 }
 
 function scan_char_list(param) {
   return scan_list$4((function (ib) {
-                return Stdlib__Scanf.bscanf(ib, {
-                            TAG: /* Format */0,
-                            _0: {
-                              TAG: /* Caml_char */1,
-                              _0: /* End_of_format */0
-                            },
-                            _1: "%C"
-                          });
-              }), param);
+          return Stdlib__Scanf.bscanf(ib, {
+                TAG: /* Format */0,
+                _0: {
+                  TAG: /* Caml_char */1,
+                  _0: /* End_of_format */0
+                },
+                _1: "%C"
+              });
+        }), param);
 }
 
 function scan_float_list_list(param) {
   return scan_list$4((function (ib, k) {
-                return Curry._1(k, scan_list$4(scan_float, ib));
-              }), param);
+          return Curry._1(k, scan_list$4(scan_float, ib));
+        }), param);
 }
 
 function test340(param) {
   return Caml_obj.caml_equal(scan_float_list_list(Stdlib__Scanf.Scanning.from_string("[[1.0] ; []; [2.0; 3; 5.0; 6.];]")), {
-              hd: {
-                hd: 1,
-                tl: /* [] */0
-              },
+        hd: {
+          hd: 1,
+          tl: /* [] */0
+        },
+        tl: {
+          hd: /* [] */0,
+          tl: {
+            hd: {
+              hd: 2,
               tl: {
-                hd: /* [] */0,
+                hd: 3,
                 tl: {
-                  hd: {
-                    hd: 2,
-                    tl: {
-                      hd: 3,
-                      tl: {
-                        hd: 5,
-                        tl: {
-                          hd: 6,
-                          tl: /* [] */0
-                        }
-                      }
-                    }
-                  },
-                  tl: /* [] */0
+                  hd: 5,
+                  tl: {
+                    hd: 6,
+                    tl: /* [] */0
+                  }
                 }
               }
-            });
+            },
+            tl: /* [] */0
+          }
+        }
+      });
 }
 
 function scan_list_list(scan_elems, ib) {
   return scan_list$4((function (ib, k) {
-                return Curry._1(k, Curry._1(scan_elems, ib));
-              }), ib);
+          return Curry._1(k, Curry._1(scan_elems, ib));
+        }), ib);
 }
 
 function scan_float_item(ib, k) {
   return Curry._1(k, Curry._1(scan_float(ib), (function (x) {
-                    return x;
-                  })));
+              return x;
+            })));
 }
 
 function scan_float_list(ib, k) {
@@ -3416,40 +3416,40 @@ function test35(param) {
                   _1: "%d%N"
                 }), (function (x, y) {
                 return [
-                        x,
-                        y
-                      ];
+                  x,
+                  y
+                ];
               })), [
           456,
           1
         ])) {
     return Caml_obj.caml_equal(Curry._1(Stdlib__Scanf.sscanf(" ", {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Scan_get_counter */21,
-                          _0: /* Token_counter */2,
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* Scan_get_counter */21,
-                              _0: /* Token_counter */2,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "%N%s%N"
-                      }), (function (x, s, y) {
-                      return [
-                              x,
-                              s,
-                              y
-                            ];
-                    })), [
-                0,
-                "",
-                1
-              ]);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Scan_get_counter */21,
+                    _0: /* Token_counter */2,
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* Scan_get_counter */21,
+                        _0: /* Token_counter */2,
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "%N%s%N"
+                }), (function (x, s, y) {
+                return [
+                  x,
+                  s,
+                  y
+                ];
+              })), [
+          0,
+          "",
+          1
+        ]);
   } else {
     return false;
   }
@@ -3459,60 +3459,60 @@ test("File \"jscomp/test/tscanf_test.ml\", line 940, characters 5-12", test340(u
 
 function read_elems(read_elem, accu, ib) {
   return Curry._2(Stdlib__Scanf.kscanf(ib, (function (ib, exc) {
-                    return accu;
-                  }), {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Reader */19,
-                    _0: {
-                      TAG: /* Char_literal */12,
-                      _0: /* ' ' */32,
-                      _1: {
-                        TAG: /* Scan_char_set */20,
-                        _0: 1,
-                        _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                        _2: {
-                          TAG: /* Char_literal */12,
-                          _0: /* ' ' */32,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    }
-                  },
-                  _1: "%r %1[;] "
-                }), Curry._1(read_elem, (function (elem) {
-                    return {
-                            hd: elem,
-                            tl: accu
-                          };
-                  })), (function (accu, s) {
-                if (s === "") {
-                  return accu;
-                } else {
-                  return read_elems(read_elem, accu, ib);
+              return accu;
+            }), {
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Reader */19,
+              _0: {
+                TAG: /* Char_literal */12,
+                _0: /* ' ' */32,
+                _1: {
+                  TAG: /* Scan_char_set */20,
+                  _0: 1,
+                  _1: "\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                  _2: {
+                    TAG: /* Char_literal */12,
+                    _0: /* ' ' */32,
+                    _1: /* End_of_format */0
+                  }
                 }
-              }));
+              }
+            },
+            _1: "%r %1[;] "
+          }), Curry._1(read_elem, (function (elem) {
+              return {
+                hd: elem,
+                tl: accu
+              };
+            })), (function (accu, s) {
+          if (s === "") {
+            return accu;
+          } else {
+            return read_elems(read_elem, accu, ib);
+          }
+        }));
 }
 
 function read_list(read_elem, ib) {
   return Curry._2(Stdlib__Scanf.bscanf(ib, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* String_literal */11,
-                    _0: "[ ",
-                    _1: {
-                      TAG: /* Reader */19,
-                      _0: {
-                        TAG: /* String_literal */11,
-                        _0: " ]",
-                        _1: /* End_of_format */0
-                      }
-                    }
-                  },
-                  _1: "[ %r ]"
-                }), (function (param) {
-                return read_elems(read_elem, /* [] */0, param);
-              }), Stdlib__List.rev);
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* String_literal */11,
+              _0: "[ ",
+              _1: {
+                TAG: /* Reader */19,
+                _0: {
+                  TAG: /* String_literal */11,
+                  _0: " ]",
+                  _1: /* End_of_format */0
+                }
+              }
+            },
+            _1: "[ %r ]"
+          }), (function (param) {
+          return read_elems(read_elem, /* [] */0, param);
+        }), Stdlib__List.rev);
 }
 
 function make_read_elem(fmt, f, ib) {
@@ -3522,8 +3522,8 @@ function make_read_elem(fmt, f, ib) {
 function scan_List(fmt) {
   return function (param) {
     return read_list((function (param, param$1) {
-                  return Curry._1(Stdlib__Scanf.bscanf(param$1, fmt), param);
-                }), param);
+            return Curry._1(Stdlib__Scanf.bscanf(param$1, fmt), param);
+          }), param);
   };
 }
 
@@ -3564,40 +3564,40 @@ function test36(param) {
                   _1: "%d%n"
                 }), (function (x, y) {
                 return [
-                        x,
-                        y
-                      ];
+                  x,
+                  y
+                ];
               })), [
           456,
           3
         ])) {
     return Caml_obj.caml_equal(Curry._1(Stdlib__Scanf.sscanf(" ", {
-                        TAG: /* Format */0,
-                        _0: {
-                          TAG: /* Scan_get_counter */21,
-                          _0: /* Char_counter */1,
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* Scan_get_counter */21,
-                              _0: /* Char_counter */1,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        },
-                        _1: "%n%s%n"
-                      }), (function (x, s, y) {
-                      return [
-                              x,
-                              s,
-                              y
-                            ];
-                    })), [
-                0,
-                "",
-                0
-              ]);
+                  TAG: /* Format */0,
+                  _0: {
+                    TAG: /* Scan_get_counter */21,
+                    _0: /* Char_counter */1,
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* Scan_get_counter */21,
+                        _0: /* Char_counter */1,
+                        _1: /* End_of_format */0
+                      }
+                    }
+                  },
+                  _1: "%n%s%n"
+                }), (function (x, s, y) {
+                return [
+                  x,
+                  s,
+                  y
+                ];
+              })), [
+          0,
+          "",
+          0
+        ]);
   } else {
     return false;
   }
@@ -3618,12 +3618,12 @@ function test37(param) {
             return x;
           }), 1) === 1) {
     return Curry._2(Stdlib__Scanf.sscanf("123", {
-                    TAG: /* Format */0,
-                    _0: /* End_of_format */0,
-                    _1: ""
-                  }), (function (x) {
-                  return x;
-                }), 1) === 1;
+              TAG: /* Format */0,
+              _0: /* End_of_format */0,
+              _1: ""
+            }), (function (x) {
+            return x;
+          }), 1) === 1;
   } else {
     return false;
   }
@@ -3710,20 +3710,20 @@ function test38(param) {
               _1: " %!"
             }), true)) {
     return Curry._1(Stdlib__Scanf.sscanf("", {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Char_literal */12,
-                      _0: /* ' ' */32,
-                      _1: {
-                        TAG: /* Flush */10,
-                        _0: {
-                          TAG: /* Flush */10,
-                          _0: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: " %!%!"
-                  }), true);
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char_literal */12,
+                _0: /* ' ' */32,
+                _1: {
+                  TAG: /* Flush */10,
+                  _0: {
+                    TAG: /* Flush */10,
+                    _0: /* End_of_format */0
+                  }
+                }
+              },
+              _1: " %!%!"
+            }), true);
   } else {
     return false;
   }
@@ -3752,28 +3752,28 @@ test("File \"jscomp/test/tscanf_test.ml\", line 1036, characters 5-12", test39(u
 function test40(param) {
   const ib = Stdlib__Scanf.Scanning.from_string("cba");
   return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Scan_char_set */20,
-                    _0: undefined,
-                    _1: "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf9\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
-                    _2: {
-                      TAG: /* String */2,
-                      _0: /* No_padding */0,
-                      _1: {
-                        TAG: /* Flush */10,
-                        _0: /* End_of_format */0
-                      }
-                    }
-                  },
-                  _1: "%[^ab]%s%!"
-                }), (function (s1, s2) {
-                if (s1 === "c") {
-                  return s2 === "ba";
-                } else {
-                  return false;
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Scan_char_set */20,
+              _0: undefined,
+              _1: "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf9\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
+              _2: {
+                TAG: /* String */2,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* Flush */10,
+                  _0: /* End_of_format */0
                 }
-              }));
+              }
+            },
+            _1: "%[^ab]%s%!"
+          }), (function (s1, s2) {
+          if (s1 === "c") {
+            return s2 === "ba";
+          } else {
+            return false;
+          }
+        }));
 }
 
 test("File \"jscomp/test/tscanf_test.ml\", line 1046, characters 5-12", test40(undefined));
@@ -3781,29 +3781,29 @@ test("File \"jscomp/test/tscanf_test.ml\", line 1046, characters 5-12", test40(u
 function test41(param) {
   const ib = Stdlib__Scanf.Scanning.from_string("cba");
   return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Scan_char_set */20,
-                    _0: undefined,
-                    _1: "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf1\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
-                    _2: {
-                      TAG: /* Scan_char_set */20,
-                      _0: undefined,
-                      _1: "\0\0\0\0\0\0\0\0\0\0\0\0\x0e\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                      _2: {
-                        TAG: /* Flush */10,
-                        _0: /* End_of_format */0
-                      }
-                    }
-                  },
-                  _1: "%[^abc]%[cba]%!"
-                }), (function (s1, s2) {
-                if (s1 === "") {
-                  return s2 === "cba";
-                } else {
-                  return false;
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Scan_char_set */20,
+              _0: undefined,
+              _1: "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf1\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
+              _2: {
+                TAG: /* Scan_char_set */20,
+                _0: undefined,
+                _1: "\0\0\0\0\0\0\0\0\0\0\0\0\x0e\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                _2: {
+                  TAG: /* Flush */10,
+                  _0: /* End_of_format */0
                 }
-              }));
+              }
+            },
+            _1: "%[^abc]%[cba]%!"
+          }), (function (s1, s2) {
+          if (s1 === "") {
+            return s2 === "cba";
+          } else {
+            return false;
+          }
+        }));
 }
 
 test("File \"jscomp/test/tscanf_test.ml\", line 1055, characters 5-12", test41(undefined));
@@ -3843,23 +3843,23 @@ function test42(param) {
   }
   const ib$1 = Stdlib__Scanf.Scanning.from_string(s);
   return Curry._1(Stdlib__Scanf.bscanf(ib$1, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* String */2,
-                    _0: /* No_padding */0,
-                    _1: {
-                      TAG: /* Formatting_lit */17,
-                      _0: {
-                        TAG: /* Scan_indic */2,
-                        _0: /* '\t' */9
-                      },
-                      _1: /* End_of_format */0
-                    }
-                  },
-                  _1: "%s@\t"
-                }), (function (s) {
-                return s === "defcbaaghi";
-              }));
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* String */2,
+              _0: /* No_padding */0,
+              _1: {
+                TAG: /* Formatting_lit */17,
+                _0: {
+                  TAG: /* Scan_indic */2,
+                  _0: /* '\t' */9
+                },
+                _1: /* End_of_format */0
+              }
+            },
+            _1: "%s@\t"
+          }), (function (s) {
+          return s === "defcbaaghi";
+        }));
 }
 
 test("File \"jscomp/test/tscanf_test.ml\", line 1067, characters 5-12", test42(undefined));
@@ -3868,40 +3868,40 @@ const ib$1 = Stdlib__Scanf.Scanning.from_string("");
 
 function test43(param) {
   return Curry._1(Stdlib__Scanf.bscanf(ib$1, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Int */4,
-                    _0: /* Int_i */3,
-                    _1: /* No_padding */0,
-                    _2: /* No_precision */0,
-                    _3: {
-                      TAG: /* Flush */10,
-                      _0: /* End_of_format */0
-                    }
-                  },
-                  _1: "%i%!"
-                }), (function (i) {
-                return i;
-              }));
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Int */4,
+              _0: /* Int_i */3,
+              _1: /* No_padding */0,
+              _2: /* No_precision */0,
+              _3: {
+                TAG: /* Flush */10,
+                _0: /* End_of_format */0
+              }
+            },
+            _1: "%i%!"
+          }), (function (i) {
+          return i;
+        }));
 }
 
 function test44(param) {
   return Curry._1(Stdlib__Scanf.bscanf(ib$1, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Flush */10,
-                    _0: {
-                      TAG: /* Int */4,
-                      _0: /* Int_i */3,
-                      _1: /* No_padding */0,
-                      _2: /* No_precision */0,
-                      _3: /* End_of_format */0
-                    }
-                  },
-                  _1: "%!%i"
-                }), (function (i) {
-                return i;
-              }));
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Flush */10,
+              _0: {
+                TAG: /* Int */4,
+                _0: /* Int_i */3,
+                _1: /* No_padding */0,
+                _2: /* No_precision */0,
+                _3: /* End_of_format */0
+              }
+            },
+            _1: "%!%i"
+          }), (function (i) {
+          return i;
+        }));
 }
 
 Testing.test_raises_this_exc({
@@ -3913,131 +3913,131 @@ Testing.test_raises_this_exc({
 function test45(param) {
   const ib = Stdlib__Scanf.Scanning.from_string("12.2");
   return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Scan_char_set */20,
-                    _0: undefined,
-                    _1: "\0\0\0\0\0\0\xff\x03\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                    _2: {
-                      TAG: /* Char_literal */12,
-                      _0: /* '.' */46,
-                      _1: {
-                        TAG: /* Scan_char_set */20,
-                        _0: undefined,
-                        _1: "\0\0\0\0\0\0\xff\x03\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                        _2: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: {
-                            TAG: /* Flush */10,
-                            _0: /* End_of_format */0
-                          }
-                        }
-                      }
-                    }
-                  },
-                  _1: "%[0-9].%[0-9]%s%!"
-                }), (function (s1, s2, s3) {
-                if (s1 === "12" && s2 === "2") {
-                  return s3 === "";
-                } else {
-                  return false;
-                }
-              }));
-}
-
-test("File \"jscomp/test/tscanf_test.ml\", line 1090, characters 5-12", test45(undefined));
-
-function test46(param) {
-  return Curry._3(Stdlib__Printf.sprintf({
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Int */4,
-                    _0: /* Int_i */3,
-                    _1: /* No_padding */0,
-                    _2: /* No_precision */0,
-                    _3: {
-                      TAG: /* Char_literal */12,
-                      _0: /* ' ' */32,
-                      _1: {
-                        TAG: /* Format_subst */14,
-                        _0: undefined,
-                        _1: {
-                          TAG: /* String_ty */1,
-                          _0: /* End_of_fmtty */0
-                        },
-                        _2: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '.' */46,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    }
-                  },
-                  _1: "%i %(%s%)."
-                }), 1, {
-              TAG: /* Format */0,
-              _0: {
-                TAG: /* String_literal */11,
-                _0: "spells one, ",
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Scan_char_set */20,
+              _0: undefined,
+              _1: "\0\0\0\0\0\0\xff\x03\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+              _2: {
+                TAG: /* Char_literal */12,
+                _0: /* '.' */46,
+                _1: {
+                  TAG: /* Scan_char_set */20,
+                  _0: undefined,
+                  _1: "\0\0\0\0\0\0\xff\x03\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                  _2: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: {
+                      TAG: /* Flush */10,
+                      _0: /* End_of_format */0
+                    }
+                  }
+                }
+              }
+            },
+            _1: "%[0-9].%[0-9]%s%!"
+          }), (function (s1, s2, s3) {
+          if (s1 === "12" && s2 === "2") {
+            return s3 === "";
+          } else {
+            return false;
+          }
+        }));
+}
+
+test("File \"jscomp/test/tscanf_test.ml\", line 1090, characters 5-12", test45(undefined));
+
+function test46(param) {
+  return Curry._3(Stdlib__Printf.sprintf({
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Int */4,
+              _0: /* Int_i */3,
+              _1: /* No_padding */0,
+              _2: /* No_precision */0,
+              _3: {
+                TAG: /* Char_literal */12,
+                _0: /* ' ' */32,
                 _1: {
-                  TAG: /* String */2,
-                  _0: /* No_padding */0,
-                  _1: /* End_of_format */0
+                  TAG: /* Format_subst */14,
+                  _0: undefined,
+                  _1: {
+                    TAG: /* String_ty */1,
+                    _0: /* End_of_fmtty */0
+                  },
+                  _2: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '.' */46,
+                    _1: /* End_of_format */0
+                  }
                 }
-              },
-              _1: "spells one, %s"
-            }, "in english");
+              }
+            },
+            _1: "%i %(%s%)."
+          }), 1, {
+        TAG: /* Format */0,
+        _0: {
+          TAG: /* String_literal */11,
+          _0: "spells one, ",
+          _1: {
+            TAG: /* String */2,
+            _0: /* No_padding */0,
+            _1: /* End_of_format */0
+          }
+        },
+        _1: "spells one, %s"
+      }, "in english");
 }
 
 function test47(param) {
   return Curry._3(Stdlib__Printf.sprintf({
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* Int */4,
-                    _0: /* Int_i */3,
-                    _1: /* No_padding */0,
-                    _2: /* No_precision */0,
-                    _3: {
-                      TAG: /* Char_literal */12,
-                      _0: /* ' ' */32,
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* Int */4,
+              _0: /* Int_i */3,
+              _1: /* No_padding */0,
+              _2: /* No_precision */0,
+              _3: {
+                TAG: /* Char_literal */12,
+                _0: /* ' ' */32,
+                _1: {
+                  TAG: /* Format_arg */13,
+                  _0: undefined,
+                  _1: {
+                    TAG: /* String_ty */1,
+                    _0: /* End_of_fmtty */0
+                  },
+                  _2: {
+                    TAG: /* String_literal */11,
+                    _0: ", ",
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
                       _1: {
-                        TAG: /* Format_arg */13,
-                        _0: undefined,
-                        _1: {
-                          TAG: /* String_ty */1,
-                          _0: /* End_of_fmtty */0
-                        },
-                        _2: {
-                          TAG: /* String_literal */11,
-                          _0: ", ",
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* Char_literal */12,
-                              _0: /* '.' */46,
-                              _1: /* End_of_format */0
-                            }
-                          }
-                        }
+                        TAG: /* Char_literal */12,
+                        _0: /* '.' */46,
+                        _1: /* End_of_format */0
                       }
                     }
-                  },
-                  _1: "%i %{%s%}, %s."
-                }), 1, {
-              TAG: /* Format */0,
-              _0: {
-                TAG: /* String_literal */11,
-                _0: "spells one ",
-                _1: {
-                  TAG: /* String */2,
-                  _0: /* No_padding */0,
-                  _1: /* End_of_format */0
+                  }
                 }
-              },
-              _1: "spells one %s"
-            }, "in english");
+              }
+            },
+            _1: "%i %{%s%}, %s."
+          }), 1, {
+        TAG: /* Format */0,
+        _0: {
+          TAG: /* String_literal */11,
+          _0: "spells one ",
+          _1: {
+            TAG: /* String */2,
+            _0: /* No_padding */0,
+            _1: /* End_of_format */0
+          }
+        },
+        _1: "spells one %s"
+      }, "in english");
 }
 
 test("File \"jscomp/test/tscanf_test.ml\", line 1104, characters 5-12", test46(undefined) === "1 spells one, in english.");
@@ -4139,20 +4139,20 @@ function test48(param) {
   }
   const k = function (s) {
     return Curry._1(Stdlib__Scanf.sscanf(s, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Format_subst */14,
-                      _0: undefined,
-                      _1: {
-                        TAG: /* Float_ty */6,
-                        _0: /* End_of_fmtty */0
-                      },
-                      _2: /* End_of_format */0
-                    },
-                    _1: "%(%f%)"
-                  }), (function (_fmt, i) {
-                  return i;
-                }));
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Format_subst */14,
+                _0: undefined,
+                _1: {
+                  TAG: /* Float_ty */6,
+                  _0: /* End_of_fmtty */0
+                },
+                _2: /* End_of_format */0
+              },
+              _1: "%(%f%)"
+            }), (function (_fmt, i) {
+            return i;
+          }));
   };
   if (k("\" : %1f\": 987654321") !== 9.0) {
     return false;
@@ -4168,24 +4168,24 @@ function test48(param) {
   }
   const h = function (s) {
     return Curry._1(Stdlib__Scanf.sscanf(s, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String_literal */11,
-                      _0: "Read integers with ",
-                      _1: {
-                        TAG: /* Format_subst */14,
-                        _0: undefined,
-                        _1: {
-                          TAG: /* Int_ty */2,
-                          _0: /* End_of_fmtty */0
-                        },
-                        _2: /* End_of_format */0
-                      }
-                    },
-                    _1: "Read integers with %(%i%)"
-                  }), (function (_fmt, i) {
-                  return i;
-                }));
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "Read integers with ",
+                _1: {
+                  TAG: /* Format_subst */14,
+                  _0: undefined,
+                  _1: {
+                    TAG: /* Int_ty */2,
+                    _0: /* End_of_fmtty */0
+                  },
+                  _2: /* End_of_format */0
+                }
+              },
+              _1: "Read integers with %(%i%)"
+            }), (function (_fmt, i) {
+            return i;
+          }));
   };
   if (h("Read integers with \"%1d\"987654321") !== 9) {
     return false;
@@ -4201,30 +4201,30 @@ function test48(param) {
   }
   const i = function (s) {
     return Curry._1(Stdlib__Scanf.sscanf(s, {
-                    TAG: /* Format */0,
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "with ",
+                _1: {
+                  TAG: /* Format_subst */14,
+                  _0: undefined,
+                  _1: {
+                    TAG: /* Int_ty */2,
                     _0: {
-                      TAG: /* String_literal */11,
-                      _0: "with ",
-                      _1: {
-                        TAG: /* Format_subst */14,
-                        _0: undefined,
-                        _1: {
-                          TAG: /* Int_ty */2,
-                          _0: {
-                            TAG: /* String_ty */1,
-                            _0: /* End_of_fmtty */0
-                          }
-                        },
-                        _2: /* End_of_format */0
-                      }
-                    },
-                    _1: "with %(%i %s%)"
-                  }), (function (_fmt, amount, currency) {
-                  return [
-                          amount,
-                          currency
-                        ];
-                }));
+                      TAG: /* String_ty */1,
+                      _0: /* End_of_fmtty */0
+                    }
+                  },
+                  _2: /* End_of_format */0
+                }
+              },
+              _1: "with %(%i %s%)"
+            }), (function (_fmt, amount, currency) {
+            return [
+              amount,
+              currency
+            ];
+          }));
   };
   if (!Caml_obj.caml_equal(i("with \" : %d %s\" :        21 euros"), [
           21,
@@ -4252,30 +4252,30 @@ function test48(param) {
   }
   const j = function (s) {
     return Curry._1(Stdlib__Scanf.sscanf(s, {
-                    TAG: /* Format */0,
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String_literal */11,
+                _0: "with ",
+                _1: {
+                  TAG: /* Format_subst */14,
+                  _0: undefined,
+                  _1: {
+                    TAG: /* Int_ty */2,
                     _0: {
-                      TAG: /* String_literal */11,
-                      _0: "with ",
-                      _1: {
-                        TAG: /* Format_subst */14,
-                        _0: undefined,
-                        _1: {
-                          TAG: /* Int_ty */2,
-                          _0: {
-                            TAG: /* String_ty */1,
-                            _0: /* End_of_fmtty */0
-                          }
-                        },
-                        _2: /* End_of_format */0
-                      }
-                    },
-                    _1: "with %(%i %_s %s%)"
-                  }), (function (_fmt, amount, currency) {
-                  return [
-                          amount,
-                          currency
-                        ];
-                }));
+                      TAG: /* String_ty */1,
+                      _0: /* End_of_fmtty */0
+                    }
+                  },
+                  _2: /* End_of_format */0
+                }
+              },
+              _1: "with %(%i %_s %s%)"
+            }), (function (_fmt, amount, currency) {
+            return [
+              amount,
+              currency
+            ];
+          }));
   };
   if (Caml_obj.caml_equal(j("with \" : %1d %_s %s\" : 987654321 euros"), [
           9,
@@ -4288,9 +4288,9 @@ function test48(param) {
           "pounds"
         ])) {
     return Caml_obj.caml_equal(j("with \" : %4x %_s %s\" : 987654321 yens"), [
-                39030,
-                "yens"
-              ]);
+          39030,
+          "yens"
+        ]);
   } else {
     return false;
   }
@@ -4477,36 +4477,36 @@ function test49(param) {
             return s === "a";
           }))) {
     return Curry._1(Stdlib__Scanf.sscanf("-asb", {
-                    TAG: /* Format */0,
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Char_literal */12,
+                _0: /* '-' */45,
+                _1: {
+                  TAG: /* Scan_char_set */20,
+                  _0: undefined,
+                  _1: "\0\0\0\0\0\0\0\0\0\0\0\0\x02\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                  _2: {
+                    TAG: /* Formatting_lit */17,
                     _0: {
-                      TAG: /* Char_literal */12,
-                      _0: /* '-' */45,
-                      _1: {
-                        TAG: /* Scan_char_set */20,
-                        _0: undefined,
-                        _1: "\0\0\0\0\0\0\0\0\0\0\0\0\x02\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                        _2: {
-                          TAG: /* Formatting_lit */17,
-                          _0: {
-                            TAG: /* Scan_indic */2,
-                            _0: /* 's' */115
-                          },
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      }
+                      TAG: /* Scan_indic */2,
+                      _0: /* 's' */115
                     },
-                    _1: "-%[a]@s%s"
-                  }), (function (s, t) {
-                  if (s === "a") {
-                    return t === "b";
-                  } else {
-                    return false;
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: /* End_of_format */0
+                    }
                   }
-                }));
+                }
+              },
+              _1: "-%[a]@s%s"
+            }), (function (s, t) {
+            if (s === "a") {
+              return t === "b";
+            } else {
+              return false;
+            }
+          }));
   } else {
     return false;
   }
@@ -4519,8 +4519,8 @@ function next_char(ob, param) {
   const len = s.length;
   if (len === 0) {
     throw new Caml_js_exceptions.MelangeError(Stdlib.End_of_file, {
-              MEL_EXN_ID: Stdlib.End_of_file
-            });
+          MEL_EXN_ID: Stdlib.End_of_file
+        });
   }
   const c = Caml_string.get(s, 0);
   ob.position = 0;
@@ -4539,42 +4539,42 @@ function send_int(ob, i) {
 
 function writer(ib, ob) {
   return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                  TAG: /* Format */0,
-                  _0: {
-                    TAG: /* String */2,
-                    _0: /* No_padding */0,
-                    _1: {
-                      TAG: /* Char_literal */12,
-                      _0: /* '\n' */10,
-                      _1: /* End_of_format */0
-                    }
-                  },
-                  _1: "%s\n"
-                }), (function (s) {
-                switch (s) {
-                  case "start" :
-                      send_string(ob, "Hello World!");
-                      return reader(ib, ob);
-                  case "stop" :
-                      return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                                      TAG: /* Format */0,
-                                      _0: {
-                                        TAG: /* Int */4,
-                                        _0: /* Int_i */3,
-                                        _1: /* No_padding */0,
-                                        _2: /* No_precision */0,
-                                        _3: /* End_of_format */0
-                                      },
-                                      _1: "%i"
-                                    }), (function (i) {
-                                    return i;
-                                  }));
-                  default:
-                    const i = Caml_format.caml_int_of_string(s);
-                    send_string(ob, String(i));
-                    return reader(ib, ob);
-                }
-              }));
+            TAG: /* Format */0,
+            _0: {
+              TAG: /* String */2,
+              _0: /* No_padding */0,
+              _1: {
+                TAG: /* Char_literal */12,
+                _0: /* '\n' */10,
+                _1: /* End_of_format */0
+              }
+            },
+            _1: "%s\n"
+          }), (function (s) {
+          switch (s) {
+            case "start" :
+                send_string(ob, "Hello World!");
+                return reader(ib, ob);
+            case "stop" :
+                return Curry._1(Stdlib__Scanf.bscanf(ib, {
+                          TAG: /* Format */0,
+                          _0: {
+                            TAG: /* Int */4,
+                            _0: /* Int_i */3,
+                            _1: /* No_padding */0,
+                            _2: /* No_precision */0,
+                            _3: /* End_of_format */0
+                          },
+                          _1: "%i"
+                        }), (function (i) {
+                        return i;
+                      }));
+            default:
+              const i = Caml_format.caml_int_of_string(s);
+              send_string(ob, String(i));
+              return reader(ib, ob);
+          }
+        }));
 }
 
 const count = {
@@ -4588,33 +4588,33 @@ function reader(ib, ob) {
     return writer(ib, ob);
   } else {
     return Curry._1(Stdlib__Scanf.bscanf(ib, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Scan_char_set */20,
-                      _0: undefined,
-                      _1: "\xff\xfb\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
-                      _2: {
-                        TAG: /* Char_literal */12,
-                        _0: /* '\n' */10,
-                        _1: /* End_of_format */0
-                      }
-                    },
-                    _1: "%[^\n]\n"
-                  }), (function (s) {
-                  if (s === "stop") {
-                    send_string(ob, "stop");
-                    return writer(ib, ob);
-                  }
-                  const l = s.length;
-                  count.contents = l + count.contents | 0;
-                  if (count.contents >= 100) {
-                    send_string(ob, "stop");
-                    send_string(ob, String(count.contents));
-                  } else {
-                    send_string(ob, String(l));
-                  }
-                  return writer(ib, ob);
-                }));
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Scan_char_set */20,
+                _0: undefined,
+                _1: "\xff\xfb\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
+                _2: {
+                  TAG: /* Char_literal */12,
+                  _0: /* '\n' */10,
+                  _1: /* End_of_format */0
+                }
+              },
+              _1: "%[^\n]\n"
+            }), (function (s) {
+            if (s === "stop") {
+              send_string(ob, "stop");
+              return writer(ib, ob);
+            }
+            const l = s.length;
+            count.contents = l + count.contents | 0;
+            if (count.contents >= 100) {
+              send_string(ob, "stop");
+              send_string(ob, String(count.contents));
+            } else {
+              send_string(ob, String(l));
+            }
+            return writer(ib, ob);
+          }));
   }
 }
 
@@ -4730,28 +4730,28 @@ function test51(param) {
             return s1 === "Hello" ? s2 === "" : false;
           }))) {
     return Curry._1(Stdlib__Scanf.sscanf("Hello \n", {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String */2,
-                      _0: /* No_padding */0,
-                      _1: {
-                        TAG: /* Formatting_lit */17,
-                        _0: /* Force_newline */3,
-                        _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "%s@\n%s"
-                  }), (function (s1, s2) {
-                  if (s1 === "Hello ") {
-                    return s2 === "";
-                  } else {
-                    return false;
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String */2,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* Formatting_lit */17,
+                  _0: /* Force_newline */3,
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: /* End_of_format */0
                   }
-                }));
+                }
+              },
+              _1: "%s@\n%s"
+            }), (function (s1, s2) {
+            if (s1 === "Hello ") {
+              return s2 === "";
+            } else {
+              return false;
+            }
+          }));
   } else {
     return false;
   }
@@ -5030,35 +5030,35 @@ function test52(param) {
             return s1 === "Hello" ? s2 === "foo}" : false;
           }))) {
     return Curry._1(Stdlib__Scanf.sscanf("Hello[foo]", {
-                    TAG: /* Format */0,
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String */2,
+                _0: /* No_padding */0,
+                _1: {
+                  TAG: /* Formatting_gen */18,
+                  _0: {
+                    TAG: /* Open_box */1,
                     _0: {
-                      TAG: /* String */2,
-                      _0: /* No_padding */0,
-                      _1: {
-                        TAG: /* Formatting_gen */18,
-                        _0: {
-                          TAG: /* Open_box */1,
-                          _0: {
-                            TAG: /* Format */0,
-                            _0: /* End_of_format */0,
-                            _1: ""
-                          }
-                        },
-                        _1: {
-                          TAG: /* String */2,
-                          _0: /* No_padding */0,
-                          _1: /* End_of_format */0
-                        }
-                      }
-                    },
-                    _1: "%s@[%s"
-                  }), (function (s1, s2) {
-                  if (s1 === "Hello") {
-                    return s2 === "foo]";
-                  } else {
-                    return false;
+                      TAG: /* Format */0,
+                      _0: /* End_of_format */0,
+                      _1: ""
+                    }
+                  },
+                  _1: {
+                    TAG: /* String */2,
+                    _0: /* No_padding */0,
+                    _1: /* End_of_format */0
                   }
-                }));
+                }
+              },
+              _1: "%s@[%s"
+            }), (function (s1, s2) {
+            if (s1 === "Hello") {
+              return s2 === "foo]";
+            } else {
+              return false;
+            }
+          }));
   } else {
     return false;
   }
@@ -5126,21 +5126,21 @@ function test53(param) {
           123
         ])) {
     return Curry._1(Stdlib__Scanf.sscanf("124", {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Int64 */7,
-                      _0: /* Int_d */0,
-                      _1: /* No_padding */0,
-                      _2: /* No_precision */0,
-                      _3: /* End_of_format */0
-                    },
-                    _1: "%Ld"
-                  }), (function (i) {
-                  return Caml.i64_eq(Caml_int64.sub(i, Caml_int64.one), [
-                              0,
-                              123
-                            ]);
-                }));
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Int64 */7,
+                _0: /* Int_d */0,
+                _1: /* No_padding */0,
+                _2: /* No_precision */0,
+                _3: /* End_of_format */0
+              },
+              _1: "%Ld"
+            }), (function (i) {
+            return Caml.i64_eq(Caml_int64.sub(i, Caml_int64.one), [
+                  0,
+                  123
+                ]);
+          }));
   } else {
     return false;
   }
@@ -5151,25 +5151,25 @@ test("File \"jscomp/test/tscanf_test.ml\", line 1301, characters 5-12", test53(u
 function test56(param) {
   const g = function (s) {
     return Curry._1(Stdlib__Scanf.sscanf(s, {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Int */4,
-                      _0: /* Int_d */0,
-                      _1: /* No_padding */0,
-                      _2: /* No_precision */0,
-                      _3: {
-                        TAG: /* Scan_get_counter */21,
-                        _0: /* Char_counter */1,
-                        _1: /* End_of_format */0
-                      }
-                    },
-                    _1: "%d%n"
-                  }), (function (i, n) {
-                  return [
-                          i,
-                          n
-                        ];
-                }));
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Int */4,
+                _0: /* Int_d */0,
+                _1: /* No_padding */0,
+                _2: /* No_precision */0,
+                _3: {
+                  TAG: /* Scan_get_counter */21,
+                  _0: /* Char_counter */1,
+                  _1: /* End_of_format */0
+                }
+              },
+              _1: "%d%n"
+            }), (function (i, n) {
+            return [
+              i,
+              n
+            ];
+          }));
   };
   if (Caml_obj.caml_equal(g("99"), [
           99,
@@ -5179,9 +5179,9 @@ function test56(param) {
           2
         ])) {
     return Caml_obj.caml_equal(g("-20 degrees Celsius"), [
-                -20,
-                3
-              ]);
+          -20,
+          3
+        ]);
   } else {
     return false;
   }
@@ -5399,55 +5399,55 @@ function test57(param) {
           _1: "Read an int %i then a string \"%s\"."
         })) {
     return Curry._1(Stdlib__Scanf.sscanf("12 \"%i\"89 ", {
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Int */4,
+                _0: /* Int_i */3,
+                _1: /* No_padding */0,
+                _2: /* No_precision */0,
+                _3: {
+                  TAG: /* Char_literal */12,
+                  _0: /* ' ' */32,
+                  _1: {
+                    TAG: /* Format_arg */13,
+                    _0: undefined,
+                    _1: {
+                      TAG: /* Int_ty */2,
+                      _0: /* End_of_fmtty */0
+                    },
+                    _2: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: {
+                        TAG: /* Char_literal */12,
+                        _0: /* ' ' */32,
+                        _1: {
+                          TAG: /* Flush */10,
+                          _0: /* End_of_format */0
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              _1: "%i %{%d%}%s %!"
+            }), (function (i, f, s) {
+            if (i === 12 && Caml_obj.caml_equal(f, {
                     TAG: /* Format */0,
                     _0: {
                       TAG: /* Int */4,
                       _0: /* Int_i */3,
                       _1: /* No_padding */0,
                       _2: /* No_precision */0,
-                      _3: {
-                        TAG: /* Char_literal */12,
-                        _0: /* ' ' */32,
-                        _1: {
-                          TAG: /* Format_arg */13,
-                          _0: undefined,
-                          _1: {
-                            TAG: /* Int_ty */2,
-                            _0: /* End_of_fmtty */0
-                          },
-                          _2: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: {
-                              TAG: /* Char_literal */12,
-                              _0: /* ' ' */32,
-                              _1: {
-                                TAG: /* Flush */10,
-                                _0: /* End_of_format */0
-                              }
-                            }
-                          }
-                        }
-                      }
+                      _3: /* End_of_format */0
                     },
-                    _1: "%i %{%d%}%s %!"
-                  }), (function (i, f, s) {
-                  if (i === 12 && Caml_obj.caml_equal(f, {
-                          TAG: /* Format */0,
-                          _0: {
-                            TAG: /* Int */4,
-                            _0: /* Int_i */3,
-                            _1: /* No_padding */0,
-                            _2: /* No_precision */0,
-                            _3: /* End_of_format */0
-                          },
-                          _1: "%i"
-                        })) {
-                    return s === "89";
-                  } else {
-                    return false;
-                  }
-                }));
+                    _1: "%i"
+                  })) {
+              return s === "89";
+            } else {
+              return false;
+            }
+          }));
   } else {
     return false;
   }
@@ -5511,29 +5511,29 @@ function test58(param) {
             return prim0 + prim1;
           })) === "string1string2") {
     return Curry._1(Stdlib__Scanf.sscanf("string1@%string2", {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* Scan_char_set */20,
-                      _0: undefined,
-                      _1: "\0\0\0\0\0\0\xff\x03\0\0\0\0\xfe\xff\xff\x07\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                      _2: {
-                        TAG: /* Char_literal */12,
-                        _0: /* '@' */64,
-                        _1: {
-                          TAG: /* Char_literal */12,
-                          _0: /* '%' */37,
-                          _1: {
-                            TAG: /* String */2,
-                            _0: /* No_padding */0,
-                            _1: /* End_of_format */0
-                          }
-                        }
-                      }
-                    },
-                    _1: "%[a-z0-9]%@%%%s"
-                  }), (function (prim0, prim1) {
-                  return prim0 + prim1;
-                })) === "string1string2";
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* Scan_char_set */20,
+                _0: undefined,
+                _1: "\0\0\0\0\0\0\xff\x03\0\0\0\0\xfe\xff\xff\x07\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+                _2: {
+                  TAG: /* Char_literal */12,
+                  _0: /* '@' */64,
+                  _1: {
+                    TAG: /* Char_literal */12,
+                    _0: /* '%' */37,
+                    _1: {
+                      TAG: /* String */2,
+                      _0: /* No_padding */0,
+                      _1: /* End_of_format */0
+                    }
+                  }
+                }
+              },
+              _1: "%[a-z0-9]%@%%%s"
+            }), (function (prim0, prim1) {
+            return prim0 + prim1;
+          })) === "string1string2";
   } else {
     return false;
   }
@@ -5583,28 +5583,28 @@ function test60(param) {
             return s1 === "" ? s2 === "abc" : false;
           }))) {
     return Curry._1(Stdlib__Scanf.sscanf("abc", {
-                    TAG: /* Format */0,
-                    _0: {
-                      TAG: /* String */2,
-                      _0: {
-                        TAG: /* Lit_padding */0,
-                        _0: /* Right */1,
-                        _1: 1
-                      },
-                      _1: {
-                        TAG: /* String */2,
-                        _0: /* No_padding */0,
-                        _1: /* End_of_format */0
-                      }
-                    },
-                    _1: "%1s%s"
-                  }), (function (s1, s2) {
-                  if (s1 === "a") {
-                    return s2 === "bc";
-                  } else {
-                    return false;
-                  }
-                }));
+              TAG: /* Format */0,
+              _0: {
+                TAG: /* String */2,
+                _0: {
+                  TAG: /* Lit_padding */0,
+                  _0: /* Right */1,
+                  _1: 1
+                },
+                _1: {
+                  TAG: /* String */2,
+                  _0: /* No_padding */0,
+                  _1: /* End_of_format */0
+                }
+              },
+              _1: "%1s%s"
+            }), (function (s1, s2) {
+            if (s1 === "a") {
+              return s2 === "bc";
+            } else {
+              return false;
+            }
+          }));
   } else {
     return false;
   }
diff --git a/jscomp/test/dist/jscomp/test/tuple_alloc.js b/jscomp/test/dist/jscomp/test/tuple_alloc.js
index 74648be14..407a0e3b4 100644
--- a/jscomp/test/dist/jscomp/test/tuple_alloc.js
+++ b/jscomp/test/dist/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/dist/jscomp/test/typeof_test.js b/jscomp/test/dist/jscomp/test/typeof_test.js
index e24f0385d..dfcba2846 100644
--- a/jscomp/test/dist/jscomp/test/typeof_test.js
+++ b/jscomp/test/dist/jscomp/test/typeof_test.js
@@ -35,10 +35,10 @@ const suites_0 = [
   "int_type",
   (function (param) {
       return {
-              TAG: /* Eq */0,
-              _0: "number",
-              _1: "number"
-            };
+        TAG: /* Eq */0,
+        _0: "number",
+        _1: "number"
+      };
     })
 ];
 
@@ -47,10 +47,10 @@ const suites_1 = {
     "string_type",
     (function (param) {
         return {
-                TAG: /* Eq */0,
-                _0: "string",
-                _1: "string"
-              };
+          TAG: /* Eq */0,
+          _0: "string",
+          _1: "string"
+        };
       })
   ],
   tl: {
@@ -58,10 +58,10 @@ const suites_1 = {
       "number_gadt_test",
       (function (param) {
           return {
-                  TAG: /* Eq */0,
-                  _0: Js__Js_types.test(3, /* Number */3),
-                  _1: true
-                };
+            TAG: /* Eq */0,
+            _0: Js__Js_types.test(3, /* Number */3),
+            _1: true
+          };
         })
     ],
     tl: {
@@ -69,10 +69,10 @@ const suites_1 = {
         "boolean_gadt_test",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: Js__Js_types.test(true, /* Boolean */2),
-                    _1: true
-                  };
+              TAG: /* Eq */0,
+              _0: Js__Js_types.test(true, /* Boolean */2),
+              _1: true
+            };
           })
       ],
       tl: {
@@ -80,10 +80,10 @@ const suites_1 = {
           "undefined_gadt_test",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: Js__Js_types.test(undefined, /* Undefined */0),
-                      _1: true
-                    };
+                TAG: /* Eq */0,
+                _0: Js__Js_types.test(undefined, /* Undefined */0),
+                _1: true
+              };
             })
         ],
         tl: {
@@ -91,10 +91,10 @@ const suites_1 = {
             "string_on_number1",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: string_or_number("xx"),
-                        _1: true
-                      };
+                  TAG: /* Eq */0,
+                  _0: string_or_number("xx"),
+                  _1: true
+                };
               })
           ],
           tl: {
@@ -102,10 +102,10 @@ const suites_1 = {
               "string_on_number2",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: string_or_number(3.02),
-                          _1: true
-                        };
+                    TAG: /* Eq */0,
+                    _0: string_or_number(3.02),
+                    _1: true
+                  };
                 })
             ],
             tl: {
@@ -113,12 +113,12 @@ const suites_1 = {
                 "string_on_number3",
                 (function (param) {
                     return {
-                            TAG: /* Eq */0,
-                            _0: string_or_number(function (x) {
-                                  return x;
-                                }),
-                            _1: false
-                          };
+                      TAG: /* Eq */0,
+                      _0: string_or_number(function (x) {
+                            return x;
+                          }),
+                      _1: false
+                    };
                   })
               ],
               tl: {
@@ -126,10 +126,10 @@ const suites_1 = {
                   "string_gadt_test",
                   (function (param) {
                       return {
-                              TAG: /* Eq */0,
-                              _0: Js__Js_types.test("3", /* String */4),
-                              _1: true
-                            };
+                        TAG: /* Eq */0,
+                        _0: Js__Js_types.test("3", /* String */4),
+                        _1: true
+                      };
                     })
                 ],
                 tl: {
@@ -137,10 +137,10 @@ const suites_1 = {
                     "string_gadt_test_neg",
                     (function (param) {
                         return {
-                                TAG: /* Eq */0,
-                                _0: Js__Js_types.test(3, /* String */4),
-                                _1: false
-                              };
+                          TAG: /* Eq */0,
+                          _0: Js__Js_types.test(3, /* String */4),
+                          _1: false
+                        };
                       })
                   ],
                   tl: {
@@ -148,12 +148,12 @@ const suites_1 = {
                       "function_gadt_test",
                       (function (param) {
                           return {
-                                  TAG: /* Eq */0,
-                                  _0: Js__Js_types.test((function (x) {
-                                          return x;
-                                        }), /* Function */5),
-                                  _1: true
-                                };
+                            TAG: /* Eq */0,
+                            _0: Js__Js_types.test((function (x) {
+                                    return x;
+                                  }), /* Function */5),
+                            _1: true
+                          };
                         })
                     ],
                     tl: {
@@ -161,12 +161,12 @@ const suites_1 = {
                         "object_gadt_test",
                         (function (param) {
                             return {
-                                    TAG: /* Eq */0,
-                                    _0: Js__Js_types.test({
-                                          x: 3
-                                        }, /* Object */6),
-                                    _1: true
-                                  };
+                              TAG: /* Eq */0,
+                              _0: Js__Js_types.test({
+                                    x: 3
+                                  }, /* Object */6),
+                              _1: true
+                            };
                           })
                       ],
                       tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/unboxed_use_case.js b/jscomp/test/dist/jscomp/test/unboxed_use_case.js
index c03018387..2dc80c97b 100644
--- a/jscomp/test/dist/jscomp/test/unboxed_use_case.js
+++ b/jscomp/test/dist/jscomp/test/unboxed_use_case.js
@@ -6,9 +6,9 @@ const Curry = require("melange.js/curry.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/dist/jscomp/test/uncurry_external_test.js b/jscomp/test/dist/jscomp/test/uncurry_external_test.js
index ce736945a..568d6a1af 100644
--- a/jscomp/test/dist/jscomp/test/uncurry_external_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/uncurry_glob_test.js b/jscomp/test/dist/jscomp/test/uncurry_glob_test.js
index b63dd8731..d12a7a27d 100644
--- a/jscomp/test/dist/jscomp/test/uncurry_glob_test.js
+++ b/jscomp/test/dist/jscomp/test/uncurry_glob_test.js
@@ -5,8 +5,8 @@
 function M(U) {
   const v = U.f(100, "x");
   return {
-          v: v
-        };
+    v: v
+  };
 }
 
 function f() {
diff --git a/jscomp/test/dist/jscomp/test/uncurry_test.js b/jscomp/test/dist/jscomp/test/uncurry_test.js
index e26863751..0aeccb91d 100644
--- a/jscomp/test/dist/jscomp/test/uncurry_test.js
+++ b/jscomp/test/dist/jscomp/test/uncurry_test.js
@@ -12,359 +12,359 @@ function f1(a0) {
 
 function f2(a0, a1) {
   return [
-          a0,
-          a1
-        ];
+    a0,
+    a1
+  ];
 }
 
 function f3(a0, a1, a2) {
   return [
-          a0,
-          a1,
-          a2
-        ];
+    a0,
+    a1,
+    a2
+  ];
 }
 
 function f4(a0, a1, a2, a3) {
   return [
-          a0,
-          a1,
-          a2,
-          a3
-        ];
+    a0,
+    a1,
+    a2,
+    a3
+  ];
 }
 
 function f5(a0, a1, a2, a3, a4) {
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4
+  ];
 }
 
 function f6(a0, a1, a2, a3, a4, a5) {
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4,
+    a5
+  ];
 }
 
 function f7(a0, a1, a2, a3, a4, a5, a6) {
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5,
-          a6
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4,
+    a5,
+    a6
+  ];
 }
 
 function f8(a0, a1, a2, a3, a4, a5, a6, a7) {
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5,
-          a6,
-          a7
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4,
+    a5,
+    a6,
+    a7
+  ];
 }
 
 function f9(a0, a1, a2, a3, a4, a5, a6, a7, a8) {
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5,
-          a6,
-          a7,
-          a8
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4,
+    a5,
+    a6,
+    a7,
+    a8
+  ];
 }
 
 function f10(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9) {
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5,
-          a6,
-          a7,
-          a8,
-          a9
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4,
+    a5,
+    a6,
+    a7,
+    a8,
+    a9
+  ];
 }
 
 function f11(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) {
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5,
-          a6,
-          a7,
-          a8,
-          a9,
-          a10
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4,
+    a5,
+    a6,
+    a7,
+    a8,
+    a9,
+    a10
+  ];
 }
 
 function f12(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) {
   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
+  ];
 }
 
 function f13(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) {
   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
+  ];
 }
 
 function f14(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13) {
   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
+  ];
 }
 
 function f15(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14) {
   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
+  ];
 }
 
 function f16(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15) {
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5,
-          a6,
-          a7,
-          a8,
-          a9,
-          a10,
-          a11,
-          a12,
-          a13,
-          a14,
-          a15
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4,
+    a5,
+    a6,
+    a7,
+    a8,
+    a9,
+    a10,
+    a11,
+    a12,
+    a13,
+    a14,
+    a15
+  ];
 }
 
 function f17(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16) {
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5,
-          a6,
-          a7,
-          a8,
-          a9,
-          a10,
-          a11,
-          a12,
-          a13,
-          a14,
-          a15,
-          a16
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4,
+    a5,
+    a6,
+    a7,
+    a8,
+    a9,
+    a10,
+    a11,
+    a12,
+    a13,
+    a14,
+    a15,
+    a16
+  ];
 }
 
 function f18(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17) {
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5,
-          a6,
-          a7,
-          a8,
-          a9,
-          a10,
-          a11,
-          a12,
-          a13,
-          a14,
-          a15,
-          a16,
-          a17
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4,
+    a5,
+    a6,
+    a7,
+    a8,
+    a9,
+    a10,
+    a11,
+    a12,
+    a13,
+    a14,
+    a15,
+    a16,
+    a17
+  ];
 }
 
 function f19(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18) {
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5,
-          a6,
-          a7,
-          a8,
-          a9,
-          a10,
-          a11,
-          a12,
-          a13,
-          a14,
-          a15,
-          a16,
-          a17,
-          a18
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4,
+    a5,
+    a6,
+    a7,
+    a8,
+    a9,
+    a10,
+    a11,
+    a12,
+    a13,
+    a14,
+    a15,
+    a16,
+    a17,
+    a18
+  ];
 }
 
 function f20(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19) {
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5,
-          a6,
-          a7,
-          a8,
-          a9,
-          a10,
-          a11,
-          a12,
-          a13,
-          a14,
-          a15,
-          a16,
-          a17,
-          a18,
-          a19
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4,
+    a5,
+    a6,
+    a7,
+    a8,
+    a9,
+    a10,
+    a11,
+    a12,
+    a13,
+    a14,
+    a15,
+    a16,
+    a17,
+    a18,
+    a19
+  ];
 }
 
 function f21(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) {
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5,
-          a6,
-          a7,
-          a8,
-          a9,
-          a10,
-          a11,
-          a12,
-          a13,
-          a14,
-          a15,
-          a16,
-          a17,
-          a18,
-          a19,
-          a20
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4,
+    a5,
+    a6,
+    a7,
+    a8,
+    a9,
+    a10,
+    a11,
+    a12,
+    a13,
+    a14,
+    a15,
+    a16,
+    a17,
+    a18,
+    a19,
+    a20
+  ];
 }
 
 function f22(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21) {
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5,
-          a6,
-          a7,
-          a8,
-          a9,
-          a10,
-          a11,
-          a12,
-          a13,
-          a14,
-          a15,
-          a16,
-          a17,
-          a18,
-          a19,
-          a20,
-          a21
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4,
+    a5,
+    a6,
+    a7,
+    a8,
+    a9,
+    a10,
+    a11,
+    a12,
+    a13,
+    a14,
+    a15,
+    a16,
+    a17,
+    a18,
+    a19,
+    a20,
+    a21
+  ];
 }
 
 console.log(f0());
diff --git a/jscomp/test/dist/jscomp/test/undef_regression2_test.js b/jscomp/test/dist/jscomp/test/undef_regression2_test.js
index 737c2cb96..187810d24 100644
--- a/jscomp/test/dist/jscomp/test/undef_regression2_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _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 */4,
-                  _0: x
-                };
+            TAG: /* Ok */4,
+            _0: x
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/dist/jscomp/test/unit_undefined_test.js b/jscomp/test/dist/jscomp/test/unit_undefined_test.js
index d79ce22d1..0c6768748 100644
--- a/jscomp/test/dist/jscomp/test/unit_undefined_test.js
+++ b/jscomp/test/dist/jscomp/test/unit_undefined_test.js
@@ -18,8 +18,8 @@ function eq(loc, x, y) {
 
 function f_01(param) {
   return hi(function () {
-              console.log("x");
-            });
+        console.log("x");
+      });
 }
 
 function u(x) {
diff --git a/jscomp/test/dist/jscomp/test/unsafe_ppx_test.js b/jscomp/test/dist/jscomp/test/unsafe_ppx_test.js
index e7b14ba99..102da47e0 100644
--- a/jscomp/test/dist/jscomp/test/unsafe_ppx_test.js
+++ b/jscomp/test/dist/jscomp/test/unsafe_ppx_test.js
@@ -58,10 +58,10 @@ Mt.from_pair_suites("Unsafe_ppx_test", {
         "unsafe_max",
         (function (param) {
             return {
-                    TAG: /* Eq */0,
-                    _0: 2,
-                    _1: max(1, 2)
-                  };
+              TAG: /* Eq */0,
+              _0: 2,
+              _1: max(1, 2)
+            };
           })
       ],
       tl: {
@@ -69,10 +69,10 @@ Mt.from_pair_suites("Unsafe_ppx_test", {
           "unsafe_test",
           (function (param) {
               return {
-                      TAG: /* Eq */0,
-                      _0: 3,
-                      _1: v
-                    };
+                TAG: /* Eq */0,
+                _0: 3,
+                _1: v
+              };
             })
         ],
         tl: {
@@ -80,10 +80,10 @@ Mt.from_pair_suites("Unsafe_ppx_test", {
             "unsafe_max2",
             (function (param) {
                 return {
-                        TAG: /* Eq */0,
-                        _0: 2,
-                        _1: Math.max(1, 2)
-                      };
+                  TAG: /* Eq */0,
+                  _0: 2,
+                  _1: Math.max(1, 2)
+                };
               })
           ],
           tl: {
@@ -91,10 +91,10 @@ Mt.from_pair_suites("Unsafe_ppx_test", {
               "ffi_keys",
               (function (param) {
                   return {
-                          TAG: /* Eq */0,
-                          _0: ["a"],
-                          _1: Ffi_js_test.keys({a : 3})
-                        };
+                    TAG: /* Eq */0,
+                    _0: ["a"],
+                    _1: Ffi_js_test.keys({a : 3})
+                  };
                 })
             ],
             tl: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/update_record_test.js b/jscomp/test/dist/jscomp/test/update_record_test.js
index ad563fe8e..9ae02b2a2 100644
--- a/jscomp/test/dist/jscomp/test/update_record_test.js
+++ b/jscomp/test/dist/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,
-                  _0: x,
-                  _1: y
-                };
+            TAG: /* Eq */0,
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -36,13 +36,13 @@ function eq(loc, x, y) {
 function f(x) {
   const y = Caml_obj.caml_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 \"jscomp/test/update_record_test.ml\", line 30, characters 5-12", 1, f({
@@ -61,9 +61,9 @@ const 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
+  };
 }
 
 const val1 = fff(val0);
diff --git a/jscomp/test/dist/jscomp/test/variant.js b/jscomp/test/dist/jscomp/test/variant.js
index 22cd515c6..cbd86b11c 100644
--- a/jscomp/test/dist/jscomp/test/variant.js
+++ b/jscomp/test/dist/jscomp/test/variant.js
@@ -70,8 +70,8 @@ function Make(M) {
     
   };
   return {
-          find: find
-        };
+    find: find
+  };
 }
 
 function find(x) {
diff --git a/jscomp/test/dist/jscomp/test/webpack_config.js b/jscomp/test/dist/jscomp/test/webpack_config.js
index ba179b362..68b243c64 100644
--- a/jscomp/test/dist/jscomp/test/webpack_config.js
+++ b/jscomp/test/dist/jscomp/test/webpack_config.js
@@ -39,19 +39,19 @@ const B = {};
 
 function f(param) {
   return [
-          (function (prim) {
-              List$2.ff();
-            }),
-          (function (prim) {
-              List$2.ff2();
-            }),
-          (function (prim) {
-              List$1.ff();
-            }),
-          (function (prim) {
-              List$1.ff2();
-            })
-        ];
+    (function (prim) {
+        List$2.ff();
+      }),
+    (function (prim) {
+        List$2.ff2();
+      }),
+    (function (prim) {
+        List$1.ff();
+      }),
+    (function (prim) {
+        List$1.ff2();
+      })
+  ];
 }
 
 List.xx();
diff --git a/test/blackbox-tests/custom-tag.t b/test/blackbox-tests/custom-tag.t
index 843970fb2..5a815154e 100644
--- a/test/blackbox-tests/custom-tag.t
+++ b/test/blackbox-tests/custom-tag.t
@@ -19,15 +19,15 @@ Test `@@mel.tag` attribute for discriminated unions
   function s(param) {
     if (param.lol !== /* Foo */0) {
       return [
-              param.c,
-              param.d
-            ];
+        param.c,
+        param.d
+      ];
     }
     const match = param._0;
     return [
-            match.a,
-            match.b
-          ];
+      match.a,
+      match.b
+    ];
   }
   
   const x = {
@@ -71,15 +71,15 @@ Test `@@mel.tag` attribute for discriminated unions
   function s(param) {
     if (param.lol !== /* Foo */0) {
       return [
-              param.c,
-              param.d
-            ];
+        param.c,
+        param.d
+      ];
     }
     const match = param._0;
     return [
-            match.a,
-            match.b
-          ];
+      match.a,
+      match.b
+    ];
   }
   
   const x = {
diff --git a/test/blackbox-tests/exn-cause.t b/test/blackbox-tests/exn-cause.t
index 4fbae7543..9d7b17865 100644
--- a/test/blackbox-tests/exn-cause.t
+++ b/test/blackbox-tests/exn-cause.t
@@ -45,13 +45,13 @@
       a0 = x._1;
     } else {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "x.ml",
-                  7,
-                  11
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "x.ml",
+              7,
+              11
+            ]
+          });
     }
   }
   
@@ -103,13 +103,13 @@ Raise `null` / `undefined`
       a0 = x._1;
     } else {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "x.ml",
-                  7,
-                  11
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "x.ml",
+              7,
+              11
+            ]
+          });
     }
   }
   
@@ -125,13 +125,13 @@ Raise `null` / `undefined`
       a1 = x$1._1;
     } else {
       throw new Caml_js_exceptions.MelangeError("Assert_failure", {
-                MEL_EXN_ID: "Assert_failure",
-                _1: [
-                  "x.ml",
-                  12,
-                  11
-                ]
-              });
+            MEL_EXN_ID: "Assert_failure",
+            _1: [
+              "x.ml",
+              12,
+              11
+            ]
+          });
     }
   }
   
diff --git a/test/blackbox-tests/mel-as-inline-records.t b/test/blackbox-tests/mel-as-inline-records.t
index 5ca6ea037..af70d37d3 100644
--- a/test/blackbox-tests/mel-as-inline-records.t
+++ b/test/blackbox-tests/mel-as-inline-records.t
@@ -24,9 +24,9 @@ Test `@mel.as` in inline records / record extensions
   function user3(param) {
     try {
       throw new Caml_js_exceptions.MelangeError(UserException, {
-                MEL_EXN_ID: UserException,
-                renamed: "Corentin"
-              });
+            MEL_EXN_ID: UserException,
+            renamed: "Corentin"
+          });
     }
     catch (raw_exn){
       const exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
diff --git a/test/blackbox-tests/objects-close-over-variable.t b/test/blackbox-tests/objects-close-over-variable.t
index 86cec7dd2..2664be27c 100644
--- a/test/blackbox-tests/objects-close-over-variable.t
+++ b/test/blackbox-tests/objects-close-over-variable.t
@@ -83,9 +83,9 @@ Test classes that close over an init variable from the outside scope
       object_tables.key = env_init;
     }
     return Curry._1(object_tables.key, [
-                undefined,
-                2
-              ]);
+          undefined,
+          2
+        ]);
   }
   
   const f = fresh(undefined);